From b20407a43e254ebc5ea1890099d71c55546057ad Mon Sep 17 00:00:00 2001
From: stpohle <stpohle>
Date: Sun, 1 Jun 2003 20:17:03 +0000
Subject: [PATCH] now we can compile again

---
 src/game.c    | 4 ++--
 src/network.c | 6 +++---
 src/packets.c | 2 +-
 src/player.c  | 6 +++---
 src/single.c  | 4 ++--
 src/special.c | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/game.c b/src/game.c
index 9b62e56..1d7657c 100644
--- a/src/game.c
+++ b/src/game.c
@@ -80,7 +80,7 @@ game_draw_info ()
         draw_text (x, 0, text, 1);
         sprintf (text, "Range: %2d", bman.players[bman.p_nr].range);
         draw_text (x, 16, text, 1);
-        sprintf (text, "SP: %d  Speed: %2d", bman.players[bman.p_nr].special,
+        sprintf (text, "SP: %d  Speed: %2d", bman.players[bman.p_nr].special.type,
                  bman.players[bman.p_nr].speed);
         draw_text (x - 90, 32, text, 1);
 
@@ -176,7 +176,7 @@ game_loop ()
             }
             else
                 key_bomb = 0;
-            if ((keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]) && bman.players[bman.p_nr].special) {
+            if ((keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]) && bman.players[bman.p_nr].special.type) {
                 special_use (bman.p_nr);
             }
         }
diff --git a/src/network.c b/src/network.c
index d8b31e7..918753d 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1,4 +1,4 @@
-/* $Id: network.c,v 1.27 2003/05/29 21:35:03 stpohle Exp $ */
+/* $Id: network.c,v 1.28 2003/06/01 20:17:03 stpohle Exp $ */
 /*
 	network routines.
 */
@@ -765,7 +765,7 @@ net_new_game ()
         bman.players[p].bombs_n = START_BOMBS;
         bman.players[p].range = START_RANGE;
         bman.players[p].speed = START_SPEED;
-        bman.players[p].special = SP_nothing;
+        bman.players[p].special.type = SP_nothing;
         bman.updatestatusbar=1;
 		
 		for (i = 0; i < PI_max; i++) /* all types of illnes turn them off */
@@ -802,5 +802,5 @@ net_game_send_special (int pl_nr, int ex_nr)
 
     for (pl = 0; pl < MAX_PLAYERS; pl++)
         if (PS_IS_netplayer (bman.players[pl].state) && pl != pl_nr && NET_CANSEND(pl))
-            send_special (&bman.players[pl].net.addr, pl_nr, bman.players[pl_nr].special, ex_nr);
+            send_special (&bman.players[pl].net.addr, pl_nr, bman.players[pl_nr].special.type, ex_nr);
 };
diff --git a/src/packets.c b/src/packets.c
index 4b9b4b3..a42784c 100644
--- a/src/packets.c
+++ b/src/packets.c
@@ -937,7 +937,7 @@ do_special (struct pkg_special *sp_pkg, _net_addr * addr)
     if (addr->pl_nr != 0 && addr->pl_nr != sp_pkg->pl_nr)
         return;
 
-    bman.players[sp_pkg->pl_nr].special = sp_pkg->typ;
+    bman.players[sp_pkg->pl_nr].special.type = sp_pkg->typ;
     bman.last_ex_nr = sp_pkg->ex_nr;
     special_use (sp_pkg->pl_nr);
 };
diff --git a/src/player.c b/src/player.c
index 1f6eb92..1054342 100644
--- a/src/player.c
+++ b/src/player.c
@@ -178,8 +178,8 @@ player_check_powerup (_player * p)
     case FT_sp_row:
     case FT_sp_push:
     case FT_sp_kick:
-        if (p->special == SP_nothing) {
-            p->special = ft - FT_sp_trigger + 1;
+        if (p->special.type == SP_nothing) {
+            p->special.type = ft - FT_sp_trigger + 1;
             bman.updatestatusbar = 1;
         }
         field_clear (fx, fy);
@@ -359,7 +359,7 @@ player_drop_bomb (int pl_nr)
 
         d_printf ("Player %d Dropped Bomb %d\n", bman.p_nr, i);
         bomb->r = player->range;
-        if (player->special == SP_trigger) {
+        if (player->special.type == SP_trigger) {
             bomb->state = BS_trigger;
 			bomb->to = SPECIAL_TRIGGER_TIMEOUT * TIME_FACTOR; // 5 Secs * 200
 		}
diff --git a/src/single.c b/src/single.c
index 9ea42e1..89ad47b 100644
--- a/src/single.c
+++ b/src/single.c
@@ -1,4 +1,4 @@
-/* $Id: single.c,v 1.27 2003/05/30 18:48:58 patty21 Exp $ */
+/* $Id: single.c,v 1.28 2003/06/01 20:17:04 stpohle Exp $ */
 /* single player */
 
 #include "basic.h"
@@ -29,7 +29,7 @@ single_game_new ()
         bman.players[p].bombs_n = START_BOMBS;
         bman.players[p].range = START_RANGE;
         bman.players[p].speed = START_SPEED;
-        bman.players[p].special = SP_nothing;
+        bman.players[p].special.type = SP_nothing;
         bman.updatestatusbar = 1;
         for (i = 0; i < MAX_BOMBS; i++) {
             bman.players[p].bombs[i].state = BS_off;
diff --git a/src/special.c b/src/special.c
index 3afcfbf..8b38257 100644
--- a/src/special.c
+++ b/src/special.c
@@ -155,7 +155,7 @@ special_loop (int p_nr) {
 void
   special_use (int p_nr) {
 
-    switch (bman.players[p_nr].special) {
+    switch (bman.players[p_nr].special.type) {
 
     case SP_trigger:
         special_trigger (p_nr);