X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=c4b8a2b1e65bb8fbb677a13c5cf8ab88b0ac78cc;hb=b640b9d7647df4cbba0e530f6f4bcece384048e4;hp=bc9a1e8bdace8fae9e8b0084769ca51e4e07d231;hpb=88c9b68c44a16e7df62557b63cc7e86731e028c9;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index bc9a1e8b..c4b8a2b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,6 +16,7 @@
 #include "main.h"
 #include "init.h"
 #include "game.h"
+#include "tape.h"
 #include "events.h"
 #include "config.h"
 
@@ -64,7 +65,9 @@ short			ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
+#if 0
 unsigned long		Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
+#endif
 
 int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -185,7 +188,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "yamyam",
     "yamyam",
-    "yam yam"
+    "yam yam (random start direction)"
   },
   {
     "robot",
@@ -1392,14 +1395,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "gray door (EM style, key 4)"
   },
   {
-    "unused_254",
-    "unused",
-    "(not used)"
+    "em_dynamite",
+    "dynamite",
+    "dynamite (EM style)"
   },
   {
-    "unused_255",
-    "unused",
-    "(not used)"
+    "em_dynamite.active",
+    "dynamite",
+    "burning dynamite (EM style)"
   },
   {
     "pearl",
@@ -3651,6 +3654,41 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "trigger",
     "CE value of element triggering change"
   },
+  {
+    "trigger_ce_score",
+    "trigger",
+    "CE score of element triggering change"
+  },
+  {
+    "current_ce_value",
+    "current",
+    "CE value of current element"
+  },
+  {
+    "current_ce_score",
+    "current",
+    "CE score of current element"
+  },
+  {
+    "yamyam.left",
+    "yamyam",
+    "yam yam (starts moving left)"
+  },
+  {
+    "yamyam.right",
+    "yamyam",
+    "yam yam (starts moving right)"
+  },
+  {
+    "yamyam.up",
+    "yamyam",
+    "yam yam (starts moving up)"
+  },
+  {
+    "yamyam.down",
+    "yamyam",
+    "yam yam (starts moving down)"
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -4423,7 +4461,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { ".turning_from_down",	ACTION_TURNING_FROM_DOWN,	FALSE	},
   { ".smashed_by_rock",		ACTION_SMASHED_BY_ROCK,		FALSE	},
   { ".smashed_by_spring",	ACTION_SMASHED_BY_SPRING,	FALSE	},
-  { ".slurped_by_spring",	ACTION_SLURPED_BY_SPRING,	FALSE	},
+  { ".eating",			ACTION_EATING,			FALSE	},
   { ".twinkling",		ACTION_TWINKLING,		FALSE	},
   { ".splashing",		ACTION_SPLASHING,		FALSE	},
   { ".page[1]",			ACTION_PAGE_1,			FALSE	},
@@ -4584,6 +4622,7 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.value_1"		},
   { "font.value_2"		},
   { "font.value_old"		},
+  { "font.level_number.active"	},
   { "font.level_number"		},
   { "font.tape_recorder"	},
   { "font.game_info"		},