added generic solution for naming conventions of extra graphic definitions

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 71cc74d617c182e3ea55d6f5c6e1b562b9b51d13..9e5ab1ac0310143636157c9518829b2a63b7233f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -5499,6 +5499,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".PANEL",                  GFX_SPECIAL_ARG_PANEL,                  },
   { ".PREVIEW",                        GFX_SPECIAL_ARG_PREVIEW,                },
   { ".CRUMBLED",               GFX_SPECIAL_ARG_CRUMBLED,               },
+  { ".MAINONLY",               GFX_SPECIAL_ARG_MAINONLY,               },
   { ".TYPENAME",               GFX_SPECIAL_ARG_TYPENAME,               },
   { ".SUBMENU",                        GFX_SPECIAL_ARG_SUBMENU,                },
   { ".MENU",                   GFX_SPECIAL_ARG_MENU,                   },
@@ -5573,14 +5574,14 @@ struct FontInfo font_info[NUM_FONTS + 1] =
 struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
 {
   /* (real) graphic definitions used to define animation graphics */
-  { "global.anim_1.gfx",       },
-  { "global.anim_2.gfx",       },
-  { "global.anim_3.gfx",       },
-  { "global.anim_4.gfx",       },
-  { "global.anim_5.gfx",       },
-  { "global.anim_6.gfx",       },
-  { "global.anim_7.gfx",       },
-  { "global.anim_8.gfx",       },
+  { "gfx.global.anim_1",       },
+  { "gfx.global.anim_2",       },
+  { "gfx.global.anim_3",       },
+  { "gfx.global.anim_4",       },
+  { "gfx.global.anim_5",       },
+  { "gfx.global.anim_6",       },
+  { "gfx.global.anim_7",       },
+  { "gfx.global.anim_8",       },
 
   /* (dummy) graphic definitions used to define animation controls */
   { "global.anim_1",           },
@@ -5651,12 +5652,13 @@ static void print_usage()
 
 static void print_version()
 {
-  Print("%s %d.%d.%d.%d\n",
+  Print("%s %d.%d.%d.%d%s\n",
        PROGRAM_TITLE_STRING,
        PROGRAM_VERSION_MAJOR,
        PROGRAM_VERSION_MINOR,
        PROGRAM_VERSION_PATCH,
-       PROGRAM_VERSION_BUILD);
+       PROGRAM_VERSION_BUILD,
+       PROGRAM_VERSION_EXTRA);
 
   if (options.debug)
   {