From: Holger Schemel <info@artsoft.org>
Date: Sat, 20 Jan 2001 22:50:28 +0000 (+0100)
Subject: rnd-20010120-6-src
X-Git-Tag: 2.0.1^2~24
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=673c51c61ad415fbdb1a69148fa67dfbeb0afcae;p=rocksndiamonds.git

rnd-20010120-6-src
---

diff --git a/src/game.c b/src/game.c
index a3dd01df..811d103a 100644
--- a/src/game.c
+++ b/src/game.c
@@ -41,9 +41,10 @@
 
 /* for Explode() */
 #define EX_PHASE_START		0
-#define EX_NORMAL		0
-#define EX_CENTER		1
-#define EX_BORDER		2
+#define EX_NO_EXPLOSION		0
+#define EX_NORMAL		1
+#define EX_CENTER		2
+#define EX_BORDER		3
 
 /* special positions in the game control window (relative to control window) */
 #define XX_LEVEL		37
@@ -533,6 +534,7 @@ void InitGame()
   game.timegate_time_left = 0;
   game.switchgate_pos = 0;
   game.balloon_dir = MV_NO_MOVING;
+  game.explosions_delayed = TRUE;
 
   for (i=0; i<4; i++)
   {
@@ -554,6 +556,7 @@ void InitGame()
       AmoebaNr[x][y] = 0;
       JustStopped[x][y] = 0;
       Stop[x][y] = FALSE;
+      ExplodeField[x][y] = EX_NO_EXPLOSION;
     }
   }
 
@@ -1280,6 +1283,12 @@ void Explode(int ex, int ey, int phase, int mode)
   int half_phase = (num_phase / 2) * delay;
   int first_phase_after_start = EX_PHASE_START + 1;
 
+  if (game.explosions_delayed)
+  {
+    ExplodeField[ex][ey] = mode;
+    return;
+  }
+
   if (phase == EX_PHASE_START)		/* initialize 'Store[][]' field */
   {
     int center_element = Feld[ex][ey];
@@ -4418,7 +4427,7 @@ void GameActions()
       ContinueMoving(x, y);
     else if (IS_ACTIVE_BOMB(element))
       CheckDynamite(x, y);
-    else if (element == EL_EXPLODING)
+    else if (element == EL_EXPLODING && !game.explosions_delayed)
       Explode(x, y, Frame[x][y], EX_NORMAL);
     else if (element == EL_AMOEBING)
       AmoebeWaechst(x, y);
@@ -4509,6 +4518,22 @@ void GameActions()
     }
   }
 
+  if (game.explosions_delayed)
+  {
+    game.explosions_delayed = FALSE;
+
+    for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+    {
+      if (ExplodeField[x][y])
+	Explode(x, y, EX_PHASE_START, ExplodeField[x][y]);
+      else if (Feld[x][y] == EL_EXPLODING)
+	Explode(x, y, Frame[x][y], EX_NORMAL);
+      ExplodeField[x][y] = EX_NO_EXPLOSION;
+    }
+
+    game.explosions_delayed = TRUE;
+  }
+
   if (game.magic_wall_active)
   {
     if (!(game.magic_wall_time_left % 4))
diff --git a/src/main.c b/src/main.c
index 967a4b4a..de38f3f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -58,6 +58,7 @@ boolean		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short		JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+short		ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 unsigned long	Elementeigenschaften1[MAX_ELEMENTS];
 unsigned long	Elementeigenschaften2[MAX_ELEMENTS];
 
diff --git a/src/main.h b/src/main.h
index 8ac1161a..d626cd59 100644
--- a/src/main.h
+++ b/src/main.h
@@ -377,6 +377,7 @@ struct GameInfo
   int belt_dir_nr[4];
   int switchgate_pos;
   int balloon_dir;
+  boolean explosions_delayed;
 };
 
 struct GlobalInfo
@@ -418,6 +419,7 @@ extern boolean		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+extern short		ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern unsigned long	Elementeigenschaften1[MAX_ELEMENTS];
 extern unsigned long	Elementeigenschaften2[MAX_ELEMENTS];