added support for fourth digit for inventory (dynamite) count on game panel

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 43a0b8c2eeb12fb2086795b6f2903a68a81e9ebc..8422878aeff98cd52891afaa1411fa5300fabf9f 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -2681,6 +2681,7 @@ static void DisplayGameControlValues(void)
     if (type == TYPE_INTEGER)
     {
       if (nr == GAME_PANEL_LEVEL_NUMBER ||
+         nr == GAME_PANEL_INVENTORY_COUNT ||
          nr == GAME_PANEL_TIME)
       {
        boolean use_dynamic_size = (size == -1 ? TRUE : FALSE);
@@ -5094,7 +5095,14 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry,
     // (special case: historic score entries have an empty tape basename entry)
     if (strEqual(new_entry->tape_basename, entry->tape_basename) &&
        !strEqual(new_entry->tape_basename, UNDEFINED_FILENAME))
+    {
+      // special case: use server score instead of local score value if higher
+      // (historic scores might have been truncated to 16-bit values locally)
+      if (score_is_better)
+       entry->score = new_entry->score;
+
       return -1;
+    }
 
     if (is_better || entry_is_empty)
     {