X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a3a1e6b61d885187847ceec6f00a95962fbc0bda;hb=60616073708fbb623db3408620aca220e871e696;hp=a87d202947a98ffedac800315c61c1f8f23442a0;hpb=7c1d6252a391e3beb46c7bf1ced526292f474c7a;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index a87d2029..a3a1e6b6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,15 +30,13 @@ DrawBuffer	       *fieldbuffer;
 DrawBuffer	       *drawto_field;
 
 int			game_status = -1;
-boolean			game_status_last_screen = -1;
+int			game_status_last_screen = -1;
 boolean			level_editor_test_game = FALSE;
 boolean			network_playing = FALSE;
-boolean			network_server = FALSE;
-SDL_Thread	       *server_thread;
 
 int			key_joystick_mapping = 0;
 
-short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			Tile[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Last[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -130,7 +128,7 @@ boolean			network_player_action_received = FALSE;
 
 struct LevelInfo	level, level_template;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
-struct HiScore		highscore[MAX_SCORE_ENTRIES];
+struct ScoreInfo	scores, server_scores;
 struct TapeInfo		tape;
 struct GameInfo		game;
 struct GlobalInfo	global;
@@ -7418,6 +7416,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".TITLE_4",			GFX_SPECIAL_ARG_TITLE_4,		},
   { ".TITLE_5",			GFX_SPECIAL_ARG_TITLE_5,		},
   { ".MAIN",			GFX_SPECIAL_ARG_MAIN,			},
+  { ".NAMES",			GFX_SPECIAL_ARG_NAMES,			},
   { ".LEVELS",			GFX_SPECIAL_ARG_LEVELS			},
   { ".LEVELNR",			GFX_SPECIAL_ARG_LEVELNR			},
   { ".SCORES",			GFX_SPECIAL_ARG_SCORES,			},
@@ -7431,7 +7430,9 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".PREVIEW",			GFX_SPECIAL_ARG_PREVIEW,		},
   { ".CRUMBLED",		GFX_SPECIAL_ARG_CRUMBLED,		},
   { ".MAINONLY",		GFX_SPECIAL_ARG_MAINONLY,		},
+  { ".NAMESONLY",		GFX_SPECIAL_ARG_NAMESONLY,		},
   { ".TYPENAME",		GFX_SPECIAL_ARG_TYPENAME,		},
+  { ".TYPENAMES",		GFX_SPECIAL_ARG_TYPENAMES,		},
   { ".SUBMENU",			GFX_SPECIAL_ARG_SUBMENU,		},
   { ".MENU",			GFX_SPECIAL_ARG_MENU,			},
   { ".TOONS",			GFX_SPECIAL_ARG_TOONS,			},
@@ -7621,7 +7622,7 @@ static void print_usage(void)
 	"      --serveronly                 only start network server\n"
 	"  -v, --verbose                    verbose mode\n"
 	"  -V, --version                    show program version\n"
-	"      --debug                      display debugging information\n"
+	"      --debug[=MODE]               show (and limit) debug output\n"
 	"  -e, --execute COMMAND            execute batch COMMAND\n"
 	"\n"
 	"Valid commands for '--execute' option:\n"
@@ -7633,13 +7634,15 @@ static void print_usage(void)
 	"  \"print helptext.conf\"            print default helptext config\n"
 	"  \"dump level FILE\"                dump level data from FILE\n"
 	"  \"dump tape FILE\"                 dump tape data from FILE\n"
-	"  \"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"
+	"  \"autotest LEVELDIR [NR ...]\"     test level tapes for LEVELDIR\n"
+	"  \"autofix LEVELDIR [NR ...]\"      test and fix tapes for LEVELDIR\n"
 	"  \"patch tapes MODE LEVELDIR [NR]\" patch level tapes for LEVELDIR\n"
 	"  \"convert LEVELDIR [NR]\"          convert levels in LEVELDIR\n"
-	"  \"create images DIRECTORY\"        write BMP images to DIRECTORY\n"
+	"  \"create sketch images DIRECTORY\" write BMP images to DIRECTORY\n"
+	"  \"create collect image DIRECTORY\" write BMP image to DIRECTORY\n"
 	"  \"create CE image DIRECTORY\"      write BMP image to DIRECTORY\n"
 	"\n",
 	program.command_basename);
@@ -7779,6 +7782,11 @@ int main(int argc, char *argv[])
   GetOptions(argc, argv, print_usage, print_version);
   OpenAll();
 
+#if 0
+  // test generating UUIDs and exit
+  TestGeneratingUUIDs();
+#endif
+
   EventLoop();
   CloseAllAndExit(0);