X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=f55a3de1e5472a302e9e56cd5b6a44672f3f3e28;hb=c8da2fb958f55086c20c03246e17f7f542326137;hp=5e657368d04a413c88d26d4cbcbb4e7727d416bb;hpb=ec178b8090e5767eeaa8ab33515c3dcfb954028b;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 5e657368..f55a3de1 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1106,10 +1106,10 @@ static struct ValueTextInfo options_time_units[] =
 
 static struct ValueTextInfo options_change_direct_action[] =
 {
-  { CE_TOUCHED_BY_PLAYER,	"player touches it"		},
-  { CE_PRESSED_BY_PLAYER,	"player presses it"		},
-  { CE_PUSHED_BY_PLAYER,	"player pushes it"		},
-  { CE_DROPPED_BY_PLAYER,	"player drops it"		},
+  { CE_TOUCHED_BY_PLAYER,	"touched by player"		},
+  { CE_PRESSED_BY_PLAYER,	"pressed by player"		},
+  { CE_PUSHED_BY_PLAYER,	"pushed by player"		},
+  { CE_DROPPED_BY_PLAYER,	"dropped by player"		},
   { CE_COLLISION,		"collision"			},
   { CE_IMPACT,			"impact"			},
   { CE_SMASHED,			"smashed"			},
@@ -1121,9 +1121,14 @@ static struct ValueTextInfo options_change_other_action[] =
   { CE_OTHER_GETS_TOUCHED,	"player touches"		},
   { CE_OTHER_GETS_PRESSED,	"player presses"		},
   { CE_OTHER_GETS_PUSHED,	"player pushes"			},
+  { CE_OTHER_GETS_DIGGED,	"player digs"			},
   { CE_OTHER_GETS_COLLECTED,	"player collects"		},
   { CE_OTHER_GETS_DROPPED,	"player drops"			},
-  { CE_OTHER_IS_TOUCHING,	"it touches"			},
+  { CE_TOUCHING_ANY_SIDE_OF,	"touching"			},
+  { CE_TOUCHING_LEFT_OF,	"touching left of"		},
+  { CE_TOUCHING_RIGHT_OF,	"touching right of"		},
+  { CE_TOUCHING_TOP_OF,		"touching top of"		},
+  { CE_TOUCHING_BOTTOM_OF,	"touching bottom of"		},
   { CE_OTHER_IS_CHANGING,	"change of"			},
   { CE_OTHER_IS_EXPLODING,	"explosion of"			},
   { -1,				NULL				}
@@ -4538,9 +4543,14 @@ static void CopyCustomElementPropertiesToEditor(int element)
      HAS_CHANGE_EVENT(element, CE_OTHER_GETS_TOUCHED) ? CE_OTHER_GETS_TOUCHED :
      HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PRESSED) ? CE_OTHER_GETS_PRESSED :
      HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PUSHED) ? CE_OTHER_GETS_PUSHED :
+     HAS_CHANGE_EVENT(element, CE_OTHER_GETS_DIGGED) ? CE_OTHER_GETS_DIGGED :
      HAS_CHANGE_EVENT(element, CE_OTHER_GETS_COLLECTED) ? CE_OTHER_GETS_COLLECTED :
      HAS_CHANGE_EVENT(element, CE_OTHER_GETS_DROPPED) ? CE_OTHER_GETS_DROPPED :
-     HAS_CHANGE_EVENT(element, CE_OTHER_IS_TOUCHING) ? CE_OTHER_IS_TOUCHING :
+     HAS_CHANGE_EVENT(element, CE_TOUCHING_ANY_SIDE_OF) ? CE_TOUCHING_ANY_SIDE_OF :
+     HAS_CHANGE_EVENT(element, CE_TOUCHING_LEFT_OF) ? CE_TOUCHING_LEFT_OF :
+     HAS_CHANGE_EVENT(element, CE_TOUCHING_RIGHT_OF) ? CE_TOUCHING_RIGHT_OF :
+     HAS_CHANGE_EVENT(element, CE_TOUCHING_TOP_OF) ? CE_TOUCHING_TOP_OF :
+     HAS_CHANGE_EVENT(element, CE_TOUCHING_BOTTOM_OF) ? CE_TOUCHING_BOTTOM_OF :
      HAS_CHANGE_EVENT(element, CE_OTHER_IS_CHANGING) ? CE_OTHER_IS_CHANGING :
      HAS_CHANGE_EVENT(element, CE_OTHER_IS_EXPLODING) ? CE_OTHER_IS_EXPLODING :
      custom_element_change.other_action);
@@ -4646,12 +4656,17 @@ static void CopyCustomElementPropertiesToGame(int element)
     custom_element_change_events[CE_BY_DIRECT_ACTION];
 
   /* set other element action change event from checkbox and selectbox */
-  custom_element_change_events[CE_OTHER_IS_TOUCHING] = FALSE;
+  custom_element_change_events[CE_TOUCHING_ANY_SIDE_OF] = FALSE;
+  custom_element_change_events[CE_TOUCHING_LEFT_OF] = FALSE;
+  custom_element_change_events[CE_TOUCHING_RIGHT_OF] = FALSE;
+  custom_element_change_events[CE_TOUCHING_TOP_OF] = FALSE;
+  custom_element_change_events[CE_TOUCHING_BOTTOM_OF] = FALSE;
   custom_element_change_events[CE_OTHER_IS_CHANGING] = FALSE;
   custom_element_change_events[CE_OTHER_IS_EXPLODING] = FALSE;
   custom_element_change_events[CE_OTHER_GETS_TOUCHED] = FALSE;
   custom_element_change_events[CE_OTHER_GETS_PRESSED] = FALSE;
   custom_element_change_events[CE_OTHER_GETS_PUSHED] = FALSE;
+  custom_element_change_events[CE_OTHER_GETS_DIGGED] = FALSE;
   custom_element_change_events[CE_OTHER_GETS_COLLECTED] = FALSE;
   custom_element_change_events[CE_OTHER_GETS_DROPPED] = FALSE;
   custom_element_change_events[custom_element_change.other_action] =
@@ -5298,7 +5313,7 @@ static void DrawPropertiesInfo()
     { EP_DONT_COLLIDE_WITH,	"- deadly when colliding with"		},
     { EP_DONT_TOUCH,		"- deadly when touching"		},
 
-    { EP_INDESTRUCTIBLE,	"- undestructible"			},
+    { EP_INDESTRUCTIBLE,	"- indestructible"			},
 
     { EP_CAN_EXPLODE_BY_FIRE,	"- can explode by fire or explosions"	},
     { EP_CAN_EXPLODE_SMASHED,	"- can explode when smashed"		},