X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=dafe7cbfc56f3c67706a06989e63ba845da56c94;hb=5f7e42c2a1f31213f042dee3dfff1b4de179a9ec;hp=b39383fdd3cbcb0d789e1f97ca213454de3db429;hpb=020b38ef4e6b4adcb7c0755366e3ba5adf1180dc;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index b39383fd..dafe7cbf 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2325,6 +2325,43 @@ static void UpdateGameControlValues(void)
       stored_player[player_nr].num_white_keys;
   }
 
+  // try to display as many collected keys as possible in the default game panel
+  for (i = STD_NUM_KEYS; i < MAX_NUM_KEYS + 1; i++)	// EMC keys + white key
+  {
+    int nr = GAME_PANEL_KEY_1 + i;
+    int emc_key = get_key_element_from_nr(i);
+    int element = (i < MAX_NUM_KEYS ? emc_key : EL_DC_KEY_WHITE);
+    struct GamePanelControlInfo *gpc = &game_panel_controls[nr];
+    struct TextPosInfo *pos = gpc->pos;
+
+    // check if panel position is undefined for a certain EMC key or white key
+    if (gpc->value != EL_EMPTY && 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 = element;
+      }
+      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 = element;
+
+	    break;
+	  }
+	}
+      }
+    }
+  }
+
   for (i = 0; i < NUM_PANEL_INVENTORY; i++)
   {
     game_panel_controls[GAME_PANEL_INVENTORY_FIRST_1 + i].value =
@@ -2589,6 +2626,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;