summaryrefslogtreecommitdiff
path: root/src/pipe.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pipe.c')
-rw-r--r--src/pipe.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/pipe.c b/src/pipe.c
index 5a435e4..dde1a11 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -6,6 +6,7 @@
#include "main.h"
#include "pipe.h"
#include "shot.h"
+#include "net_multiplayer.h"
#ifndef BUBLIC_SERVER
#include "screen_world.h"
@@ -178,7 +179,15 @@ void eventConflictShotWithPipe(list_t *listPipe, list_t *listShot)
if( negPosition( thisShot->position ) == thisPipe->position )
{
- moveShotFromPipe(thisShot, thisPipe, listPipe);
+ if( getNetTypeGame() == NET_GAME_TYPE_CLIENT )
+ {
+ delListItem(listShot, i, destroyShot);
+ i--;
+ }
+ else
+ {
+ moveShotFromPipe(thisShot, thisPipe, listPipe);
+ }
}
else
{