josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do not allow player to shoot while dead

Browse Source
This commit is contained in:
Josh Holtrop 2012-10-14 14:58:53 -04:00
parent d488a28827
commit 4c25126ba6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/Client.cc
View File

@ -128,6 +128,7 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
// The server needs to allow player to shoot, so that // The server needs to allow player to shoot, so that
// multiple shots cannot be fired at the same time // multiple shots cannot be fired at the same time
(m_players[m_current_player]->m_shot_allowed) && (m_players[m_current_player]->m_shot_allowed) &&
(!m_players[m_current_player]->m_is_dead) &&
(m_client_has_focus)) (m_client_has_focus))
{ {
m_left_button_pressed = true; m_left_button_pressed = true;
@ -138,6 +139,7 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
// Prevents a shot from being fired upon release // Prevents a shot from being fired upon release
// while another shot is currently being fired. // while another shot is currently being fired.
(m_players[m_current_player]->m_shot_allowed) && (m_players[m_current_player]->m_shot_allowed) &&
(!m_players[m_current_player]->m_is_dead) &&
(m_left_button_pressed) && (m_left_button_pressed) &&
(m_client_has_focus)) (m_client_has_focus))
{ {