From f799e689d27f889beaf82d8e58d100108a8843cf Mon Sep 17 00:00:00 2001 From: MarcEricMartel Date: Mon, 18 Dec 2023 14:54:14 -0500 Subject: [PATCH] woups --- SQCSim-common/player.cpp | 4 ++-- SQCSim-common/player.h | 2 +- SQCSim-srv/connection.cpp | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SQCSim-common/player.cpp b/SQCSim-common/player.cpp index 4f4a01f..5a01757 100644 --- a/SQCSim-common/player.cpp +++ b/SQCSim-common/player.cpp @@ -84,7 +84,7 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum return delta; } -Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime, std::unordered_map booster_table) { +Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime) { Player::Sound snd = Player::Sound::NOSOUND; static float timing = 0.f; /* Gestion de collisions */ @@ -184,7 +184,7 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi else isStep = false; m_POV = m_position.y; m_POV += m_airborne ? 0 : (sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) * .2f; - TakeBooster(booster_table, elapsedTime); +// TakeBooster(booster_table, elapsedTime); RemoveBooster(elapsedTime); return snd; } diff --git a/SQCSim-common/player.h b/SQCSim-common/player.h index 2754b35..3da7ff3 100644 --- a/SQCSim-common/player.h +++ b/SQCSim-common/player.h @@ -22,7 +22,7 @@ public: void TurnLeftRight(float value, float sensitivity); void TurnTopBottom(float value, float sensitivity); Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime); - Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime, std::unordered_map booster_table); + Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime); uint64_t TakeBooster(std::unordered_map booster_table, float elapsedTime); void GetBooster(BOOST_TYPE boosttype, float elapsedTime); void RemoveBooster(float elapsedtime); diff --git a/SQCSim-srv/connection.cpp b/SQCSim-srv/connection.cpp index f20ed5c..68dc89d 100644 --- a/SQCSim-srv/connection.cpp +++ b/SQCSim-srv/connection.cpp @@ -170,7 +170,9 @@ Timestamp Connection::Run(World* world, std::unordered_map b in.keys.left, in.keys.right, in.keys.jump, false, el), - world, el, boosters); + world, el); + + player->TakeBooster(boosters, el); if (player->GetPosition().y < -20.) { player->InflictDamage(9000.);