renamed panel option "game.panel.gems_total" to "game.panel.gems_needed"

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 7516968c721841ff0c5544d4b414004db6162bc3..342504b0fbe43814e5d409dbfd739726fec775ac 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -9585,16 +9585,16 @@ struct ConfigInfo image_config[] =
   { "game.panel.gems.class",                           "none"                          },
   { "game.panel.gems.style",                           "none"                          },
 
-  { "game.panel.gems_total.x",                         "-1"                            },
-  { "game.panel.gems_total.y",                         "-1"                            },
-  { "game.panel.gems_total.align",                     "left"                          },
-  { "game.panel.gems_total.valign",                    "top"                           },
-  { "game.panel.gems_total.digits",                    "-1"                            },
-  { "game.panel.gems_total.font",                      "font.text_2"                   },
-  { "game.panel.gems_total.draw_masked",               "true"                          },
-  { "game.panel.gems_total.draw_order",                        "0"                             },
-  { "game.panel.gems_total.class",                     "none"                          },
-  { "game.panel.gems_total.style",                     "none"                          },
+  { "game.panel.gems_needed.x",                                "-1"                            },
+  { "game.panel.gems_needed.y",                                "-1"                            },
+  { "game.panel.gems_needed.align",                    "left"                          },
+  { "game.panel.gems_needed.valign",                   "top"                           },
+  { "game.panel.gems_needed.digits",                   "-1"                            },
+  { "game.panel.gems_needed.font",                     "font.text_2"                   },
+  { "game.panel.gems_needed.draw_masked",              "true"                          },
+  { "game.panel.gems_needed.draw_order",               "0"                             },
+  { "game.panel.gems_needed.class",                    "none"                          },
+  { "game.panel.gems_needed.style",                    "none"                          },
 
   { "game.panel.gems_collected.x",                     "-1"                            },
   { "game.panel.gems_collected.y",                     "-1"                            },

diff --git a/src/game.c b/src/game.c
index b050950d7ff899a5894b31fcef21b98f9bc42aa9..3a9a773661e15b791d594d1ea7d7e48c17a67989 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -89,7 +89,7 @@
 // game panel display and control definitions
 #define GAME_PANEL_LEVEL_NUMBER                        0
 #define GAME_PANEL_GEMS                                1
-#define GAME_PANEL_GEMS_TOTAL                  2
+#define GAME_PANEL_GEMS_NEEDED                 2
 #define GAME_PANEL_GEMS_COLLECTED              3
 #define GAME_PANEL_GEMS_SCORE                  4
 #define GAME_PANEL_INVENTORY_COUNT             5
@@ -246,8 +246,8 @@ static struct GamePanelControlInfo game_panel_controls[] =
     TYPE_INTEGER,
   },
   {
-    GAME_PANEL_GEMS_TOTAL,
-    &game.panel.gems_total,
+    GAME_PANEL_GEMS_NEEDED,
+    &game.panel.gems_needed,
     TYPE_INTEGER,
   },
   {
@@ -2291,10 +2291,10 @@ static void UpdateGameControlValues(void)
              level.game_engine_type == GAME_ENGINE_TYPE_MM ?
              game_mm.kettles_still_needed :
              game.gems_still_needed);
-  int gems_total = level.gems_needed;
+  int gems_needed = level.gems_needed;
   int gems_collected = (level.game_engine_type == GAME_ENGINE_TYPE_BD ?
                        game_bd.game->cave->diamonds_collected :
-                       gems_total - gems);
+                       gems_needed - gems);
   int gems_score = (level.game_engine_type == GAME_ENGINE_TYPE_BD ?
                    game_bd.game->cave->diamond_value :
                    level.score[SC_EMERALD]);
@@ -2325,7 +2325,7 @@ static void UpdateGameControlValues(void)
   // used instead of "level_nr" (for network games)
   game_panel_controls[GAME_PANEL_LEVEL_NUMBER].value = levelset.level_nr;
   game_panel_controls[GAME_PANEL_GEMS].value = gems;
-  game_panel_controls[GAME_PANEL_GEMS_TOTAL].value = gems_total;
+  game_panel_controls[GAME_PANEL_GEMS_NEEDED].value = gems_needed;
   game_panel_controls[GAME_PANEL_GEMS_COLLECTED].value = gems_collected;
   game_panel_controls[GAME_PANEL_GEMS_SCORE].value = gems_score;
 

diff --git a/src/game.h b/src/game.h
index 83c7f00cfd5ab151e93649aa8ae9f56579e26431..4e86e106d671d3f480f91a4ce7477cb73192954d 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -52,7 +52,7 @@ struct GamePanelInfo
 {
   struct TextPosInfo level_number;
   struct TextPosInfo gems;
-  struct TextPosInfo gems_total;
+  struct TextPosInfo gems_needed;
   struct TextPosInfo gems_collected;
   struct TextPosInfo gems_score;
   struct TextPosInfo inventory_count;