X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=8a720ae939e07babe23c9ecffaf41c8228988e4c;hb=2ff21518535f914abaacf8ffc72bfbd2f319dcd5;hp=f4d613400278ae033a15944fac3f8025ef23a0ed;hpb=c145af8280c5ad22978e42621bbe5c0f3a8ada3c;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index f4d61340..8a720ae9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,6 @@ boolean			redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 int			redraw_x1 = 0, redraw_y1 = 0;
 
 short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-short			Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -50,6 +49,8 @@ short			Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 boolean			Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+boolean			Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+boolean			Changing[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaCnt[MAX_NUM_AMOEBA];
@@ -86,7 +87,7 @@ int			TimeFrames, TimePlayed, TimeLeft;
 
 boolean			network_player_action_received = FALSE;
 
-struct LevelInfo	level;
+struct LevelInfo	level, level_template;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct TapeInfo		tape;
@@ -2938,8 +2939,23 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-"
   },
   {
-    "internal_default_element",
-    "DEFAULT",
+    "[default]",
+    "default",
+    "-"
+  },
+  {
+    "[bd_default]",
+    "bd_default",
+    "-"
+  },
+  {
+    "[sp_default]",
+    "sp_default",
+    "-"
+  },
+  {
+    "[sb_default]",
+    "sb_default",
     "-"
   },
 
@@ -2968,6 +2984,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
   { ".collecting",	ACTION_COLLECTING,	FALSE	},
   { ".dropping",	ACTION_DROPPING,	FALSE	},
   { ".pushing",		ACTION_PUSHING,		FALSE	},
+  { ".walking",		ACTION_WALKING,		FALSE	},
   { ".passing",		ACTION_PASSING,		FALSE	},
   { ".impact",		ACTION_IMPACT,		FALSE	},
   { ".breaking",	ACTION_BREAKING,	FALSE	},
@@ -3097,7 +3114,7 @@ int main(int argc, char *argv[])
 		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
 
   InitExitFunction(CloseAllAndExit);
-  InitPlatformDependantStuff();
+  InitPlatformDependentStuff();
 
   GetOptions(argv);
   OpenAll();