v17.7-dev9-fix4 - Fixes (Ghost) NPC detection in mods like Returning …

…2.0 AB
kirides · Jul 14, 2021 · 9ef8a16 · 9ef8a16
1 parent 144d9bd
commit 9ef8a16
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/D3D11Engine/GothicMemoryLocations2_6_fix.h b/D3D11Engine/GothicMemoryLocations2_6_fix.h
@@ -490,6 +490,10 @@ struct GothicMemoryLocations {
         static const unsigned int RemoveVob = 0x00624B70;
     };
 
+    struct zCClassDef {
+        static const unsigned int oCNpc = 0x00ab1e20;
+    };
+
     class VobTypes // vftables
     {
     public:

diff --git a/D3D11Engine/pch.h b/D3D11Engine/pch.h
@@ -26,7 +26,7 @@
 #define stdext std
 #endif
 
-#define VERSION_NUMBER "17.7-dev19-fix3"
+#define VERSION_NUMBER "17.7-dev19-fix4"
 __declspec(selectany) const char* VERSION_NUMBER_STR = VERSION_NUMBER;
 
 extern bool GMPModeActive;

diff --git a/D3D11Engine/zCVob.h b/D3D11Engine/zCVob.h
@@ -208,7 +208,7 @@ class zCVob {
 
         return (flags & GothicMemoryLocations::zCVob::MASK_SkeepingMode);
     }
-    void SetSleeping(int on) {
+    void SetSleeping( int on ) {
         XCALL( GothicMemoryLocations::zCVob::SetSleeping );
     }
     /** Returns whether the visual of this vob is visible */
@@ -246,13 +246,53 @@ class zCVob {
 
     /** returns the NPC pointer from the Vob, or nullptr if not an NPC */
     oCNPC* AsNpc() {
+#if BUILD_GOTHIC_2_6_fix
+        zCClassDef* classDef = ((zCObject*)this)->_GetClassDef();
+        /* // Quickly check for classdef
+        if( CheckInheritanceByString( classDef , "OCNPC") ) { // all uppercase!
+            bool ok = 1;
+        }*/
+        if ( CheckInheritance( classDef, _ClassDef_oCNpc() ) ) {
+            return reinterpret_cast<oCNPC*>(this);
+        }
+#else
         int vtbl = ((int*)this)[0];
         if ( vtbl == GothicMemoryLocations::VobTypes::Npc ) {
             return reinterpret_cast<oCNPC*>(this);
         }
+#endif
         return nullptr;
     }
 protected:
+    bool CheckInheritanceByString( zCClassDef* def, const char* target ) {
+        while ( def ) {
+            if ( strcmp( def->className.ToChar(), target ) ) {
+                return true;
+            }
+            def = def->baseClassDef;
+        }
+        return false;
+    }
+
+    bool CheckInheritance( const zCClassDef* def, const zCClassDef* target ) {
+        while ( def ) {
+            if ( def == target ) {
+                return true;
+            }
+            def = def->baseClassDef;
+    }
+        return false;
+    }
+
+    const zCClassDef* _ClassDef_oCNpc() {
+#if BUILD_GOTHIC_2_6_fix
+        return reinterpret_cast<const zCClassDef*>(GothicMemoryLocations::zCClassDef::oCNpc);
+#else
+        // Find addres in G1
+        return nullptr;
+#endif
+    }
+
     zSTRING& __GetObjectName() {
         XCALL( GothicMemoryLocations::zCObject::GetObjectName );
     }