X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a85da6967248e33652cae5d966bac49df4c38b25;hb=449875f76f4db3321d90bdca0b7060c2e53e8ba9;hp=48b5d5772885e919dba7ddaa027714fc1ba351f6;hpb=64e7c54dce6ea8c063f04198c64c5057d751c928;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 48b5d577..a85da696 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,11 +33,8 @@ int			game_status = -1;
 boolean			game_status_last_screen = -1;
 boolean			level_editor_test_game = FALSE;
 boolean			network_playing = FALSE;
-
-#if defined(TARGET_SDL)
 boolean			network_server = FALSE;
 SDL_Thread	       *server_thread;
-#endif
 
 int			key_joystick_mapping = 0;
 
@@ -126,9 +123,6 @@ int			BX1, BY1;
 int			BX2, BY2;
 int			SBX_Left, SBX_Right;
 int			SBY_Upper, SBY_Lower;
-int			ZX, ZY;
-int			ExitX, ExitY;
-int			AllPlayersGone;
 
 int			TimeFrames, TimePlayed, TimeLeft, TapeTime;
 
@@ -138,7 +132,6 @@ struct LevelInfo	level, level_template;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct TapeInfo		tape;
-struct SetupInfo	setup;
 struct GameInfo		game;
 struct GlobalInfo	global;
 struct BorderInfo	border;
@@ -1181,17 +1174,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "letter ''"
   },
   {
-    "char_unused",
+    "char_button",
     "char",
     "letter 'button'"
   },
   {
-    "char_unused",
+    "char_up",
     "char",
     "letter 'up'"
   },
   {
-    "char_unused",
+    "char_down",
     "char",
     "letter 'down'"
   },
@@ -4241,17 +4234,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "steel letter ''"
   },
   {
-    "steel_char_unused",
+    "steel_char_button",
     "steel_char",
     "steel letter 'button'"
   },
   {
-    "steel_char_unused",
+    "steel_char_up",
     "steel_char",
     "steel letter 'up'"
   },
   {
-    "steel_char_unused",
+    "steel_char_down",
     "steel_char",
     "steel letter 'down'"
   },
@@ -7428,6 +7421,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".TOONS",			GFX_SPECIAL_ARG_TOONS,			},
   { ".SCORESOLD",		GFX_SPECIAL_ARG_SCORESOLD,		},
   { ".SCORESNEW",		GFX_SPECIAL_ARG_SCORESNEW,		},
+  { ".NO_TITLE",		GFX_SPECIAL_ARG_NO_TITLE,		},
   { ".FADING",			GFX_SPECIAL_ARG_FADING,			},
   { ".QUIT",			GFX_SPECIAL_ARG_QUIT,			},
 
@@ -7444,9 +7438,9 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
 // font definitions
 // ----------------------------------------------------------------------------
 
-/* Important: When one entry is a prefix of another entry, the longer entry
-   must come first, because the dynamic configuration does prefix matching!
-   (These definitions must match the corresponding definitions in "main.h"!) */
+// Important: When one entry is a prefix of another entry, the longer entry
+// must come first, because the dynamic configuration does prefix matching!
+// (These definitions must match the corresponding definitions in "main.h"!)
 
 struct FontInfo font_info[NUM_FONTS + 1] =
 {
@@ -7573,6 +7567,11 @@ struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
   { NULL			}
 };
 
+struct GlobalAnimEventInfo global_anim_event_info =
+{
+  NULL, 0
+};
+
 
 // ----------------------------------------------------------------------------
 // music token prefix definitions