Revert "implements walkpastnpcs config"

This reverts commit 53bcc21.
WohlSoft · Jul 24, 2024 · 04b8cc0 · 04b8cc0
1 parent 53bcc21
commit 04b8cc0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 26 deletions.
diff --git a/LunaDll/Misc/RuntimeHookComponents/RuntimeHookHooks.cpp b/LunaDll/Misc/RuntimeHookComponents/RuntimeHookHooks.cpp
@@ -3890,19 +3890,6 @@ static unsigned int __stdcall runtimeHookNPCCollisionGroupInternal(int npcAIdx,
         return 0; // Collision cancelled
     }
 
-    // check walkThroughNPCs
-    NPCMOB* npcB = NPC::GetRaw(npcBIdx);
-    if (NPC::GetWalkPastNPCs(npc->id)) {
-        if (!npc_npcblock[npcB->id] && !npc_npcblocktop[npcB->id]) {
-            return 0; // Cancelled
-        }
-    }
-    if (NPC::GetWalkPastNPCs(npcB->id)) {
-        if (!npc_npcblock[npc->id] && !npc_npcblocktop[npc->id]) {
-            return 0; // Cancelled
-        }
-    }
-
     return -1; // Collision goes ahead
 }
 

diff --git a/LunaDll/SMBXInternal/NPCs.cpp b/LunaDll/SMBXInternal/NPCs.cpp
@@ -273,7 +273,6 @@ static int16_t npcprop_noshieldfireeffect[NPC::MAX_ID + 1] = { 0 };
 static int16_t npcprop_notcointransformable[NPC::MAX_ID + 1] = { 0 };
 static int16_t npcprop_staticdirection[NPC::MAX_ID + 1] = { 0 };
 static int16_t npcprop_luahandlesspeed[NPC::MAX_ID + 1] = { 0 };
-static int16_t npcprop_walkpastnpcs[NPC::MAX_ID + 1] = { 0 };
 static double npcprop_terminalvelocity[NPC::MAX_ID + 1] = { 0 };
 
 // Other NPC-related config data, not by ID
@@ -295,7 +294,6 @@ void NPC::InitProperties() {
         npcprop_staticdirection[i] = 0;
         npcprop_luahandlesspeed[i] = 0;
         npcprop_terminalvelocity[i] = 0;
-        npcprop_walkpastnpcs[i] = 0;
     }
 
     // Set built-in spinjump safe IDs
@@ -566,12 +564,6 @@ bool NPC::GetLuaHandlesSpeed(int id) {
     return (npcprop_luahandlesspeed[id] != 0);
 }
 
-bool NPC::GetWalkPastNPCs(int id) {
-    if ((id < 1) || (id > NPC::MAX_ID)) return false;
-    return (npcprop_walkpastnpcs[id] != 0);
-}
-
-
 double NPC::GetTerminalVelocity(int id) {
     if ((id < 1) || (id > NPC::MAX_ID) || (npcprop_terminalvelocity[id] == 0))
     {
@@ -634,10 +626,6 @@ uintptr_t NPC::GetPropertyTableAddress(const std::string& s)
     {
         return reinterpret_cast<uintptr_t>(npcprop_terminalvelocity);
     }
-    else if (s == "walkpastnpcs")
-    {
-        return reinterpret_cast<uintptr_t>(npcprop_walkpastnpcs);
-    }
     else
     {
         return 0;

diff --git a/LunaDll/SMBXInternal/NPCs.h b/LunaDll/SMBXInternal/NPCs.h
@@ -585,7 +585,6 @@ namespace NPC {
     bool GetNotCoinTransformable(int id);
     bool GetStaticDirection(int id);
     bool GetLuaHandlesSpeed(int id);
-    bool GetWalkPastNPCs(int id);
     double GetTerminalVelocity(int id);
 
     uintptr_t GetPropertyTableAddress(const std::string& s);