There's a bullet without my name on it.
This commit is contained in:
@@ -1512,7 +1512,8 @@ void Engine::Render(float elapsedTime) {
|
||||
|
||||
std::cout << sync.hp << std::endl;
|
||||
m_otherplayerpos = sync.position;
|
||||
m_player.InflictDamage(sync.hp - comp.hp);
|
||||
|
||||
m_player.InflictDamage(sync.hp - m_player.GetHP());
|
||||
|
||||
Vector3f diff = sync.position - comp.position;
|
||||
|
||||
@@ -1558,7 +1559,7 @@ void Engine::Render(float elapsedTime) {
|
||||
break;
|
||||
case BULLET:
|
||||
if (Deserialize(&bull, pck, &bsize)) {
|
||||
Bullet* bult = new Bullet(bull.pos, bull.dir);
|
||||
Bullet* bult = new Bullet(bull.pos, bull.dir, bull.id, false);
|
||||
for (int x = 0; x < MAX_BULLETS; ++x) // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
|
||||
if (!m_bullets[x]) {
|
||||
m_bullets[x] = bult;
|
||||
@@ -2333,6 +2334,12 @@ void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) {
|
||||
m_gamestate = GameState::MAIN_MENU;
|
||||
m_selectedPlayOptions = false;
|
||||
m_audio.ToggleMusicState(m_gamestate);
|
||||
if (m_networkgame) {
|
||||
if (m_conn.m_sock_udp)
|
||||
closesocket(m_conn.m_sock_udp);
|
||||
if (m_conn.m_sock_udp)
|
||||
closesocket(m_conn.m_sock_udp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user