X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_game.c;h=8d9743c6df6fc5cdfec7c9ad9cd54f511d38781f;hb=fa86d670aca8d9505d7e8403b1ec0c9f4b683ec0;hp=8b0ba849abda46977749aaa6f9e3dd38c9f0791f;hpb=86eb2ffc8cf01f17a3aea2bf0b279014825ec756;p=rocksndiamonds.git

diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c
index 8b0ba849..8d9743c6 100644
--- a/src/game_mm/mm_game.c
+++ b/src/game_mm/mm_game.c
@@ -73,7 +73,7 @@
 #define INIT_GAME_ACTIONS_DELAY	(ONE_SECOND_DELAY / GAME_FRAME_DELAY)
 #define NUM_INIT_CYCLE_STEPS	16
 #define PACMAN_MOVE_DELAY	12
-#define ENERGY_DELAY		(4 * ONE_SECOND_DELAY / GAME_FRAME_DELAY)
+#define ENERGY_DELAY		(ONE_SECOND_DELAY / GAME_FRAME_DELAY)
 #define HEALTH_DEC_DELAY	3
 #define HEALTH_INC_DELAY	9
 #define HEALTH_DELAY(x)		((x) ? HEALTH_DEC_DELAY : HEALTH_INC_DELAY)
@@ -354,6 +354,60 @@ static boolean CheckLaserPixel(int x, int y)
   return (pixel == WHITE_PIXEL);
 }
 
+static void CheckExitMM()
+{
+  int exit_element = EL_EMPTY;
+  int exit_x = 0;
+  int exit_y = 0;
+  int x, y;
+  static int xy[4][2] =
+  {
+    { +1,  0 },
+    {  0, -1 },
+    { -1,  0 },
+    {  0, +1 }
+  };
+
+  for (y = 0; y < lev_fieldy; y++)
+  {
+    for (x = 0; x < lev_fieldx; x++)
+    {
+      if (Feld[x][y] == EL_EXIT_CLOSED)
+      {
+	/* initiate opening animation of exit door */
+	Feld[x][y] = EL_EXIT_OPENING;
+
+	exit_element = EL_EXIT_OPEN;
+	exit_x = x;
+	exit_y = y;
+      }
+      else if (IS_RECEIVER(Feld[x][y]))
+      {
+	/* remove field that blocks receiver */
+	int phase = Feld[x][y] - EL_RECEIVER_START;
+	int blocking_x, blocking_y;
+
+	blocking_x = x + xy[phase][0];
+	blocking_y = y + xy[phase][1];
+
+	if (IN_LEV_FIELD(blocking_x, blocking_y))
+	{
+	  Feld[blocking_x][blocking_y] = EL_EMPTY;
+
+	  DrawField_MM(blocking_x, blocking_y);
+	}
+
+	exit_element = EL_RECEIVER;
+	exit_x = x;
+	exit_y = y;
+      }
+    }
+  }
+
+  if (exit_element != EL_EMPTY)
+    PlayLevelSound_MM(exit_x, exit_y, exit_element, MM_ACTION_OPENING);
+}
+
 static void InitMovDir_MM(int x, int y)
 {
   int element = Feld[x][y];
@@ -683,6 +737,9 @@ void InitGameActions_MM()
 #endif
 
   ScanLaser();
+
+  if (game_mm.kettles_still_needed == 0)
+    CheckExitMM();
 }
 
 void AddLaserEdge(int lx, int ly)
@@ -1239,7 +1296,7 @@ void DrawLaser(int start_edge, int mode)
       int num_beamers = laser.num_beamers;
 
       /* delete laser segments backward from the end to the first beamer */
-      for (i = num_beamers-1; i >= 0; i--)
+      for (i = num_beamers - 1; i >= 0; i--)
       {
 	int tmp_num_edges = last_num_edges - laser.beamer_edge[i];
 
@@ -1474,44 +1531,7 @@ boolean HitElement(int element, int hit_mask)
 
       if (game_mm.kettles_still_needed == 0)
       {
-	int exit_element = (element == EL_KETTLE ? EL_EXIT_OPEN : EL_RECEIVER);
-	int x, y;
-	static int xy[4][2] =
-	{
-	  { +1,  0 },
-	  {  0, -1 },
-	  { -1,  0 },
-	  {  0, +1 }
-	};
-
-	PlayLevelSound_MM(ELX, ELY, exit_element, MM_ACTION_OPENING);
-
-	for (y = 0; y < lev_fieldy; y++)
-	{
-	  for (x = 0; x < lev_fieldx; x++)
-	  {
-	    /* initiate opening animation of exit door */
-	    if (Feld[x][y] == EL_EXIT_CLOSED)
-	      Feld[x][y] = EL_EXIT_OPENING;
-
-	    /* remove field that blocks receiver */
-	    if (IS_RECEIVER(Feld[x][y]))
-	    {
-	      int phase = Feld[x][y] - EL_RECEIVER_START;
-	      int blocking_x, blocking_y;
-
-	      blocking_x = x + xy[phase][0];
-	      blocking_y = y + xy[phase][1];
-
-	      if (IN_LEV_FIELD(blocking_x, blocking_y))
-	      {
-		Feld[blocking_x][blocking_y] = EL_EMPTY;
-
-		DrawField_MM(blocking_x, blocking_y);
-	      }
-	    }
-	  }
-	}
+	CheckExitMM();
 
 	DrawLaser(0, DL_LASER_ENABLED);
       }