support custom types in kill_recursive and destroy_recursive

spelunky-fyi · Oct 8, 2023 · 099d40b · 099d40b
1 parent 4f5649f
commit 099d40b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/game_api/entity.cpp b/src/game_api/entity.cpp
@@ -17,6 +17,7 @@
 #include "entities_chars.hpp"        // for Player
 #include "entities_monsters.hpp"     //
 #include "entity_hooks_info.hpp"     // for EntityHooksInfo
+#include "entity_lookup.hpp"         //
 #include "memory.hpp"                // for write_mem_prot
 #include "movable.hpp"               // for Movable
 #include "movable_behavior.hpp"      // for MovableBehavior
@@ -542,7 +543,7 @@ void Entity::kill_recursive(bool destroy_corpse, Entity* responsible, std::optio
     {
         ent->kill(destroy_corpse, responsible);
     };
-    if (!recursive(this, mask, ent_types, rec_mode, kill_func))
+    if (!recursive(this, mask, get_proper_types(ent_types), rec_mode, kill_func))
         kill(destroy_corpse, responsible);
 }
 
@@ -552,6 +553,6 @@ void Entity::destroy_recursive(std::optional<uint32_t> mask, const std::vector<E
     {
         ent->destroy();
     };
-    if (!recursive(this, mask, ent_types, rec_mode, destroy_func))
+    if (!recursive(this, mask, get_proper_types(ent_types), rec_mode, destroy_func))
         destroy();
 }
diff --git a/src/game_api/entity_lookup.hpp b/src/game_api/entity_lookup.hpp
@@ -31,3 +31,4 @@ std::vector<uint32_t> entity_get_items_by(uint32_t uid, std::vector<ENT_TYPE> en
 std::vector<uint32_t> entity_get_items_by(uint32_t uid, ENT_TYPE entity_type, uint32_t mask);
 std::vector<uint32_t> get_entities_by_draw_depth(uint8_t draw_depth, LAYER l);
 std::vector<uint32_t> get_entities_by_draw_depth(std::vector<uint8_t> draw_depths, LAYER l);
+std::vector<ENT_TYPE> get_proper_types(std::vector<ENT_TYPE> ent_types);