From 8f856dd7cdc167e716d929ec6974a2177128d3a6 Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Sun, 4 May 2025 10:34:43 +0100
Subject: [PATCH] build fixes missed by copy over

---
 Engine/source/console/simObject.cpp               | 12 +++++-------
 Engine/source/platform/platformMemory.cpp         | 15 +++++++++++++++
 Engine/source/platform/platformMemory.h           |  1 +
 .../source/scene/zones/sceneZoneSpaceManager.cpp  |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Engine/source/console/simObject.cpp b/Engine/source/console/simObject.cpp
index 6039393ef..cabafe466 100644
--- a/Engine/source/console/simObject.cpp
+++ b/Engine/source/console/simObject.cpp
@@ -3536,15 +3536,13 @@ DefineEngineMethod( SimObject, getDebugInfo, ArrayObject*, (),,
    array->push_back( "Flag|CanSave", object->getCanSave() ? "true" : "false" );
    
    #ifndef TORQUE_DISABLE_MEMORY_MANAGER
-   Memory::Info memInfo;
+   Memory::MemInfo memInfo;
    Memory::getMemoryInfo( object, memInfo );
    
-   array->push_back( "Memory|AllocNumber", String::ToString( memInfo.mAllocNumber ) );
-   array->push_back( "Memory|AllocSize", String::ToString( memInfo.mAllocSize ) );
-   array->push_back( "Memory|AllocFile", memInfo.mFileName );
-   array->push_back( "Memory|AllocLine", String::ToString( memInfo.mLineNumber ) );
-   array->push_back( "Memory|IsGlobal", memInfo.mIsGlobal ? "true" : "false" );
-   array->push_back( "Memory|IsStatic", memInfo.mIsStatic ? "true" : "false" );
+   array->push_back( "Memory|AllocNumber", String::ToString( memInfo.allocId) );
+   array->push_back( "Memory|AllocSize", String::ToString( (U32)memInfo.size) );
+   array->push_back( "Memory|AllocFile", memInfo.file);
+   array->push_back( "Memory|AllocLine", String::ToString( memInfo.line) );
    #endif
    
    return array;
diff --git a/Engine/source/platform/platformMemory.cpp b/Engine/source/platform/platformMemory.cpp
index 33d0a1336..8bd120c1c 100644
--- a/Engine/source/platform/platformMemory.cpp
+++ b/Engine/source/platform/platformMemory.cpp
@@ -204,6 +204,21 @@ namespace Memory
       std::free(ptr);
    }
 
+   void getMemoryInfo(void* ptr, MemInfo& info)
+   {
+      if (!ptr || !initialized)
+         return;
+
+      for (U32 i = 0; i < allocCount; ++i)
+      {
+         if (allocList[i].ptr == ptr)
+         {
+            info = allocList[i];
+            return;
+         }
+      }
+   }
+
    static void* realloc(void* oldPtr, dsize_t newSize, const char* fileName, U32 line)
    {
       if (!initialized)
diff --git a/Engine/source/platform/platformMemory.h b/Engine/source/platform/platformMemory.h
index 06b5e2fd2..2b56af18b 100644
--- a/Engine/source/platform/platformMemory.h
+++ b/Engine/source/platform/platformMemory.h
@@ -42,6 +42,7 @@ namespace Memory
 
    void init();
    void shutdown();
+   void getMemoryInfo(void* ptr, MemInfo& info);
    void checkPtr(void* ptr);
 }
 
diff --git a/Engine/source/scene/zones/sceneZoneSpaceManager.cpp b/Engine/source/scene/zones/sceneZoneSpaceManager.cpp
index 84f733d03..b610d1724 100644
--- a/Engine/source/scene/zones/sceneZoneSpaceManager.cpp
+++ b/Engine/source/scene/zones/sceneZoneSpaceManager.cpp
@@ -922,7 +922,7 @@ void SceneZoneSpaceManager::verifyState()
             AssertFatal( mObjectZoneLists.containsBinItem(object->mZoneListHandle, zoneId), "SceneZoneSpaceManager::verifyState - Object doesn't have zone in list!");
 
             #ifndef TORQUE_DISABLE_MEMORY_MANAGER
-            Memory::checkPtr( ref->object );
+            Memory::checkPtr( object );
             #endif
          }
       }