summaryrefslogtreecommitdiff
path: root/src/screen_world.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen_world.c')
-rw-r--r--src/screen_world.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/screen_world.c b/src/screen_world.c
index 45daee5..60260b9 100644
--- a/src/screen_world.c
+++ b/src/screen_world.c
@@ -241,7 +241,7 @@ static void netAction(tux_t *tux, int action)
{
if( getSettingGameType() == NET_GAME_TYPE_SERVER )
{
- proto_send_event_server(tux , action, NULL);
+ proto_send_event_server(PROTO_SEND_ALL, NULL, tux , action);
}
if( getSettingGameType() == NET_GAME_TYPE_CLIENT )
@@ -290,8 +290,11 @@ static void control_keyboard_right(tux_t *tux)
if( mapa[(SDLKey)SDLK_KP1] == SDL_PRESSED )
{
- netAction(tux, TUX_SWITCH_GUN);
- actionTux(tux, TUX_SWITCH_GUN);
+ if( tux->isCanSwitchGun == TRUE )
+ {
+ netAction(tux, TUX_SWITCH_GUN);
+ actionTux(tux, TUX_SWITCH_GUN);
+ }
}
}
@@ -308,7 +311,15 @@ static void control_keyboard_left(tux_t *tux)
if( mapa[(SDLKey)SDLK_a] == SDL_PRESSED )actionTux(tux, TUX_LEFT);
if( mapa[(SDLKey)SDLK_s] == SDL_PRESSED )actionTux(tux, TUX_DOWN);
if( mapa[(SDLKey)SDLK_q] == SDL_PRESSED )actionTux(tux, TUX_SHOT);
- if( mapa[(SDLKey)SDLK_TAB] == SDL_PRESSED )actionTux(tux, TUX_SWITCH_GUN);
+
+ if( mapa[(SDLKey)SDLK_TAB] == SDL_PRESSED )
+ {
+ if( tux->isCanSwitchGun == TRUE )
+ {
+ netAction(tux, TUX_SWITCH_GUN);
+ actionTux(tux, TUX_SWITCH_GUN);
+ }
+ }
}
static void eventEsc()