added some more automatically generated files to be ignored by Git

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 8422878aeff98cd52891afaa1411fa5300fabf9f..72d27a1ae4469632d7a566fa2ffaeea353bb8bed 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -2682,15 +2682,24 @@ static void DisplayGameControlValues(void)
     {
       if (nr == GAME_PANEL_LEVEL_NUMBER ||
          nr == GAME_PANEL_INVENTORY_COUNT ||
+         nr == GAME_PANEL_SCORE ||
+         nr == GAME_PANEL_HIGHSCORE ||
          nr == GAME_PANEL_TIME)
       {
        boolean use_dynamic_size = (size == -1 ? TRUE : FALSE);
 
        if (use_dynamic_size)           // use dynamic number of digits
        {
-         int value_change = (nr == GAME_PANEL_LEVEL_NUMBER ? 100 : 1000);
-         int size1 = (nr == GAME_PANEL_LEVEL_NUMBER ? 2 : 3);
-         int size2 = size1 + 1;
+         int value_change = (nr == GAME_PANEL_LEVEL_NUMBER ? 100 :
+                             nr == GAME_PANEL_INVENTORY_COUNT ||
+                             nr == GAME_PANEL_TIME ? 1000 : 100000);
+         int size_add = (nr == GAME_PANEL_LEVEL_NUMBER ||
+                         nr == GAME_PANEL_INVENTORY_COUNT ||
+                         nr == GAME_PANEL_TIME ? 1 : 2);
+         int size1 = (nr == GAME_PANEL_LEVEL_NUMBER ? 2 :
+                      nr == GAME_PANEL_INVENTORY_COUNT ||
+                      nr == GAME_PANEL_TIME ? 3 : 5);
+         int size2 = size1 + size_add;
          int font1 = pos->font;
          int font2 = pos->font_alt;
 
@@ -11762,6 +11771,9 @@ void StartGameActions(boolean init_network_game, boolean record_tape,
   if (record_tape)
     TapeStartRecording(new_random_seed);
 
+  if (setup.auto_pause_on_start && !tape.pausing)
+    TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
   if (init_network_game)
   {
     SendToServer_LevelFile();
@@ -16425,8 +16437,15 @@ static void MapGameButtonsExt(boolean on_tape)
   int i;
 
   for (i = 0; i < NUM_GAME_BUTTONS; i++)
+  {
+    if ((i == GAME_CTRL_ID_UNDO ||
+        i == GAME_CTRL_ID_REDO) &&
+       game_status != GAME_MODE_PLAYING)
+      continue;
+
     if (!on_tape || gamebutton_info[i].allowed_on_tape)
       MapGadget(game_gadget[i]);
+  }
 
   UnmapGameButtonsAtSamePosition_All();