X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=0788345993944f363825f4ca4744ae852812f5b8;hb=84b4d1874b7dfed42ace079941a65baea0ac4ff6;hp=4b2a440b9ceb5d987fed00c1620c730cf3356028;hpb=a4bd8800b4463c082ef66db961a81ddd75d7dbf0;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 4b2a440b..07883459 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,7 @@ DrawBuffer	       *drawto_field;
 int			game_status = -1;
 int			game_status_last_screen = -1;
 boolean			level_editor_test_game = FALSE;
+boolean			score_info_tape_play = FALSE;
 boolean			network_playing = FALSE;
 
 int			key_joystick_mapping = 0;
@@ -67,7 +68,9 @@ int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
 int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int 			GfxRandomStatic[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int 			GfxElementEmpty[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxRedraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -128,8 +131,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;
+struct ScoreInfo	scores, server_scores;
 struct TapeInfo		tape;
 struct GameInfo		game;
 struct GlobalInfo	global;
@@ -6278,6 +6280,86 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "spring",
     "spring (starts moving right)"
   },
+  {
+    "empty_space_1",
+    "empty_space",
+    "empty space 1"
+  },
+  {
+    "empty_space_2",
+    "empty_space",
+    "empty space 2"
+  },
+  {
+    "empty_space_3",
+    "empty_space",
+    "empty space 3"
+  },
+  {
+    "empty_space_4",
+    "empty_space",
+    "empty space 4"
+  },
+  {
+    "empty_space_5",
+    "empty_space",
+    "empty space 5"
+  },
+  {
+    "empty_space_6",
+    "empty_space",
+    "empty space 6"
+  },
+  {
+    "empty_space_7",
+    "empty_space",
+    "empty space 7"
+  },
+  {
+    "empty_space_8",
+    "empty_space",
+    "empty space 8"
+  },
+  {
+    "empty_space_9",
+    "empty_space",
+    "empty space 9"
+  },
+  {
+    "empty_space_10",
+    "empty_space",
+    "empty space 10"
+  },
+  {
+    "empty_space_11",
+    "empty_space",
+    "empty space 11"
+  },
+  {
+    "empty_space_12",
+    "empty_space",
+    "empty space 12"
+  },
+  {
+    "empty_space_13",
+    "empty_space",
+    "empty space 13"
+  },
+  {
+    "empty_space_14",
+    "empty_space",
+    "empty space 14"
+  },
+  {
+    "empty_space_15",
+    "empty_space",
+    "empty space 15"
+  },
+  {
+    "empty_space_16",
+    "empty_space",
+    "empty space 16"
+  },
 
   // --------------------------------------------------------------------------
   // "real" (and therefore drawable) runtime elements
@@ -7214,6 +7296,16 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "internal",
     "hide group elements"
   },
+  {
+    "internal_cascade_es",
+    "internal",
+    "show empty space elements"
+  },
+  {
+    "internal_cascade_es.active",
+    "internal",
+    "hide empty space elements"
+  },
   {
     "internal_cascade_ref",
     "internal",
@@ -7403,6 +7495,7 @@ struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS_FULL + 1] =
 struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
 {
   { ".[DEFAULT]",		GFX_SPECIAL_ARG_DEFAULT,		},
+  { ".LOADING_INITIAL",		GFX_SPECIAL_ARG_LOADING_INITIAL,	},
   { ".LOADING",			GFX_SPECIAL_ARG_LOADING,		},
   { ".TITLE_INITIAL",		GFX_SPECIAL_ARG_TITLE_INITIAL,		},
   { ".TITLE_INITIAL_1",		GFX_SPECIAL_ARG_TITLE_INITIAL_1,	},
@@ -7421,6 +7514,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".LEVELS",			GFX_SPECIAL_ARG_LEVELS			},
   { ".LEVELNR",			GFX_SPECIAL_ARG_LEVELNR			},
   { ".SCORES",			GFX_SPECIAL_ARG_SCORES,			},
+  { ".SCOREINFO",		GFX_SPECIAL_ARG_SCOREINFO,		},
   { ".EDITOR",			GFX_SPECIAL_ARG_EDITOR,			},
   { ".INFO",			GFX_SPECIAL_ARG_INFO,			},
   { ".SETUP",			GFX_SPECIAL_ARG_SETUP,			},
@@ -7432,6 +7526,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".CRUMBLED",		GFX_SPECIAL_ARG_CRUMBLED,		},
   { ".MAINONLY",		GFX_SPECIAL_ARG_MAINONLY,		},
   { ".NAMESONLY",		GFX_SPECIAL_ARG_NAMESONLY,		},
+  { ".SCORESONLY",		GFX_SPECIAL_ARG_SCORESONLY,		},
   { ".TYPENAME",		GFX_SPECIAL_ARG_TYPENAME,		},
   { ".TYPENAMES",		GFX_SPECIAL_ARG_TYPENAMES,		},
   { ".SUBMENU",			GFX_SPECIAL_ARG_SUBMENU,		},
@@ -7642,8 +7737,8 @@ static void print_usage(void)
 	"  \"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 CE image DIRECTORY\"      write BMP image to DIRECTORY\n"
+	"  \"create sketch images DIRECTORY\" write BMP images to DIRECTORY\n"
+	"  \"create collect image DIRECTORY\" write BMP image to DIRECTORY\n"
 	"\n",
 	program.command_basename);
 }