diff options
Diffstat (limited to 'src/modules')
| -rwxr-xr-x | src/modules/modPipe.c | 32 | ||||
| -rwxr-xr-x | src/modules/modTeleport.c | 37 | ||||
| -rwxr-xr-x | src/modules/modWall.c | 8 |
3 files changed, 20 insertions, 57 deletions
diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c index b535404..efe4230 100755 --- a/src/modules/modPipe.c +++ b/src/modules/modPipe.c @@ -258,8 +258,8 @@ static void moveShot(shot_t *shot, int position, int src_x, int src_y, break; } - new_y += shot->px; - new_y += shot->py; + new_x += myAbs(shot->px) * shot->px; + new_y += myAbs(shot->py) * shot->py; moveObjectInSpace(export_fce->fce_getCurrentArena()->spaceShot, shot, new_x, new_y); @@ -356,12 +356,6 @@ int event() return 0; } -/* - if( export_fce->fce_getNetTypeGame() == NET_GAME_TYPE_CLIENT ) - { - return; - } -*/ arena = export_fce->fce_getCurrentArena(); for( i = 0 ; i < arena->spaceShot->list->count ; i++ ) @@ -390,25 +384,10 @@ int event() continue; } - if( negPosition( thisShot->position ) == thisPipe->position ) + if( negPosition( thisShot->position ) == thisPipe->position && + export_fce->fce_getNetTypeGame() != NET_GAME_TYPE_CLIENT ) { - //moveShotFromPipe(thisShot, thisPipe, listPipe); - - if( export_fce->fce_getNetTypeGame() == NET_GAME_TYPE_CLIENT ) - { - if( thisShot->gun != GUN_BOMBBALL ) - { - delObjectFromSpaceWithObject(export_fce->fce_getCurrentArena()->spaceShot, - thisShot, export_fce->fce_destroyShot); - //delListItem(arena->listShot, i, export_fce->fce_destroyShot); - i--; - } - } - else - { - moveShotFromPipe(thisShot, thisPipe); - } - + moveShotFromPipe(thisShot, thisPipe); } else { @@ -416,7 +395,6 @@ int event() export_fce->fce_getNetTypeGame() != NET_GAME_TYPE_CLIENT ) { export_fce->fce_boundBombBall(thisShot); - continue; } else { diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c index 72b3690..d54bb4c 100755 --- a/src/modules/modTeleport.c +++ b/src/modules/modTeleport.c @@ -184,6 +184,7 @@ static int getRandomPosition() } assert( ! "Stupid error ! " ); + return -1; // no warnning } @@ -200,8 +201,6 @@ static void teleportTux(tux_t *tux, teleport_t *teleport) distTeleport = getRandomTeleportBut(spaceTeleport->list, teleport); - //export_fce->fce_getTuxProportion(tux, ¤t_x, ¤t_y, NULL, NULL); - switch( tux->position ) { case TUX_UP : @@ -237,7 +236,14 @@ static void teleportTux(tux_t *tux, teleport_t *teleport) #endif if( export_fce->fce_getNetTypeGame() == NET_GAME_TYPE_SERVER ) { - export_fce->fce_proto_send_newtux_server(PROTO_SEND_ALL, NULL, tux); + if( tux->bonus == BONUS_HIDDEN ) + { + export_fce->fce_proto_send_newtux_server(PROTO_SEND_ONE, (client_t *)tux->client, tux); + } + else + { + export_fce->fce_proto_send_newtux_server(PROTO_SEND_ALL, NULL, tux); + } } } } @@ -253,31 +259,6 @@ static int getSppedShot(shot_t *shot) return ( myAbs(shot->px) > myAbs(shot->py) ? myAbs(shot->px) : myAbs(shot->py) ); } -/* -static void transformOnlyLasser(shot_t *shot) -{ - switch( shot->position ) - { - case TUX_RIGHT : - case TUX_LEFT : - shot->w = GUN_LASSER_HORIZONTAL; - shot->h = GUN_SHOT_VERTICAL; -#ifndef PUBLIC_SERVER - shot->img = g_shot_lasserX; -#endif - break; - case TUX_UP : - case TUX_DOWN : - shot->w = GUN_SHOT_VERTICAL; - shot->h = GUN_LASSER_HORIZONTAL; -#ifndef PUBLIC_SERVER - shot->img = g_shot_lasserY; -#endif - break; - } -} -*/ - static void transformShot(shot_t *shot, int position) { int speed; diff --git a/src/modules/modWall.c b/src/modules/modWall.c index 4544ea9..4030795 100755 --- a/src/modules/modWall.c +++ b/src/modules/modWall.c @@ -136,9 +136,13 @@ void eventConflictShotWithWall() continue; } - if( thisShot->gun == GUN_BOMBBALL && export_fce->fce_getNetTypeGame() != NET_GAME_TYPE_CLIENT ) + if( thisShot->gun == GUN_BOMBBALL) { - export_fce->fce_boundBombBall(thisShot); + if( export_fce->fce_getNetTypeGame() != NET_GAME_TYPE_CLIENT ) + { + export_fce->fce_boundBombBall(thisShot); + } + continue; } |