added support for new game mode for score info page (not used yet)

diff --git a/src/anim.c b/src/anim.c
index c2ec75f64c65a87ea17212d0a66c34773de1a0d4..78965ba032268ae5e3181ed3a25599c1092fa158 100644 (file)
--- a/src/anim.c
+++ b/src/anim.c
@@ -189,6 +189,7 @@ struct GameModeAnimClass
   { GAME_MODE_PSEUDO_TYPENAME,         ANIM_CLASS_TOONS_MENU_MAIN      },
   { GAME_MODE_PSEUDO_SCORESOLD,                ANIM_CLASS_TOONS_SCORES         },
   { GAME_MODE_PSEUDO_SCORESNEW,                ANIM_CLASS_TOONS_SCORES         },
+  { GAME_MODE_SCOREINFO,               ANIM_CLASS_TOONS_SCORES         },
   { GAME_MODE_EDITOR,                  ANIM_CLASS_NO_TITLE             },
   { GAME_MODE_PLAYING,                 ANIM_CLASS_NO_TITLE             },
 

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index b42b955fc68751fe70298a95796151c898ed1a95..a84abc70cf7615c34102b46f5821fad5b305c068 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -7341,6 +7341,7 @@ struct ConfigInfo image_config[] =
   { "background.LEVELS",                       UNDEFINED_FILENAME      },
   { "background.LEVELNR",                      UNDEFINED_FILENAME      },
   { "background.SCORES",                       UNDEFINED_FILENAME      },
+  { "background.SCOREINFO",                    UNDEFINED_FILENAME      },
   { "background.EDITOR",                       UNDEFINED_FILENAME      },
   { "background.INFO",                         UNDEFINED_FILENAME      },
   { "background.INFO[ELEMENTS]",               UNDEFINED_FILENAME      },
@@ -7865,6 +7866,7 @@ struct ConfigInfo image_config[] =
   { "border.draw_masked.LEVELS",               "false"                 },
   { "border.draw_masked.LEVELNR",              "false"                 },
   { "border.draw_masked.SCORES",               "false"                 },
+  { "border.draw_masked.SCOREINFO",            "false"                 },
   { "border.draw_masked.EDITOR",               "false"                 },
   { "border.draw_masked.INFO",                 "false"                 },
   { "border.draw_masked.SETUP",                        "false"                 },
@@ -7948,6 +7950,8 @@ struct ConfigInfo image_config[] =
   { "menu.draw_yoffset.LEVELNR",               "0"                     },
   { "menu.draw_xoffset.SCORES",                        "0"                     },
   { "menu.draw_yoffset.SCORES",                        "0"                     },
+  { "menu.draw_xoffset.SCOREINFO",             "0"                     },
+  { "menu.draw_yoffset.SCOREINFO",             "0"                     },
   { "menu.draw_xoffset.EDITOR",                        "0"                     },
   { "menu.draw_yoffset.EDITOR",                        "0"                     },
   { "menu.draw_xoffset.INFO",                  "0"                     },
@@ -8015,6 +8019,7 @@ struct ConfigInfo image_config[] =
   { "menu.list_size.INFO[ELEMENTS]",           "-1"                    },
   { "menu.list_size.SETUP",                    "-1"                    },
 
+  { "menu.left_spacing.SCOREINFO",             "16"                    },
   { "menu.left_spacing.INFO",                  "16"                    },
   { "menu.left_spacing.INFO[TITLE]",           "16"                    },
   { "menu.left_spacing.INFO[ELEMENTS]",                "16"                    },
@@ -8025,6 +8030,7 @@ struct ConfigInfo image_config[] =
   { "menu.left_spacing.INFO[LEVELSET]",                "16"                    },
   { "menu.left_spacing.SETUP[INPUT]",          "16"                    },
 
+  { "menu.right_spacing.SCOREINFO",            "16"                    },
   { "menu.right_spacing.INFO",                 "16"                    },
   { "menu.right_spacing.INFO[TITLE]",          "16"                    },
   { "menu.right_spacing.INFO[ELEMENTS]",       "16"                    },
@@ -8035,6 +8041,7 @@ struct ConfigInfo image_config[] =
   { "menu.right_spacing.INFO[LEVELSET]",       "16"                    },
   { "menu.right_spacing.SETUP[INPUT]",         "16"                    },
 
+  { "menu.top_spacing.SCOREINFO",              "100"                   },
   { "menu.top_spacing.INFO",                   "100"                   },
   { "menu.top_spacing.INFO[TITLE]",            "100"                   },
   { "menu.top_spacing.INFO[ELEMENTS]",         "100"                   },
@@ -8045,6 +8052,7 @@ struct ConfigInfo image_config[] =
   { "menu.top_spacing.INFO[LEVELSET]",         "100"                   },
   { "menu.top_spacing.SETUP[INPUT]",           "100"                   },
 
+  { "menu.bottom_spacing.SCOREINFO",           "20"                    },
   { "menu.bottom_spacing.INFO",                        "20"                    },
   { "menu.bottom_spacing.INFO[TITLE]",         "20"                    },
   { "menu.bottom_spacing.INFO[ELEMENTS]",      "20"                    },
@@ -8055,6 +8063,7 @@ struct ConfigInfo image_config[] =
   { "menu.bottom_spacing.INFO[LEVELSET]",      "20"                    },
   { "menu.bottom_spacing.SETUP[INPUT]",                "20"                    },
 
+  { "menu.paragraph_spacing.SCOREINFO",                "-2"                    },
   { "menu.paragraph_spacing.INFO",             "-3"                    },
   { "menu.paragraph_spacing.INFO[TITLE]",      "-3"                    },
   { "menu.paragraph_spacing.INFO[ELEMENTS]",   "-3"                    },
@@ -8065,6 +8074,7 @@ struct ConfigInfo image_config[] =
   { "menu.paragraph_spacing.INFO[LEVELSET]",   "-3"                    },
   { "menu.paragraph_spacing.SETUP[INPUT]",     "-1"                    },
 
+  { "menu.headline1_spacing.SCOREINFO",                "-2"                    },
   { "menu.headline1_spacing.INFO",             "-2"                    },
   { "menu.headline1_spacing.INFO[TITLE]",      "-2"                    },
   { "menu.headline1_spacing.INFO[ELEMENTS]",   "-2"                    },
@@ -8075,6 +8085,7 @@ struct ConfigInfo image_config[] =
   { "menu.headline1_spacing.INFO[LEVELSET]",   "-2"                    },
   { "menu.headline1_spacing.SETUP[INPUT]",     "-2"                    },
 
+  { "menu.headline2_spacing.SCOREINFO",                "-1"                    },
   { "menu.headline2_spacing.INFO",             "-1"                    },
   { "menu.headline2_spacing.INFO[TITLE]",      "-1"                    },
   { "menu.headline2_spacing.INFO[ELEMENTS]",   "-1"                    },
@@ -8085,6 +8096,7 @@ struct ConfigInfo image_config[] =
   { "menu.headline2_spacing.INFO[LEVELSET]",   "-1"                    },
   { "menu.headline2_spacing.SETUP[INPUT]",     "-1"                    },
 
+  { "menu.line_spacing.SCOREINFO",             "0"                     },
   { "menu.line_spacing.INFO",                  "0"                     },
   { "menu.line_spacing.INFO[TITLE]",           "0"                     },
   { "menu.line_spacing.INFO[ELEMENTS]",                "0"                     },
@@ -8095,6 +8107,7 @@ struct ConfigInfo image_config[] =
   { "menu.line_spacing.INFO[LEVELSET]",                "0"                     },
   { "menu.line_spacing.SETUP[INPUT]",          "0"                     },
 
+  { "menu.extra_spacing.SCOREINFO",            "2"                     },
   { "menu.extra_spacing.INFO",                 "2"                     },
   { "menu.extra_spacing.INFO[TITLE]",          "2"                     },
   { "menu.extra_spacing.INFO[ELEMENTS]",       "2"                     },

diff --git a/src/main.c b/src/main.c
index 47bd787f03a2ac097018b929f61dfa877730c5db..9ed5f715d6847c3f26d4852c2934451a32a356c1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -7512,6 +7512,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".LEVELS",                 GFX_SPECIAL_ARG_LEVELS                  },
   { ".LEVELNR",                        GFX_SPECIAL_ARG_LEVELNR                 },
   { ".SCORES",                 GFX_SPECIAL_ARG_SCORES,                 },
+  { ".SCOREINFO",              GFX_SPECIAL_ARG_SCOREINFO,              },
   { ".EDITOR",                 GFX_SPECIAL_ARG_EDITOR,                 },
   { ".INFO",                   GFX_SPECIAL_ARG_INFO,                   },
   { ".SETUP",                  GFX_SPECIAL_ARG_SETUP,                  },

diff --git a/src/main.h b/src/main.h
index 96658376bab2cad281c29b03ded8794644527d98..3f25ec47709d871cbead70ae8b3ded017efccb52 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -2311,6 +2311,7 @@ enum
   GFX_SPECIAL_ARG_LEVELS,
   GFX_SPECIAL_ARG_LEVELNR,
   GFX_SPECIAL_ARG_SCORES,
+  GFX_SPECIAL_ARG_SCOREINFO,
   GFX_SPECIAL_ARG_EDITOR,
   GFX_SPECIAL_ARG_INFO,
   GFX_SPECIAL_ARG_SETUP,
@@ -2562,6 +2563,7 @@ enum
 #define GAME_MODE_LEVELS               GFX_SPECIAL_ARG_LEVELS
 #define GAME_MODE_LEVELNR              GFX_SPECIAL_ARG_LEVELNR
 #define GAME_MODE_SCORES               GFX_SPECIAL_ARG_SCORES
+#define GAME_MODE_SCOREINFO            GFX_SPECIAL_ARG_SCOREINFO
 #define GAME_MODE_EDITOR               GFX_SPECIAL_ARG_EDITOR
 #define GAME_MODE_INFO                 GFX_SPECIAL_ARG_INFO
 #define GAME_MODE_SETUP                        GFX_SPECIAL_ARG_SETUP

diff --git a/src/screens.c b/src/screens.c
index 4d5eee917fa237afc334290f2419c6bd2e53221b..4156383e3a640604f7ff9ede5deb3e4af483b2d1 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -619,6 +619,8 @@ static int align_yoffset = 0;
 
 #define EXTRA_SPACING_SCORES(i)        (EXTRA_SPACING_INFO(i))
 
+#define EXTRA_SPACING_SCOREINFO(i) (menu.extra_spacing[GAME_MODE_SCOREINFO])
+
 #define DRAW_XOFFSET(s)                ((s) == GAME_MODE_INFO ?                \
                                 DRAW_XOFFSET_INFO(info_mode) :         \
                                 (s) == GAME_MODE_SETUP ?               \