removed duplicate definition of global variable

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 109e88d0e6e09f49b1cd6cc2de744d716af83725..a85da6967248e33652cae5d966bac49df4c38b25 100644 (file)
--- 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;
 
@@ -135,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;
@@ -1178,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'"
   },
@@ -4238,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'"
   },
@@ -7571,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