From 8b70ac9538f7e4da10666cfc21fd368a91a77ae3 Mon Sep 17 00:00:00 2001 From: oroborus Date: Sun, 4 May 2008 19:22:36 +0000 Subject: - oprava chyby -> client sa zrutil ak dostal packety "init" a "additem" v opacnom poradi - oprava chyby -> item a shot ukazoval pointerom na tuxa, to znamenalo, ze ak sa tux odhlasil, tak item a shot ukazoval do uvolnenej pamate - oprava chyby -> exploziu si client pridaval sam, a este prijmal packet od servera, ze sa ma pridat explozia git-svn-id: http://opensvn.csie.org/tuxanci_ng@50 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/wall.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/wall.c') diff --git a/src/wall.c b/src/wall.c index 54f034a..c91f58d 100644 --- a/src/wall.c +++ b/src/wall.c @@ -100,6 +100,7 @@ int isConflictWithListWall(list_t *listWall, int x, int y, int w, int h) void eventConflictShotWithWall(list_t *listWall, list_t *listShot) { shot_t *thisShot; + tux_t *author; int i; assert( listWall != NULL ); @@ -112,8 +113,11 @@ void eventConflictShotWithWall(list_t *listWall, list_t *listShot) if( isConflictWithListWall(listWall, thisShot->x, thisShot->y, thisShot->w, thisShot->h) ) { - if( thisShot->author->bonus == BONUS_GHOST && - thisShot->author->bonus_time > 0 ) + author = getTuxID( getCurrentArena()->listShot, thisShot->author_id ); + + if( author != NULL && + author->bonus == BONUS_GHOST && + author->bonus_time > 0 ) { continue; } -- cgit v1.2.3