- [NEW] Els actors que maten també poden fer-ho al ser tocats

2024-07-30 18:43:45 +02:00
parent 9d0d02c0c2
commit 2ec21a2c2a
2 changed files with 49 additions and 42 deletions
--- a/source/actor.cpp
+++ b/source/actor.cpp
@@ -459,7 +459,13 @@ namespace actor
    {
        uint8_t result = 0;
        if ( (act->flags & FLAG_PUSHABLE) && ( !(source->flags&FLAG_HERO) || (hero::getSkills()&SKILL_GLOVES) ) ) act->push |= push;
-        if ( (act->flags & FLAG_REACTIVE) && (act->react_mask & push) ) result = act->react_push;
+        if ( (act->flags & FLAG_REACTIVE) && (act->react_mask & push) )
+        {
+            if (act->flags & FLAG_DEADLY)
+                source->push |= PUSH_KILL;
+            else
+                result = act->react_push;
+        }
        if (source->flags & FLAG_DEADLY) {
            result |= PUSH_KILL;
        }