Put Actor before death callback into ifdef block

OpenXRay · Dec 12, 2017 · c99361a · c99361a
1 parent e6253a5
commit c99361a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/src/Common/Config.hpp b/src/Common/Config.hpp
@@ -18,6 +18,7 @@
 
 // TWEAKS:
 //#define FP_DEATH // first person death view
+//#define ACTOR_BEFORE_DEATH_CALLBACK
 #define DEAD_BODY_COLLISION // restore collision with dead bodies (thanks malandrinus)
 #define NEW_ANIMS // use new animations. Please enclose any new animation addions with this define
 #define NEW_SOUNDS // use new sounds. Please enclose any new sound addions with this define

diff --git a/src/xrGame/Entity.cpp b/src/xrGame/Entity.cpp
@@ -257,11 +257,13 @@ void CEntity::KillEntity(u16 whoID, bool bypass_actor_check)
     //AVO: allow scripts to process actor condition and prevent actor's death or kill him if desired.
     //IMPORTANT: if you wish to kill actor you need to call db.actor:kill(level:object_by_id(whoID), true) in actor_before_death callback, to ensure all objects are properly destroyed
     // this will bypass below if block and go to normal KillEntity routine.
+#ifdef ACTOR_BEFORE_DEATH_CALLBACK
     if (IsGameTypeSingle() && this->ID() == Actor()->ID() && bypass_actor_check != true)
     {
         Actor()->callback(GameObject::eActorBeforeDeath)(whoID);
         return;
     }
+#endif
     //-AVO
 
     if (this->ID() == Actor()->ID())

diff --git a/src/xrGame/game_object_space.h b/src/xrGame/game_object_space.h
@@ -66,7 +66,9 @@ enum ECallbackType
     eItemToSlot,
     eItemToRuck,
     // Actor
+#ifdef ACTOR_BEFORE_DEATH_CALLBACK
     eActorBeforeDeath,
+#endif
     //-AVO
 
     eDummy = u32(-1),

diff --git a/src/xrGame/script_game_object_script.cpp b/src/xrGame/script_game_object_script.cpp
@@ -95,7 +95,9 @@ SCRIPT_EXPORT(CScriptGameObject, (), {
                 value("item_to_slot", int(GameObject::eItemToSlot)),
                 value("item_to_ruck", int(GameObject::eItemToRuck)),
                 // Actor
+#ifdef ACTOR_BEFORE_DEATH_CALLBACK
                 value("actor_before_death", int(GameObject::eActorBeforeDeath)),
+#endif
                 //-AVO
 
                 value("map_location_added", int(GameObject::eMapLocationAdded))],