projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added support for left, middle or right mouse button for CE change events
[rocksndiamonds.git] / src / game.c
diff --git a/src/game.c b/src/game.c
index c1af86314e0a12c979d32a8efac9f0488d844026..48f5e7f158e13c68da188ade38a79d427057f63b 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -879,6 +879,10 @@ static struct GamePanelControlInfo game_panel_controls[] =
                                 RND(element_info[e].move_delay_random))
 #define GET_MAX_MOVE_DELAY(e)  (   (element_info[e].move_delay_fixed) + \
                                    (element_info[e].move_delay_random))
+#define GET_NEW_STEP_DELAY(e)  (   (element_info[e].step_delay_fixed) + \
+                                RND(element_info[e].step_delay_random))
+#define GET_MAX_STEP_DELAY(e)  (   (element_info[e].step_delay_fixed) + \
+                                   (element_info[e].step_delay_random))
 #define GET_NEW_CE_VALUE(e)    (   (element_info[e].ce_value_fixed_initial) +\
                                 RND(element_info[e].ce_value_random_initial))
 #define GET_CE_SCORE(e)                (   (element_info[e].collect_score))
@@ -1071,6 +1075,8 @@ static boolean CheckTriggeredElementChangeExt(int, int, int, int, int,int,int);
        CheckTriggeredElementChangeExt(x, y, e, ev, CH_PLAYER_ANY, s, -1)
 #define CheckTriggeredElementChangeByPage(x, y, e, ev, p)              \
        CheckTriggeredElementChangeExt(x,y,e,ev, CH_PLAYER_ANY, CH_SIDE_ANY, p)
+#define CheckTriggeredElementChangeByMouse(x, y, e, ev, s)             \
+       CheckTriggeredElementChangeExt(x, y, e, ev, CH_PLAYER_ANY, s, -1)
 
 static boolean CheckElementChangeExt(int, int, int, int, int, int, int);
 #define CheckElementChange(x, y, e, te, ev)                            \
@@ -1079,6 +1085,8 @@ static boolean CheckElementChangeExt(int, int, int, int, int, int, int);
        CheckElementChangeExt(x, y, e, EL_EMPTY, ev, p, s)
 #define CheckElementChangeBySide(x, y, e, te, ev, s)                   \
        CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, s)
+#define CheckElementChangeByMouse(x, y, e, ev, s)                      \
+       CheckElementChangeExt(x, y, e, EL_UNDEFINED, ev, CH_PLAYER_ANY, s)
 
 static void PlayLevelSound(int, int, int);
 static void PlayLevelSoundNearest(int, int, int);
@@ -4721,9 +4729,6 @@ void GameWon(void)
   static int game_over_delay_1 = 0;
   static int game_over_delay_2 = 0;
   static int game_over_delay_3 = 0;
-  int game_over_delay_value_1 = 50;
-  int game_over_delay_value_2 = 25;
-  int game_over_delay_value_3 = 50;
   int time_score_base = MIN(MAX(1, level.time_score_base), 10);
   float time_score = (float)level.score[SC_TIME_BONUS] / time_score_base;
 
@@ -4751,9 +4756,9 @@ void GameWon(void)
 
     TapeStop();
 
-    game_over_delay_1 = 0;
-    game_over_delay_2 = 0;
-    game_over_delay_3 = game_over_delay_value_3;
+    game_over_delay_1 = FRAMES_PER_SECOND;     // delay before counting time
+    game_over_delay_2 = FRAMES_PER_SECOND / 2; // delay before counting health
+    game_over_delay_3 = FRAMES_PER_SECOND;     // delay before ending the game
 
     time = time_final = (game.no_time_limit ? TimePlayed : TimeLeft);
     score = score_final = game.score_final;
@@ -4778,14 +4783,10 @@ void GameWon(void)
 
       time_count_steps = MAX(1, ABS(time_final - time) / 100);
 
-      game_over_delay_1 = game_over_delay_value_1;
-
       if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
       {
        health_final = 0;
        score_final += health * time_score;
-
-       game_over_delay_2 = game_over_delay_value_2;
       }
 
       game.score_final = score_final;
@@ -4858,15 +4859,15 @@ void GameWon(void)
 
   if (setup.count_score_after_game)
   {
-    if (game_over_delay_1 > 0)
+    if (time != time_final)
     {
-      game_over_delay_1--;
+      if (game_over_delay_1 > 0)
+      {
+       game_over_delay_1--;
 
-      return;
-    }
+       return;
+      }
 
-    if (time != time_final)
-    {
       int time_to_go = ABS(time_final - time);
       int time_count_dir = (time < time_final ? +1 : -1);
 
@@ -4898,15 +4899,15 @@ void GameWon(void)
       return;
     }
 
-    if (game_over_delay_2 > 0)
+    if (health != health_final)
     {
-      game_over_delay_2--;
+      if (game_over_delay_2 > 0)
+      {
+       game_over_delay_2--;
 
-      return;
-    }
+       return;
+      }
 
-    if (health != health_final)
-    {
       int health_count_dir = (health < health_final ? +1 : -1);
 
       health += health_count_dir;
@@ -5356,13 +5357,15 @@ void DrawDynamite(int x, int y)
     return;
 
   if (Back[x][y])
-    DrawGraphic(sx, sy, el2img(Back[x][y]), 0);
+    DrawLevelElement(x, y, Back[x][y]);
   else if (Store[x][y])
-    DrawGraphic(sx, sy, el2img(Store[x][y]), 0);
+    DrawLevelElement(x, y, Store[x][y]);
+  else if (game.use_masked_elements)
+    DrawLevelElement(x, y, EL_EMPTY);
 
   frame = getGraphicAnimationFrame(graphic, GfxFrame[x][y]);
 
-  if (Back[x][y] || Store[x][y])
+  if (Back[x][y] || Store[x][y] || game.use_masked_elements)
     DrawGraphicThruMask(sx, sy, graphic, frame);
   else
     DrawGraphic(sx, sy, graphic, frame);
@@ -5935,7 +5938,7 @@ static void Explode(int ex, int ey, int phase, int mode)
       DrawLevelElementThruMask(x, y, Back[x][y]);
     }
     else if (!IS_WALKABLE_INSIDE(Back[x][y]))
-      DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
+      DrawScreenGraphic(SCREENX(x), SCREENY(y), graphic, frame);
   }
 }
 
@@ -8510,11 +8513,33 @@ void ContinueMoving(int x, int y)
   boolean pushed_by_player   = (Pushed[x][y] && IS_PLAYER(x, y));
   boolean pushed_by_conveyor = (Pushed[x][y] && !IS_PLAYER(x, y));
   boolean last_line = (newy == lev_fieldy - 1);
+  boolean use_step_delay = (GET_MAX_STEP_DELAY(element) != 0);
 
-  MovPos[x][y] += getElementMoveStepsize(x, y);
-
-  if (pushed_by_player)        // special case: moving object pushed by player
+  if (pushed_by_player)                // special case: moving object pushed by player
+  {
     MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos));
+  }
+  else if (use_step_delay)     // special case: moving object has step delay
+  {
+    if (!MovDelay[x][y])
+      MovPos[x][y] += getElementMoveStepsize(x, y);
+
+    if (MovDelay[x][y])
+      MovDelay[x][y]--;
+    else
+      MovDelay[x][y] = GET_NEW_STEP_DELAY(element);
+
+    if (MovDelay[x][y])
+    {
+      TEST_DrawLevelField(x, y);
+
+      return;  // element is still waiting
+    }
+  }
+  else                         // normal case: generically moving object
+  {
+    MovPos[x][y] += getElementMoveStepsize(x, y);
+  }
 
   if (ABS(MovPos[x][y]) < TILEX)
   {
@@ -12120,6 +12145,7 @@ void GameActions_RND(void)
   if (mouse_action.button)
   {
     int new_button = (mouse_action.button && mouse_action_last.button == 0);
+    int ch_button = CH_SIDE_FROM_BUTTON(mouse_action.button);
 
     x = mouse_action.lx;
     y = mouse_action.ly;
@@ -12127,12 +12153,14 @@ void GameActions_RND(void)
 
     if (new_button)
     {
-      CheckElementChange(x, y, element, EL_UNDEFINED, CE_CLICKED_BY_MOUSE);
-      CheckTriggeredElementChange(x, y, element, CE_MOUSE_CLICKED_ON_X);
+      CheckElementChangeByMouse(x, y, element, CE_CLICKED_BY_MOUSE, ch_button);
+      CheckTriggeredElementChangeByMouse(x, y, element, CE_MOUSE_CLICKED_ON_X,
+                                        ch_button);
     }
 
-    CheckElementChange(x, y, element, EL_UNDEFINED, CE_PRESSED_BY_MOUSE);
-    CheckTriggeredElementChange(x, y, element, CE_MOUSE_PRESSED_ON_X);
+    CheckElementChangeByMouse(x, y, element, CE_PRESSED_BY_MOUSE, ch_button);
+    CheckTriggeredElementChangeByMouse(x, y, element, CE_MOUSE_PRESSED_ON_X,
+                                      ch_button);
   }
 
   SCAN_PLAYFIELD(x, y)
Rocks'n'Diamonds