X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=fd1bdc53d936c6a821c8639b66a331d09ccd6750;hb=90cd4dc88df3f891ecaa0ee9b9010fe432154503;hp=d5256fd4ed0cd9b6b1bb62e7b3c319aa540b09eb;hpb=7f125847296380e85814a98acb6a0b0dab4c2cf6;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index d5256fd4..fd1bdc53 100644
--- a/src/game.c
+++ b/src/game.c
@@ -10160,6 +10160,9 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
 	if (CustomValue[x][y] == 0)
 	{
+	  // reset change counter (else CE_VALUE_GETS_ZERO would not work)
+	  ChangeCount[x][y] = 0;	// allow at least one more change
+
 	  CheckElementChange(x, y, element, EL_UNDEFINED, CE_VALUE_GETS_ZERO);
 	  CheckTriggeredElementChange(x, y, element, CE_VALUE_GETS_ZERO_OF_X);
 	}
@@ -10183,6 +10186,9 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 	{
 	  int xx, yy;
 
+	  // reset change counter (else CE_SCORE_GETS_ZERO would not work)
+	  ChangeCount[x][y] = 0;	// allow at least one more change
+
 	  CheckElementChange(x, y, element, EL_UNDEFINED, CE_SCORE_GETS_ZERO);
 	  CheckTriggeredElementChange(x, y, element, CE_SCORE_GETS_ZERO_OF_X);
 
@@ -11681,6 +11687,8 @@ void GameActions_RND_Main(void)
 
 void GameActions_RND(void)
 {
+  static struct MouseActionInfo mouse_action_last = { 0 };
+  struct MouseActionInfo mouse_action = local_player->effective_mouse_action;
   int magic_wall_x = 0, magic_wall_y = 0;
   int i, x, y, element, graphic, last_gfx_frame;
 
@@ -11867,6 +11875,24 @@ void GameActions_RND(void)
 #endif
   }
 
+  if (mouse_action.button)
+  {
+    int new_button = (mouse_action.button && mouse_action_last.button == 0);
+
+    x = local_player->mouse_action.lx;
+    y = local_player->mouse_action.ly;
+    element = Feld[x][y];
+
+    if (new_button)
+    {
+      CheckElementChange(x, y, element, EL_UNDEFINED, CE_CLICKED_BY_MOUSE);
+      CheckTriggeredElementChange(x, y, element, CE_MOUSE_CLICKED_ON_X);
+    }
+
+    CheckElementChange(x, y, element, EL_UNDEFINED, CE_PRESSED_BY_MOUSE);
+    CheckTriggeredElementChange(x, y, element, CE_MOUSE_PRESSED_ON_X);
+  }
+
   SCAN_PLAYFIELD(x, y)
   {
     element = Feld[x][y];
@@ -12208,6 +12234,8 @@ void GameActions_RND(void)
   // use random number generator in every frame to make it less predictable
   if (game.engine_version >= VERSION_IDENT(3,1,1,0))
     RND(1);
+
+  mouse_action_last = mouse_action;
 }
 
 static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y)