rnd-20040410-1-src

diff --git a/src/conftime.h b/src/conftime.h
index b441a8835e62c9287b2eaaadcb4d8529d76941a0..979a9aeaeeaa32e0b5611183967bf93c8084b3aa 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-04-09 18:25]"
+#define COMPILE_DATE_STRING "[2004-04-10 02:27]"

diff --git a/src/editor.c b/src/editor.c
index 400804796e50e25853d8d24a6320efb9f7960f8d..3011e86d994b71d337ec332de927ee35f7d18a97 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1351,6 +1351,11 @@ static struct ValueTextInfo options_change_direct_action[] =
 #else
   { CE_HITTING_SOMETHING,      "collision ..."                 },
 #endif
+
+#if 0
+  { CE_BLOCKED,                        "blocked ..."                   },
+#endif
+
   { CE_IMPACT,                 "impact (on something)"         },
   { CE_SMASHED,                        "smashed (from above)"          },
 
@@ -5870,6 +5875,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
      HAS_CHANGE_EVENT(element, CE_SWITCHED) ? CE_SWITCHED :
      HAS_CHANGE_EVENT(element, CE_HITTING_SOMETHING) ? CE_HITTING_SOMETHING :
      HAS_CHANGE_EVENT(element, CE_HIT_BY_SOMETHING) ? CE_HIT_BY_SOMETHING :
+     HAS_CHANGE_EVENT(element, CE_BLOCKED) ? CE_BLOCKED :
      HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT :
      HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED :
      custom_element_change.direct_action);
@@ -6035,6 +6041,7 @@ static void CopyCustomElementPropertiesToGame(int element)
   custom_element_change_events[CE_SWITCHED] = FALSE;
   custom_element_change_events[CE_HITTING_SOMETHING] = FALSE;
   custom_element_change_events[CE_HIT_BY_SOMETHING] = FALSE;
+  custom_element_change_events[CE_BLOCKED] = FALSE;
   custom_element_change_events[CE_IMPACT] = FALSE;
   custom_element_change_events[CE_SMASHED] = FALSE;
   custom_element_change_events[custom_element_change.direct_action] =

diff --git a/src/main.h b/src/main.h
index b125603a7b995fbe711752c20ea1bd29046c532c..2842cbf4960911b7bfdb274759094cb0f35892ca 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -196,8 +196,9 @@
 #define CE_HIT_BY_SOMETHING    27
 #define CE_OTHER_IS_HITTING    28
 #define CE_OTHER_GETS_HIT      29
+#define CE_BLOCKED             30
 
-#define NUM_CHANGE_EVENTS      30
+#define NUM_CHANGE_EVENTS      31
 
 #define CE_BITMASK_DEFAULT     0