diff --git a/SQCSim-common/bullet.h b/SQCSim-common/bullet.h index a035290..cc04737 100644 --- a/SQCSim-common/bullet.h +++ b/SQCSim-common/bullet.h @@ -6,6 +6,7 @@ #include #include "player.h" + class World; class Player; diff --git a/SQCSim-common/player.cpp b/SQCSim-common/player.cpp index 5c92653..790507f 100644 --- a/SQCSim-common/player.cpp +++ b/SQCSim-common/player.cpp @@ -219,14 +219,14 @@ void Player::InflictDamage(float hitPoints) m_hp -= hitPoints; - + if (AmIDead()) { // Quand le joueur est mort. } - +} uint64_t Player::getId() const { return id; } diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index f2ce768..5c2f9f3 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -1009,7 +1009,7 @@ void Engine::Render(float elapsedTime) { for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu. if (m_bullets[x]) { for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) { - if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME)) { + if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players)) { m_bullets[x]->~Bullet(); if (m_whoosh[x]) m_whoosh[x]->drop(); diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h index 888d696..928a102 100644 --- a/SQCSim2021/engine.h +++ b/SQCSim2021/engine.h @@ -87,7 +87,7 @@ private: Bullet* m_bullets[MAX_BULLETS]; - std::map m_players; + std::map m_players; //Menu enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };