Guard Morph Mesh Visual object from destruction

kirides · Oct 1, 2021 · 19c6c27 · 19c6c27
1 parent fe3caeb
commit 19c6c27
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/D3D11Engine/GothicAPI.cpp b/D3D11Engine/GothicAPI.cpp
@@ -1546,8 +1546,10 @@ void GothicAPI::OnAddVob( zCVob* vob, zCWorld* world ) {
 
                 // Load the new visual
                 MeshVisualInfo* mi = new MeshVisualInfo;
-                if ( ext == ".MMS" )
+                if ( ext == ".MMS" ) {
                     mi->MorphMeshVisual = (void*)vob->GetVisual();
+                    zCObject_AddRef( mi->MorphMeshVisual );
+                }
 
                 WorldConverter::Extract3DSMeshFromVisual2( pm, mi );
                 StaticMeshVisuals[pm] = mi;
@@ -1971,7 +1973,7 @@ void GothicAPI::DrawParticleFX( zCVob* source, zCParticleFX* fx, ParticleFrameDa
             kill = pfx;
             if ( kill && (kill->LifeSpan < *fx->GetPrivateTotalTime()) ) {
                 if ( kill->PolyStrip )
-                    kill->PolyStrip->Release(); // TODO: MEMLEAK RIGHT HERE!
+                    zCObject_Release( kill->PolyStrip ); // TODO: MEMLEAK RIGHT HERE!
 
                 pfx = kill->Next;
                 fx->SetFirstParticle( pfx );
@@ -1989,7 +1991,7 @@ void GothicAPI::DrawParticleFX( zCVob* source, zCParticleFX* fx, ParticleFrameDa
                 kill = p->Next;
                 if ( kill && (kill->LifeSpan < *fx->GetPrivateTotalTime()) ) {
                     if ( kill->PolyStrip )
-                        kill->PolyStrip->Release();
+                        zCObject_Release( kill->PolyStrip );
 
                     p->Next = kill->Next;
                     kill->Next = *(zTParticle**)GothicMemoryLocations::GlobalObjects::s_globFreePart;

diff --git a/D3D11Engine/WorldObjects.h b/D3D11Engine/WorldObjects.h
@@ -233,6 +233,9 @@ struct MeshVisualInfo : public BaseVisualInfo {
     }
 
     ~MeshVisualInfo() {
+        if ( MorphMeshVisual ) {
+            zCObject_Release( MorphMeshVisual );
+        }
         delete FullMesh;
     }
 

diff --git a/D3D11Engine/pch.cpp b/D3D11Engine/pch.cpp
@@ -2,6 +2,17 @@
 
 #include <d3d9.h>
 
+void zCObject_AddRef( void* o ) {
+    DWORD object = reinterpret_cast<DWORD>( o );
+    ++( *reinterpret_cast<DWORD*>( object + 0x04 ) );
+}
+
+void zCObject_Release( void* o ) {
+    DWORD object = reinterpret_cast<DWORD>( o );
+    if ( --( *reinterpret_cast<DWORD*>( object + 0x04 ) ) <= 0 )
+        reinterpret_cast<void( __thiscall* )( DWORD, DWORD )>( *reinterpret_cast<DWORD*>( *reinterpret_cast<DWORD*>( object ) + 0x0C ) )( object, 1 );
+}
+
 void DebugWrite_i( LPCSTR lpDebugMessage, void* thisptr ) {
 	//LogInfo() << "D3D7-CALL (" << thisptr << "): " << lpDebugMessage;
 

diff --git a/D3D11Engine/pch.h b/D3D11Engine/pch.h
@@ -43,6 +43,10 @@ extern bool GMPModeActive;
 #define SAFE_DELETE(x) delete x; x = nullptr;
 //#define V(x) x
 
+/** zCObject Managing */
+void zCObject_AddRef( void* o );
+void zCObject_Release( void* o );
+
 /** Writes a string of the D3D7-Call log */
 void DebugWrite_i( LPCSTR lpDebugMessage, void* thisptr );
 

diff --git a/D3D11Engine/zCObject.h b/D3D11Engine/zCObject.h
@@ -4,15 +4,6 @@
 
 class zCObject {
 public:
-    void Release() {
-        refCtr--;
-        int temp = refCtr;
-        if ( temp <= 0 ) {
-            // Call destructor
-            delete this;
-        }
-    }
-
     // Recreate V-Table
     virtual	zCClassDef* _GetClassDef() = 0;
     virtual void Archive() = 0;