summaryrefslogtreecommitdiff
path: root/src/screen_world.c
diff options
context:
space:
mode:
authororoborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-03-17 20:29:34 +0000
committeroroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-03-17 20:29:34 +0000
commit437da38a26548714e6e1640722148f0f9f601ccb (patch)
tree3bc6a5a0903211e2d1ffa4fd9b3e6e467d413ecf /src/screen_world.c
parent51aae47ae08ad61507f219c24ed6d9321c866f45 (diff)
<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
Diffstat (limited to 'src/screen_world.c')
-rw-r--r--src/screen_world.c21
1 files changed, 16 insertions, 5 deletions
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();
}