X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=e2182ecd2c22a400d8c397228895ea9be00ffd1d;hb=98cdb3fce945485772ccc49741fa29051338ce0d;hp=2fa12d6a5f7901d754ca75db5683ce2aeb3525d6;hpb=06ff8bf609b62d0f630b483f2a99d2d957e5b8a6;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 2fa12d6a..e2182ecd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,6 +34,11 @@ int			game_status = -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;
 
 boolean			redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
@@ -55,11 +60,13 @@ unsigned long		Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 unsigned long		ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			CheckCollision[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaCnt[MAX_NUM_AMOEBA];
 short			AmoebaCnt2[MAX_NUM_AMOEBA];
-short			ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
@@ -89,7 +96,7 @@ int			ZX, ZY;
 int			ExitX, ExitY;
 int			AllPlayersGone;
 
-int			TimeFrames, TimePlayed, TimeLeft;
+int			TimeFrames, TimePlayed, TimeLeft, TapeTime;
 
 boolean			network_player_action_received = FALSE;
 
@@ -657,7 +664,7 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
   {
     "black_orb",
     "black_orb",
-    "bomb"
+    "black orb bomb"
   },
   {
     "amoeba_to_diamond",
@@ -3399,6 +3406,16 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "unknown",
     "unknown element"
   },
+  {
+    "trigger_element",
+    "trigger",
+    "element triggering change"
+  },
+  {
+    "trigger_player",
+    "trigger",
+    "player triggering change"
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -3855,12 +3872,22 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-"
   },
   {
-    "internal/editor",
+    "internal_clipboard_custom",
     "internal",
-    "-"
+    "empty custom element"
+  },
+  {
+    "internal_clipboard_change",
+    "internal",
+    "empty change page"
+  },
+  {
+    "internal_clipboard_group",
+    "internal",
+    "empty group element"
   },
   {
-    "internal/dummy",
+    "internal_dummy",
     "internal",
     "-"
   },