fonctionnel
This commit is contained in:
parent
4df7cfbd5d
commit
602bb84428
@ -6,6 +6,7 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
|
|
||||||
|
|
||||||
class World;
|
class World;
|
||||||
class Player;
|
class Player;
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ void Player::InflictDamage(float hitPoints)
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
uint64_t Player::getId() const { return id; }
|
uint64_t Player::getId() const { return id; }
|
||||||
|
@ -1009,7 +1009,7 @@ void Engine::Render(float elapsedTime) {
|
|||||||
for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
|
for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
|
||||||
if (m_bullets[x]) {
|
if (m_bullets[x]) {
|
||||||
for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) {
|
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();
|
m_bullets[x]->~Bullet();
|
||||||
if (m_whoosh[x])
|
if (m_whoosh[x])
|
||||||
m_whoosh[x]->drop();
|
m_whoosh[x]->drop();
|
||||||
|
@ -87,7 +87,7 @@ private:
|
|||||||
|
|
||||||
Bullet* m_bullets[MAX_BULLETS];
|
Bullet* m_bullets[MAX_BULLETS];
|
||||||
|
|
||||||
std::map<uint64_t, RemotePlayer*> m_players;
|
std::map<uint64_t, Player*> m_players;
|
||||||
|
|
||||||
//Menu
|
//Menu
|
||||||
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
|
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user