From: Holger Schemel <info@artsoft.org>
Date: Sat, 10 Apr 2004 10:30:18 +0000 (+0200)
Subject: rnd-20040410-1-src
X-Git-Tag: 3.1.0^2~23
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=7e4b8f18d80358c4c2f4567ab5dd0ec8b7efbae4;p=rocksndiamonds.git

rnd-20040410-1-src
---

diff --git a/src/conftime.h b/src/conftime.h
index b441a883..979a9aea 100644
--- 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 40080479..3011e86d 100644
--- 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 b125603a..2842cbf4 100644
--- 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