moved code for fading out laser to separate function in MM engine

[rocksndiamonds.git] / src / game_mm / mm_game.c

diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c
index 1ef6339e826957c521ef5d79efc81935cbd8ebba..c3d573db93c59ff2430e378f4c7595246b49e1fe 100644 (file)
--- a/src/game_mm/mm_game.c
+++ b/src/game_mm/mm_game.c
@@ -714,6 +714,32 @@ void InitGameActions_MM(void)
   SetTileCursorActive(TRUE);
 }
 
+static void FadeOutLaser(boolean overloaded)
+{
+  int i;
+
+  for (i = 15; i >= 0; i--)
+  {
+    if (overloaded)
+      pen_ray = GetPixelFromRGB(window, 0x11 * i, 0x00, 0x00);
+    else
+      pen_ray = GetPixelFromRGB(window,
+                               native_mm_level.laser_red   * 0x11 * i,
+                               native_mm_level.laser_green * 0x11 * i,
+                               native_mm_level.laser_blue  * 0x11 * i);
+
+    DrawLaser(0, DL_LASER_ENABLED);
+
+    BackToFront();
+    Delay_WithScreenUpdates(50);
+  }
+
+  DrawLaser(0, DL_LASER_DISABLED);
+
+  if (!overloaded)
+    StopSound_MM(SND_MM_GAME_HEALTH_CHARGING);
+}
+
 void AddLaserEdge(int lx, int ly)
 {
   int clx = dSX + lx;
@@ -1463,14 +1489,14 @@ boolean HitElement(int element, int hit_mask)
     LX += step_size * XS;
     LY += step_size * YS;
 
-#if 0
     // draw sparkles on mirror
-    if ((IS_MIRROR(element) || IS_MIRROR_FIXED(element)) &&
+    if ((IS_MIRROR(element) ||
+        IS_MIRROR_FIXED(element) ||
+        element == EL_PRISM) &&
        current_angle != laser.current_angle)
     {
-      MoveSprite(vp, &Pfeil[2], 4 + 16 * ELX, 5 + 16 * ELY + 1);
+      MovDelay[ELX][ELY] = 11;         // start animation
     }
-#endif
 
     if ((!IS_POLAR(element) && !IS_POLAR_CROSS(element)) &&
        current_angle != laser.current_angle)
@@ -2404,11 +2430,31 @@ static void GrowAmoeba(int x, int y)
 
 static void DrawFieldAnimated_MM(int x, int y)
 {
+  int element = Tile[x][y];
+
   if (IS_BLOCKED(x, y))
     return;
 
   DrawField_MM(x, y);
 
+  if (IS_MIRROR(element) ||
+      IS_MIRROR_FIXED(element) ||
+      element == EL_PRISM)
+  {
+    if (MovDelay[x][y] != 0)   // wait some time before next frame
+    {
+      MovDelay[x][y]--;
+
+      if (MovDelay[x][y] != 0)
+      {
+       int graphic = IMG_TWINKLE_WHITE;
+       int frame = getGraphicAnimationFrame(graphic, 10 - MovDelay[x][y]);
+
+       DrawGraphicThruMask_MM(SCREENX(x), SCREENY(y), graphic, frame);
+      }
+    }
+  }
+
   laser.redraw = TRUE;
 }
 
@@ -2930,7 +2976,9 @@ void RotateMirror(int x, int y, int button)
              LX, LY, laser.beamer_edge, laser.beamer[1].num);
 #endif
 
+#if 0
        laser.num_edges--;
+#endif
       }
 
       ScanLaser();
@@ -3136,29 +3184,8 @@ static void GameActions_MM_Ext(void)
     }
     else if (game.time_limit && !game_mm.game_over)
     {
-      int i;
-
-      for (i = 15; i >= 0; i--)
-      {
-#if 0
-       SetRGB(pen_ray, 0x0000, 0x0000, i * color_scale);
-#endif
-       pen_ray = GetPixelFromRGB(window,
-                                 native_mm_level.laser_red   * 0x11 * i,
-                                 native_mm_level.laser_green * 0x11 * i,
-                                 native_mm_level.laser_blue  * 0x11 * i);
-
-       DrawLaser(0, DL_LASER_ENABLED);
-       BackToFront();
-       Delay_WithScreenUpdates(50);
-      }
-
-      StopSound_MM(SND_MM_GAME_HEALTH_CHARGING);
-#if 0
-      FadeMusic();
-#endif
+      FadeOutLaser(FALSE);
 
-      DrawLaser(0, DL_LASER_DISABLED);
       game_mm.game_over = TRUE;
       game_mm.game_over_cause = GAME_OVER_NO_ENERGY;
 
@@ -3262,24 +3289,9 @@ static void GameActions_MM_Ext(void)
 
     if (laser.overload_value == MAX_LASER_OVERLOAD)
     {
-      int i;
-
       UpdateAndDisplayGameControlValues();
 
-      for (i = 15; i >= 0; i--)
-      {
-#if 0
-       SetRGB(pen_ray, i * color_scale, 0x0000, 0x0000);
-#endif
-
-       pen_ray = GetPixelFromRGB(window, 0x11 * i, 0x00, 0x00);
-
-       DrawLaser(0, DL_LASER_ENABLED);
-       BackToFront();
-       Delay_WithScreenUpdates(50);
-      }
-
-      DrawLaser(0, DL_LASER_DISABLED);
+      FadeOutLaser(TRUE);
 
       game_mm.game_over = TRUE;
       game_mm.game_over_cause = GAME_OVER_OVERLOADED;