X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=edf7f6ab5066ef7af0900bcdcac720f386b7e4af;hb=0dcc9cbb74fb123dcb9ef18b1e00aca24604007b;hp=c926738df7c2a3c7f724a83c76d817a14bce78d3;hpb=343ecd1bed93fa862903ff981ede342825f14401;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index c926738d..edf7f6ab 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2147,8 +2147,9 @@ static void InitGameControlValues(void)
 
     if (nr != i)
     {
-      Error(ERR_INFO, "'game_panel_controls' structure corrupted at %d", i);
-      Error(ERR_EXIT, "this should not happen -- please debug");
+      Error("'game_panel_controls' structure corrupted at %d", i);
+
+      Fail("this should not happen -- please debug");
     }
 
     // force update of game controls after initialization
@@ -2250,6 +2251,7 @@ static void UpdateGameControlValues(void)
 		level.game_engine_type == GAME_ENGINE_TYPE_MM ?
 		MM_HEALTH(game_mm.laser_overload_value) :
 		game.health);
+  int sync_random_frame = INIT_GFX_RANDOM();	// random, but synchronized
 
   UpdatePlayfieldElementCount();
 
@@ -2324,6 +2326,63 @@ static void UpdateGameControlValues(void)
       stored_player[player_nr].num_white_keys;
   }
 
+  // re-arrange keys on game panel, if needed or if defined by style settings
+  for (i = 0; i < MAX_NUM_KEYS + 1; i++)	// all normal keys + white key
+  {
+    int nr = GAME_PANEL_KEY_1 + i;
+    struct GamePanelControlInfo *gpc = &game_panel_controls[nr];
+    struct TextPosInfo *pos = gpc->pos;
+
+    // skip check if key is not in the player's inventory
+    if (gpc->value == EL_EMPTY)
+      continue;
+
+    // check if keys should be arranged on panel from left to right
+    if (pos->style == STYLE_LEFTMOST_POSITION)
+    {
+      // check previous key positions (left from current key)
+      for (k = 0; k < i; k++)
+      {
+	int nr_new = GAME_PANEL_KEY_1 + k;
+
+	if (game_panel_controls[nr_new].value == EL_EMPTY)
+	{
+	  game_panel_controls[nr_new].value = gpc->value;
+	  gpc->value = EL_EMPTY;
+
+	  break;
+	}
+      }
+    }
+
+    // check if "undefined" keys can be placed at some other position
+    if (pos->x == -1 && pos->y == -1)
+    {
+      int nr_new = GAME_PANEL_KEY_1 + i % STD_NUM_KEYS;
+
+      // 1st try: display key at the same position as normal or EM keys
+      if (game_panel_controls[nr_new].value == EL_EMPTY)
+      {
+	game_panel_controls[nr_new].value = gpc->value;
+      }
+      else
+      {
+	// 2nd try: display key at the next free position in the key panel
+	for (k = 0; k < STD_NUM_KEYS; k++)
+	{
+	  nr_new = GAME_PANEL_KEY_1 + k;
+
+	  if (game_panel_controls[nr_new].value == EL_EMPTY)
+	  {
+	    game_panel_controls[nr_new].value = gpc->value;
+
+	    break;
+	  }
+	}
+      }
+    }
+  }
+
   for (i = 0; i < NUM_PANEL_INVENTORY; i++)
   {
     game_panel_controls[GAME_PANEL_INVENTORY_FIRST_1 + i].value =
@@ -2477,11 +2536,13 @@ static void UpdateGameControlValues(void)
 	int last_anim_random_frame = gfx.anim_random_frame;
 	int element = gpc->value;
 	int graphic = el2panelimg(element);
+	int init_gfx_random = (graphic_info[graphic].anim_global_sync ?
+			       sync_random_frame : INIT_GFX_RANDOM());
 
 	if (gpc->value != gpc->last_value)
 	{
 	  gpc->gfx_frame = 0;
-	  gpc->gfx_random = INIT_GFX_RANDOM();
+	  gpc->gfx_random = init_gfx_random;
 	}
 	else
 	{
@@ -2489,7 +2550,7 @@ static void UpdateGameControlValues(void)
 
 	  if (ANIM_MODE(graphic) == ANIM_RANDOM &&
 	      IS_NEXT_FRAME(gpc->gfx_frame, graphic))
-	    gpc->gfx_random = INIT_GFX_RANDOM();
+	    gpc->gfx_random = init_gfx_random;
 	}
 
 	if (ANIM_MODE(graphic) == ANIM_RANDOM)
@@ -2498,8 +2559,7 @@ static void UpdateGameControlValues(void)
 	if (ANIM_MODE(graphic) == ANIM_CE_SCORE)
 	  gpc->gfx_frame = element_info[element].collect_score;
 
-	gpc->frame = getGraphicAnimationFrame(el2panelimg(gpc->value),
-					      gpc->gfx_frame);
+	gpc->frame = getGraphicAnimationFrame(graphic, gpc->gfx_frame);
 
 	if (ANIM_MODE(graphic) == ANIM_RANDOM)
 	  gfx.anim_random_frame = last_anim_random_frame;
@@ -2511,11 +2571,13 @@ static void UpdateGameControlValues(void)
       {
 	int last_anim_random_frame = gfx.anim_random_frame;
 	int graphic = gpc->graphic;
+	int init_gfx_random = (graphic_info[graphic].anim_global_sync ?
+			       sync_random_frame : INIT_GFX_RANDOM());
 
 	if (gpc->value != gpc->last_value)
 	{
 	  gpc->gfx_frame = 0;
-	  gpc->gfx_random = INIT_GFX_RANDOM();
+	  gpc->gfx_random = init_gfx_random;
 	}
 	else
 	{
@@ -2523,7 +2585,7 @@ static void UpdateGameControlValues(void)
 
 	  if (ANIM_MODE(graphic) == ANIM_RANDOM &&
 	      IS_NEXT_FRAME(gpc->gfx_frame, graphic))
-	    gpc->gfx_random = INIT_GFX_RANDOM();
+	    gpc->gfx_random = init_gfx_random;
 	}
 
 	if (ANIM_MODE(graphic) == ANIM_RANDOM)
@@ -2588,6 +2650,10 @@ static void DisplayGameControlValues(void)
     if (PANEL_DEACTIVATED(pos))
       continue;
 
+    if (pos->class == get_hash_from_key("extra_panel_items") &&
+	!setup.prefer_extra_panel_items)
+      continue;
+
     gpc->last_value = value;
     gpc->last_frame = frame;
 
@@ -2635,7 +2701,10 @@ static void DisplayGameControlValues(void)
 	element = value;
 	graphic = el2panelimg(value);
 
-	// printf("::: %d, '%s' [%d]\n", element, EL_NAME(element), size);
+#if 0
+	Debug("game:DisplayGameControlValues", "%d, '%s' [%d]",
+	      element, EL_NAME(element), size);
+#endif
 
 	if (element >= EL_GRAPHIC_1 && element <= EL_GRAPHIC_8 && size == 0)
 	  size = TILESIZE;
@@ -11196,6 +11265,15 @@ static void CheckSaveEngineSnapshot(struct PlayerInfo *player)
     if (!player->is_dropping)
       player->was_dropping = FALSE;
   }
+
+  static struct MouseActionInfo mouse_action_last = { 0 };
+  struct MouseActionInfo mouse_action = player->effective_mouse_action;
+  boolean new_released = (!mouse_action.button && mouse_action_last.button);
+
+  if (new_released)
+    CheckSaveEngineSnapshotToList();
+
+  mouse_action_last = mouse_action;
 }
 
 static void CheckSingleStepMode(struct PlayerInfo *player)
@@ -11206,7 +11284,8 @@ static void CheckSingleStepMode(struct PlayerInfo *player)
        player stopped moving after one tile (or never starts moving at all) */
     if (!player->is_moving &&
 	!player->is_pushing &&
-	!player->is_dropping_pressed)
+	!player->is_dropping_pressed &&
+	!player->effective_mouse_action.button)
       TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
   }
 
@@ -11657,9 +11736,8 @@ static void GameActionsExt(void)
     byte mapped_action[MAX_PLAYERS];
 
 #if DEBUG_PLAYER_ACTIONS
-    printf(":::");
     for (i = 0; i < MAX_PLAYERS; i++)
-      printf(" %d, ", stored_player[i].effective_action);
+      DebugContinued("", "%d, ", stored_player[i].effective_action);
 #endif
 
     for (i = 0; i < MAX_PLAYERS; i++)
@@ -11669,19 +11747,18 @@ static void GameActionsExt(void)
       stored_player[i].effective_action = mapped_action[i];
 
 #if DEBUG_PLAYER_ACTIONS
-    printf(" =>");
+    DebugContinued("", "=> ");
     for (i = 0; i < MAX_PLAYERS; i++)
-      printf(" %d, ", stored_player[i].effective_action);
-    printf("\n");
+      DebugContinued("", "%d, ", stored_player[i].effective_action);
+    DebugContinued("game:playing:player", "\n");
 #endif
   }
 #if DEBUG_PLAYER_ACTIONS
   else
   {
-    printf(":::");
     for (i = 0; i < MAX_PLAYERS; i++)
-      printf(" %d, ", stored_player[i].effective_action);
-    printf("\n");
+      DebugContinued("", "%d, ", stored_player[i].effective_action);
+    DebugContinued("game:playing:player", "\n");
   }
 #endif
 #endif
@@ -13985,6 +14062,10 @@ static int DigField(struct PlayerInfo *player,
     CheckTriggeredElementChangeByPlayer(x, y, element, CE_PLAYER_DIGS_X,
 					player->index_bit, dig_side);
 
+    // if digging triggered player relocation, finish digging tile
+    if (mode == DF_DIG && (player->jx != jx || player->jy != jy))
+      setFieldForSnapping(x, y, element, move_direction);
+
     if (mode == DF_SNAP)
     {
       if (level.block_snap_field)
@@ -14106,9 +14187,15 @@ static int DigField(struct PlayerInfo *player,
     PlayLevelSoundElementAction(x, y, element, ACTION_COLLECTING);
 
     if (is_player)
+    {
       CheckTriggeredElementChangeByPlayer(x, y, element, CE_PLAYER_COLLECTS_X,
 					  player->index_bit, dig_side);
 
+      // if collecting triggered player relocation, finish collecting tile
+      if (mode == DF_DIG && (player->jx != jx || player->jy != jy))
+	setFieldForSnapping(x, y, element, move_direction);
+    }
+
     if (mode == DF_SNAP)
     {
       if (level.block_snap_field)
@@ -15230,6 +15317,9 @@ void RequestRestartGame(char *message)
   }
   else
   {
+    // needed in case of envelope request to close game panel
+    CloseDoor(DOOR_CLOSE_1);
+
     SetGameStatus(GAME_MODE_MAIN);
 
     DrawMainMenu();
@@ -15421,10 +15511,11 @@ static void LoadEngineSnapshotValues_RND(void)
 
   if (game.num_random_calls != num_random_calls)
   {
-    Error(ERR_INFO, "number of random calls out of sync");
-    Error(ERR_INFO, "number of random calls should be %d", num_random_calls);
-    Error(ERR_INFO, "number of random calls is %d", game.num_random_calls);
-    Error(ERR_EXIT, "this should not happen -- please debug");
+    Error("number of random calls out of sync");
+    Error("number of random calls should be %d", num_random_calls);
+    Error("number of random calls is %d", game.num_random_calls);
+
+    Fail("this should not happen -- please debug");
   }
 }
 
@@ -15833,7 +15924,7 @@ void CreateGameButtons(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     game_gadget[id] = gi;
   }