summaryrefslogtreecommitdiff
path: root/src/pipe.c
diff options
context:
space:
mode:
authororoborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-03-19 19:32:50 +0000
committeroroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-03-19 19:32:50 +0000
commit01d613a7ccf695090262c9e22c396251146f00bd (patch)
tree3f176dd05944d108259f02d968e5b221704fb274 /src/pipe.c
parent11239bc45b51f9cc9eaec8272e58a0dea0e10b93 (diff)
- upravy v kode
git-svn-id: http://opensvn.csie.org/tuxanci_ng@27 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
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
{