From a8bec57e7a9be7b1fa36ef8be618db4e46cbd599 Mon Sep 17 00:00:00 2001 From: oroborus Date: Tue, 15 Apr 2008 19:28:48 +0000 Subject: - oprava chyby #0007 #0006 #0005 - nova zbran bombball - client dostava svoju vlastnu poziciu od servera kazdych 5000 ms git-svn-id: http://opensvn.csie.org/tuxanci_ng@45 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/pipe.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'src/pipe.c') diff --git a/src/pipe.c b/src/pipe.c index 19b12c5..2a85667 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -169,7 +169,7 @@ void eventConflictShotWithPipe(list_t *listPipe, list_t *listShot) assert( thisShot != NULL ); if( ( thisPipe = isConflictWithListPipe(listPipe, thisShot->x, thisShot->y, - thisShot->w, thisShot->h) ) != NULL ) + thisShot->w, thisShot->h) ) != NULL ) { if( thisShot->author->bonus == BONUS_GHOST && thisShot->author->bonus_time > 0 ) @@ -181,8 +181,11 @@ void eventConflictShotWithPipe(list_t *listPipe, list_t *listShot) { if( getNetTypeGame() == NET_GAME_TYPE_CLIENT ) { - delListItem(listShot, i, destroyShot); - i--; + if( thisShot->gun != GUN_BOMBBALL ) + { + delListItem(listShot, i, destroyShot); + i--; + } } else { @@ -191,8 +194,16 @@ void eventConflictShotWithPipe(list_t *listPipe, list_t *listShot) } else { - delListItem(listShot, i, destroyShot); - i--; + if( thisShot->gun == GUN_BOMBBALL && getNetTypeGame() != NET_GAME_TYPE_CLIENT ) + { + boundBombBall(thisShot); + continue; + } + else + { + delListItem(listShot, i, destroyShot); + i--; + } } } } -- cgit v1.2.3