From 5b50dbe0c2d3b9d1eefeb4807835b5aec6672496 Mon Sep 17 00:00:00 2001
From: stpohle <stpohle>
Date: Sun, 13 Jul 2003 23:07:59 +0000
Subject: [PATCH] Trigger bomb multiplayer fixed

---
 src/basic.h   |  4 ++--
 src/special.c | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/basic.h b/src/basic.h
index f915283..7262954 100644
--- a/src/basic.h
+++ b/src/basic.h
@@ -1,4 +1,4 @@
-/* $Id: basic.h,v 1.35 2003/07/13 00:08:25 stpohle Exp $ */
+/* $Id: basic.h,v 1.36 2003/07/13 23:07:59 stpohle Exp $ */
 /* basic types which we need everywhere */
 
 #ifndef _BC_BASIC_H_
@@ -10,7 +10,7 @@
 #define GAME_SPECIAL_ITEMSHOE 10
 #define GAME_SPECIAL_ITEMDEATH 25
 #define GAME_SPECIAL_ITEMMIXED 10
-#define GAME_SPECIAL_ITEMSTRIGGER 3
+#define GAME_SPECIAL_ITEMSTRIGGER 50
 #define GAME_SPECIAL_ITEMSROW 3
 #define GAME_SPECIAL_ITEMSPUSH 3
 #define GAME_SPECIAL_ITEMSKICK 0		// no use yet
diff --git a/src/special.c b/src/special.c
index 4b8e8c0..462510a 100644
--- a/src/special.c
+++ b/src/special.c
@@ -1,4 +1,4 @@
-/* $Id: special.c,v 1.21 2003/07/13 22:49:08 stpohle Exp $ */
+/* $Id: special.c,v 1.22 2003/07/13 23:07:59 stpohle Exp $ */
 /* special.c - procedues to control the specials */
 
 #include "bomberclone.h"
@@ -208,8 +208,9 @@ special_loop ()
 
     for (p_nr = 0; p_nr < MAX_PLAYERS; p_nr++) {
 		s = &bman.players[p_nr].special;
+
         if (s->use) {
-            switch (bman.players[p_nr].special.type) {
+            switch (s->type) {
             case SP_trigger:
                 special_trigger (p_nr);
                 break;
@@ -227,10 +228,7 @@ special_loop ()
             s->use = 0;
         }
 
-        if (!s->type)
-            return;
-
-        if (s->to) {
+        if (s->type && s->to) {
             s->to--;
             if (!s->to)
                 special_clear (p_nr);