From 437da38a26548714e6e1640722148f0f9f601ccb Mon Sep 17 00:00:00 2001
From: oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Mon, 17 Mar 2008 20:29:34 +0000
Subject: <Oroborus> - opravena chyba, clent nacital iba _jeden_ sietovy packet
 za 50 ms ( ano aj ked ich prislo viacej) <Oroborus> - server pinguje clientov
 a na zaklade toho client vie, ci server nespadol <Oroborus> - publicserver sa
 da korektne vypnut signalom SIGQUIT <Oroborus> - publicserver bol pretiahnuty
 cez valgrind, teraz za pocet volani funkcie malloc rovna poctu volani funkcie
 free <Oroborus> - v sietovom multiplayeri sa da chodit cez teleporty a
 strielat do teleportov <Oroborus> - do rur sa da siez strielat

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

(limited to 'src/screen_world.c')

diff --git a/src/screen_world.c b/src/screen_world.c
index 7e63cd0..45daee5 100644
--- a/src/screen_world.c
+++ b/src/screen_world.c
@@ -363,6 +363,8 @@ void eventWorld()
 	if( arena == NULL )
 	{
 		eventNetMultiplayer();
+		eventEnd();
+		eventEsc();
 		return;
 	}
 
@@ -381,8 +383,8 @@ void eventWorld()
 	eventTimer();
 	eventNetMultiplayer();
 
-	eventEsc();
 	eventEnd();
+	eventEsc();
 }
 
 void startWorld()
@@ -439,12 +441,21 @@ static void setTable()
 
 void stoptWorld()
 {
-	setTable();
-	setAnalyze();
-	delAllImageInGroup(IMAGE_GROUP_USER);
+	if( arena != NULL )
+	{
+		setTable();
+		setAnalyze();
+	}
+
 	quitNetMultiplayer();
-	destroyArena(arena);
+
+	if( arena != NULL )
+	{
+		destroyArena(arena);
+	}
+
 	stopMusic();
+	delAllImageInGroup(IMAGE_GROUP_USER);
 	delAllMusicInGroup(MUSIC_GROUP_USER);
 	quitTimer();
 }
-- 
cgit v1.2.3