Oops, all changes!
This commit is contained in:
parent
2eacc0477b
commit
7f9462881c
@ -37,7 +37,7 @@
|
|||||||
#define STRENGTH_SPEED_BOOST 10 //Pourcentage
|
#define STRENGTH_SPEED_BOOST 10 //Pourcentage
|
||||||
#define BULLET_TIME .2 //secondes
|
#define BULLET_TIME .2 //secondes
|
||||||
|
|
||||||
#define SYNC_ACC 100 // ms
|
#define SYNC_ACC 600 // ms
|
||||||
#define CMOD_ACC 1000 // ms
|
#define CMOD_ACC 1000 // ms
|
||||||
|
|
||||||
typedef uint8_t BlockType;
|
typedef uint8_t BlockType;
|
||||||
|
@ -213,7 +213,7 @@ Timestamp Connection::Run(World* world) {
|
|||||||
else out.states.jumpshot = false;
|
else out.states.jumpshot = false;
|
||||||
|
|
||||||
if (in.keys.shoot && m_shoot_acc <= 0.) {
|
if (in.keys.shoot && m_shoot_acc <= 0.) {
|
||||||
Bullets.push_back(std::move(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true))));
|
Bullets.emplace_back(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true)));
|
||||||
m_shoot_acc = BULLET_TIME;
|
m_shoot_acc = BULLET_TIME;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -679,7 +679,8 @@ void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
|
|||||||
ss.str("");
|
ss.str("");
|
||||||
fPosY -= charSize;
|
fPosY -= charSize;
|
||||||
|
|
||||||
ss << " Remote Position : " << m_otherplayerpos;
|
Vector3f pos = Vector3f(m_otherplayerpos.x + CHUNK_SIZE_X * WORLD_SIZE_X / 2, m_otherplayerpos.y, m_otherplayerpos.z + CHUNK_SIZE_Z * WORLD_SIZE_Y / 2);
|
||||||
|
ss << " Remote Position : " << pos;
|
||||||
PrintText(fPosX, fPosY, ss.str());
|
PrintText(fPosX, fPosY, ss.str());
|
||||||
ss.str("");
|
ss.str("");
|
||||||
fPosY -= charSize;
|
fPosY -= charSize;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user