From 617ba439aab5f1798eb02618dfcfbed80a5baf28 Mon Sep 17 00:00:00 2001
From: oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Sun, 30 Mar 2008 16:51:15 +0000
Subject: - polozky casovaca sa nachadzaju  v zozname list_t , ktory he
 sucastou arena_t - pri bonuse neviditelnost sa neda podvadzat modifikovanim
 clienta - o vystreli sa stara server, ich suradnicu a dalsie info posiela
 server clientom - parametre sa pisu vo forme --env=val

git-svn-id: http://opensvn.csie.org/tuxanci_ng@38 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
---
 src/screen_world.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/screen_world.c')

diff --git a/src/screen_world.c b/src/screen_world.c
index ebaaa20..571b10e 100644
--- a/src/screen_world.c
+++ b/src/screen_world.c
@@ -98,7 +98,7 @@ void countRoundInc()
 	{
 		printf("count %d ending\n", count);
 		playSound("end", SOUND_GROUP_BASE);
-		addTimer(timer_endArena, NULL, TIMER_END_ARENA);
+		addTimer(getCurrentArena()->listTimer, timer_endArena, NULL, TIMER_END_ARENA);
 	}
 }
 
@@ -214,7 +214,7 @@ static void control_keyboard_right(tux_t *tux)
 		actionTux(tux, TUX_DOWN);
 	}
 
-	if( mapa[(SDLKey)SDLK_KP0] == SDL_PRESSED )
+	if( mapa[(SDLKey)SDLK_KP0] == SDL_PRESSED && tux->isCanShot == TRUE )
 	{
 		netAction(tux, TUX_SHOT);
 		actionTux(tux, TUX_SHOT);
@@ -314,7 +314,6 @@ void eventWorld()
 	eventNetMultiplayer();
 
 	eventArena(arena);
-	eventTimer();
 
 	eventTerm();
 	eventEnd();
@@ -331,7 +330,6 @@ void startWorld()
 	setGameType();
 	initTerm();
 	prepareArena();
-	initTimer();
 }
 
 static void setAnalyze()
@@ -392,8 +390,6 @@ void stoptWorld()
 	stopMusic();
 	delAllImageInGroup(IMAGE_GROUP_USER);
 	delAllMusicInGroup(MUSIC_GROUP_USER);
-	quitTimer();
-	quitTerm();
 }
 
 void initWorld()
-- 
cgit v1.2.3