memartel_loc/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fonctionnel

Browse Source
This commit is contained in:
Jonathan Trottier 2023-10-30 14:56:04 -04:00
parent 4df7cfbd5d
commit 602bb84428
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SQCSim-common/bullet.h
View File

@ -6,6 +6,7 @@
#include <map>
#include "player.h"
class World;
class Player;

2
SQCSim-common/player.cpp
View File

@ -226,7 +226,7 @@ void Player::InflictDamage(float hitPoints)
}
}
uint64_t Player::getId() const { return id; }

2
SQCSim2021/engine.cpp
View File

@ -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();

2
SQCSim2021/engine.h
View File

@ -87,7 +87,7 @@ private:
Bullet* m_bullets[MAX_BULLETS];
std::map<uint64_t, RemotePlayer*> m_players;
std::map<uint64_t, Player*> m_players;
//Menu
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };