X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=57331cfc5eab280e439d76f1ed7f75ea554caf6f;hp=084a2d587d8a9e003e13b64a76325ce97dca17b1;hb=695b9e3d2e2ee94c93d2e804aa3c23dd34f68a25;hpb=3f336329750dff46fe1634f317eee24515cd9d11

diff --git a/src/editor.c b/src/editor.c
index 084a2d58..57331cfc 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1515,6 +1515,7 @@ static struct ValueTextInfo options_deadliness[] =
 {
   { EP_DONT_RUN_INTO,		"running into"			},
   { EP_DONT_COLLIDE_WITH,	"colliding with"		},
+  { EP_DONT_GET_HIT_BY,		"getting hit by"		},
   { EP_DONT_TOUCH,		"touching"			},
 
   { -1,				NULL				}
@@ -6771,11 +6772,13 @@ static void CopyCustomElementPropertiesToEditor(int element)
   /* set deadliness selectbox help value */
   custom_element.deadliness =
     (DONT_TOUCH(element) ? EP_DONT_TOUCH :
+     DONT_GET_HIT_BY(element) ? EP_DONT_GET_HIT_BY :
      DONT_COLLIDE_WITH(element) ? EP_DONT_COLLIDE_WITH :
      DONT_RUN_INTO(element) ? EP_DONT_RUN_INTO :
      custom_element.deadliness);
   custom_element_properties[EP_DEADLY] =
     (DONT_TOUCH(element) ||
+     DONT_GET_HIT_BY(element) ||
      DONT_COLLIDE_WITH(element) ||
      DONT_RUN_INTO(element));
 
@@ -6923,6 +6926,7 @@ static void CopyCustomElementPropertiesToGame(int element)
   /* set deadliness property from checkbox and selectbox */
   custom_element_properties[EP_DONT_RUN_INTO] = FALSE;
   custom_element_properties[EP_DONT_COLLIDE_WITH] = FALSE;
+  custom_element_properties[EP_DONT_GET_HIT_BY] = FALSE;
   custom_element_properties[EP_DONT_TOUCH] = FALSE;
   custom_element_properties[custom_element.deadliness] =
     custom_element_properties[EP_DEADLY];
@@ -7714,6 +7718,7 @@ static void DrawPropertiesInfo()
 
     { EP_DONT_RUN_INTO,		"- deadly when running into"		},
     { EP_DONT_COLLIDE_WITH,	"- deadly when colliding with"		},
+    { EP_DONT_GET_HIT_BY,	"- deadly when getting hit by"		},
     { EP_DONT_TOUCH,		"- deadly when touching"		},
 
     { EP_INDESTRUCTIBLE,	"- indestructible"			},