X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=ce0233c7ca3a810eac1438b5143664c7098c3e7b;hb=5abed77f4575375756d228a2afc749589a25c87a;hp=c1762fe842349d2030e26cad2d8d455131499763;hpb=14b5ed161164a42c7513700fe101c4bd2e3b63e3;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index c1762fe8..ce0233c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,7 +25,11 @@ Bitmap		       *bitmap_db_store;
 Bitmap		       *bitmap_db_cross;
 Bitmap		       *bitmap_db_field;
 Bitmap		       *bitmap_db_panel;
+#if 0
 Bitmap		       *bitmap_db_door;
+#endif
+Bitmap		       *bitmap_db_door_1;
+Bitmap		       *bitmap_db_door_2;
 Bitmap		       *bitmap_db_toons;
 DrawBuffer	       *fieldbuffer;
 DrawBuffer	       *drawto_field;
@@ -5576,6 +5580,7 @@ static void print_usage()
 	 "  -n, --network                    network multiplayer game\n"
 	 "      --serveronly                 only start network server\n"
 	 "  -v, --verbose                    verbose mode\n"
+	 "  -V, --version                    show program version\n"
 	 "      --debug                      display debugging information\n"
 	 "      --debug-x11-sync             enable X11 synchronous mode\n"
 	 "  -e, --execute COMMAND            execute batch COMMAND\n"
@@ -5596,21 +5601,57 @@ static void print_usage()
 	 program.command_basename);
 }
 
-int main(int argc, char *argv[])
+static void print_version()
 {
-  char * window_title_string = getWindowTitleString();
+  printf("%s %d.%d.%d.%d\n",
+	 PROGRAM_TITLE_STRING,
+	 PROGRAM_VERSION_MAJOR,
+	 PROGRAM_VERSION_MINOR,
+	 PROGRAM_VERSION_PATCH,
+	 PROGRAM_VERSION_BUILD);
+
+  if (options.debug)
+  {
+    SDL_version sdl_version;
+
+    SDL_VERSION(&sdl_version);
+    printf("- SDL %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
+
+    SDL_IMAGE_VERSION(&sdl_version);
+    printf("- SDL_image %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
 
+    SDL_MIXER_VERSION(&sdl_version);
+    printf("- SDL_mixer %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
+
+    SDL_NET_VERSION(&sdl_version);
+    printf("- SDL_net %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
+  }
+}
+
+int main(int argc, char *argv[])
+{
   InitProgramInfo(argv[0], USERDATA_DIRECTORY, USERDATA_DIRECTORY_UNIX,
-		  PROGRAM_TITLE_STRING, window_title_string, ICON_TITLE_STRING,
-		  X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME,
-		  MSDOS_POINTER_FILENAME,
-		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+		  PROGRAM_TITLE_STRING, ICON_TITLE_STRING, SDL_ICON_FILENAME,
+		  COOKIE_PREFIX, GAME_VERSION_ACTUAL);
 
+  InitWindowTitleFunction(getWindowTitleString);
   InitExitMessageFunction(DisplayExitMessage);
   InitExitFunction(CloseAllAndExit);
   InitPlatformDependentStuff();
 
-  GetOptions(argv, print_usage);
+  GetOptions(argv, print_usage, print_version);
   OpenAll();
 
   EventLoop();