fixed hierarchical definitions for title screen transitions

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3fdc19391a262be4ea2ac1ab71c4de48c39a0a0e..9659af05c781dd6d8b7bf3b1559d403bda194658 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,7 @@ DrawBuffer           *fieldbuffer;
 DrawBuffer            *drawto_field;
 
 int                    game_status = -1;
+boolean                        game_status_last_screen = -1;
 boolean                        level_editor_test_game = FALSE;
 boolean                        network_playing = FALSE;
 
@@ -145,9 +146,17 @@ struct ViewportInfo        viewport;
 struct TitleFadingInfo fading;
 struct TitleFadingInfo title_initial_default;
 struct TitleFadingInfo title_default;
+struct TitleMessageInfo        titlescreen_initial_default;
+struct TitleMessageInfo        titlescreen_initial_first[MAX_NUM_TITLE_IMAGES];
+struct TitleMessageInfo        titlescreen_initial[MAX_NUM_TITLE_IMAGES];
+struct TitleMessageInfo        titlescreen_default;
+struct TitleMessageInfo        titlescreen_first[MAX_NUM_TITLE_IMAGES];
+struct TitleMessageInfo        titlescreen[MAX_NUM_TITLE_IMAGES];
 struct TitleMessageInfo        titlemessage_initial_default;
+struct TitleMessageInfo        titlemessage_initial_first[MAX_NUM_TITLE_MESSAGES];
 struct TitleMessageInfo        titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
 struct TitleMessageInfo        titlemessage_default;
+struct TitleMessageInfo        titlemessage_first[MAX_NUM_TITLE_MESSAGES];
 struct TitleMessageInfo        titlemessage[MAX_NUM_TITLE_MESSAGES];
 struct TitleMessageInfo        readme;
 struct InitInfo                init, init_last;
@@ -5644,7 +5653,7 @@ static void InitProgramConfig(char *command_filename)
     userdata_basename = getBaseName(config_filename);
 
     if (strSuffix(userdata_basename, ".conf"))
-      userdata_basename[strlen(userdata_basename) - 4] = '\0';
+      userdata_basename[strlen(userdata_basename) - 5] = '\0';
 
     LoadSetupFromFilename(config_filename);
   }
@@ -5689,7 +5698,7 @@ int main(int argc, char *argv[])
   InitExitFunction(CloseAllAndExit);
   InitPlatformDependentStuff();
 
-  GetOptions(argv, print_usage, print_version);
+  GetOptions(argc, argv, print_usage, print_version);
   OpenAll();
 
   EventLoop();