X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=e820719ad9886b1ea9bc24f608a5b7164dc0dfff;hb=cacc5129ff29981490cb53d43aeca8264b7f176c;hp=3fdc19391a262be4ea2ac1ab71c4de48c39a0a0e;hpb=677fb221d48bd71f0f6a7633dc415f895abedf94;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 3fdc1939..e820719a 100644
--- 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;
@@ -5431,6 +5440,14 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { ".page[30]",		ACTION_PAGE_30,			FALSE	},
   { ".page[31]",		ACTION_PAGE_31,			FALSE	},
   { ".page[32]",		ACTION_PAGE_32,			FALSE	},
+  { ".part_1",			ACTION_PART_1,			FALSE	},
+  { ".part_2",			ACTION_PART_2,			FALSE	},
+  { ".part_3",			ACTION_PART_3,			FALSE	},
+  { ".part_4",			ACTION_PART_4,			FALSE	},
+  { ".part_5",			ACTION_PART_5,			FALSE	},
+  { ".part_6",			ACTION_PART_6,			FALSE	},
+  { ".part_7",			ACTION_PART_7,			FALSE	},
+  { ".part_8",			ACTION_PART_8,			FALSE	},
   { ".other",			ACTION_OTHER,			FALSE	},
 
   /* empty suffix always matches -- check as last entry in InitSoundInfo() */
@@ -5472,6 +5489,12 @@ 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,		},
+  { ".TYPENAME",		GFX_SPECIAL_ARG_TYPENAME,		},
+  { ".SUBMENU",			GFX_SPECIAL_ARG_SUBMENU,		},
+  { ".MENU",			GFX_SPECIAL_ARG_MENU,			},
+  { ".TOONS",			GFX_SPECIAL_ARG_TOONS,			},
+  { ".FADING",			GFX_SPECIAL_ARG_FADING,			},
+  { ".QUIT",			GFX_SPECIAL_ARG_QUIT,			},
 
   /* empty suffix always matches -- check as last entry in InitMusicInfo() */
   { "",				GFX_SPECIAL_ARG_DEFAULT,		},
@@ -5534,6 +5557,31 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { NULL			}
 };
 
+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",	},
+
+  /* (dummy) graphic definitions used to define animation controls */
+  { "global.anim_1",		},
+  { "global.anim_2",		},
+  { "global.anim_3",		},
+  { "global.anim_4",		},
+  { "global.anim_5",		},
+  { "global.anim_6",		},
+  { "global.anim_7",		},
+  { "global.anim_8",		},
+
+  { NULL			}
+};
+
 
 /* ------------------------------------------------------------------------- */
 /* music token prefix definitions                                            */
@@ -5557,7 +5605,6 @@ static void print_usage()
 	"Usage: %s [OPTION]... [HOSTNAME [PORT]]\n"
 	"\n"
 	"Options:\n"
-	"  -d, --display HOSTNAME[:SCREEN]  specify X server display\n"
 	"  -b, --basepath DIRECTORY         alternative base DIRECTORY\n"
 	"  -l, --level DIRECTORY            alternative level DIRECTORY\n"
 	"  -g, --graphics DIRECTORY         alternative graphics DIRECTORY\n"
@@ -5644,7 +5691,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);
   }
@@ -5670,6 +5717,14 @@ static void InitProgramConfig(char *command_filename)
   userdata_subdir = USERDATA_DIRECTORY_OTHER;
 #endif
 
+  // set default window size (only relevant on program startup)
+  if (setup.internal.default_window_width  != 0 &&
+      setup.internal.default_window_height != 0)
+  {
+    WIN_XSIZE = setup.internal.default_window_width;
+    WIN_YSIZE = setup.internal.default_window_height;
+  }
+
   InitProgramInfo(command_filename,
 		  config_filename,
 		  userdata_subdir,
@@ -5689,7 +5744,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();