fixed bug with marking level as changed for certain non-level-changing gadgets

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index c33369729d47972a43a70f223f99cb7df4d3285e..141a00a305d9d3626316bc8044cb5286d81a6925 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,13 +20,12 @@
 #include "events.h"
 #include "config.h"
 
-Bitmap                *bitmap_db_store;
-Bitmap                *bitmap_db_cross;
 Bitmap                *bitmap_db_field;
 Bitmap                *bitmap_db_panel;
 Bitmap                *bitmap_db_door_1;
 Bitmap                *bitmap_db_door_2;
-Bitmap                *bitmap_db_toons;
+Bitmap                *bitmap_db_store_1;
+Bitmap                *bitmap_db_store_2;
 DrawBuffer            *fieldbuffer;
 DrawBuffer            *drawto_field;
 
@@ -119,6 +118,7 @@ int                 ScrollStepSize;
 int                    ScreenMovDir = MV_NONE, ScreenMovPos = 0;
 int                    ScreenGfxPos = 0;
 int                    BorderElement = EL_STEELWALL;
+int                    MenuFrameDelay = MENU_FRAME_DELAY;
 int                    GameFrameDelay = GAME_FRAME_DELAY;
 int                    FfwdFrameDelay = FFWD_FRAME_DELAY;
 int                    BX1, BY1;
@@ -144,19 +144,25 @@ struct GlobalInfo global;
 struct BorderInfo      border;
 struct ViewportInfo    viewport;
 struct TitleFadingInfo fading;
+struct TitleFadingInfo title_initial_first_default;
 struct TitleFadingInfo title_initial_default;
+struct TitleFadingInfo title_first_default;
 struct TitleFadingInfo title_default;
-struct TitleMessageInfo        titlescreen_initial_default;
+struct TitleMessageInfo        titlescreen_initial_first_default;
 struct TitleMessageInfo        titlescreen_initial_first[MAX_NUM_TITLE_IMAGES];
+struct TitleMessageInfo        titlescreen_initial_default;
 struct TitleMessageInfo        titlescreen_initial[MAX_NUM_TITLE_IMAGES];
-struct TitleMessageInfo        titlescreen_default;
+struct TitleMessageInfo        titlescreen_first_default;
 struct TitleMessageInfo        titlescreen_first[MAX_NUM_TITLE_IMAGES];
+struct TitleMessageInfo        titlescreen_default;
 struct TitleMessageInfo        titlescreen[MAX_NUM_TITLE_IMAGES];
-struct TitleMessageInfo        titlemessage_initial_default;
+struct TitleMessageInfo        titlemessage_initial_first_default;
 struct TitleMessageInfo        titlemessage_initial_first[MAX_NUM_TITLE_MESSAGES];
+struct TitleMessageInfo        titlemessage_initial_default;
 struct TitleMessageInfo        titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
-struct TitleMessageInfo        titlemessage_default;
+struct TitleMessageInfo        titlemessage_first_default;
 struct TitleMessageInfo        titlemessage_first[MAX_NUM_TITLE_MESSAGES];
+struct TitleMessageInfo        titlemessage_default;
 struct TitleMessageInfo        titlemessage[MAX_NUM_TITLE_MESSAGES];
 struct TitleMessageInfo        readme;
 struct InitInfo                init, init_last;
@@ -5574,14 +5580,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",           },
@@ -5624,6 +5630,7 @@ static void print_usage()
        "  -g, --graphics DIRECTORY         alternative graphics DIRECTORY\n"
        "  -s, --sounds DIRECTORY           alternative sounds DIRECTORY\n"
        "  -m, --music DIRECTORY            alternative music DIRECTORY\n"
+       "      --mytapes                    use private tapes for tape tests\n"
        "  -n, --network                    network multiplayer game\n"
        "      --serveronly                 only start network server\n"
        "  -v, --verbose                    verbose mode\n"
@@ -5643,6 +5650,7 @@ static void print_usage()
        "  \"autotest LEVELDIR [NR ...]\"     test level tapes for LEVELDIR\n"
        "  \"autoplay LEVELDIR [NR ...]\"     play level tapes for LEVELDIR\n"
        "  \"autoffwd LEVELDIR [NR ...]\"     ffwd level tapes for LEVELDIR\n"
+       "  \"autowarp LEVELDIR [NR ...]\"     warp level tapes for LEVELDIR\n"
        "  \"convert LEVELDIR [NR]\"          convert levels in LEVELDIR\n"
        "  \"create images DIRECTORY\"        write BMP images to DIRECTORY\n"
        "  \"create CE image DIRECTORY\"      write BMP image to DIRECTORY\n"