diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt
index 9028de19e8e..24b95308563 100644
--- a/Core/GameEngineDevice/CMakeLists.txt
+++ b/Core/GameEngineDevice/CMakeLists.txt
@@ -32,7 +32,6 @@ set(GAMEENGINEDEVICE_SRC
Include/W3DDevice/GameClient/TerrainTex.h
Include/W3DDevice/GameClient/TileData.h
# Include/W3DDevice/GameClient/W3DAssetManager.h
-# Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
# Include/W3DDevice/GameClient/W3DBibBuffer.h
# Include/W3DDevice/GameClient/W3DBridgeBuffer.h
# Include/W3DDevice/GameClient/W3DBufferManager.h
@@ -144,7 +143,6 @@ set(GAMEENGINEDEVICE_SRC
Source/W3DDevice/GameClient/TerrainTex.cpp
Source/W3DDevice/GameClient/TileData.cpp
# Source/W3DDevice/GameClient/W3DAssetManager.cpp
-# Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
# Source/W3DDevice/GameClient/W3DBibBuffer.cpp
# Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
index 467e53f9edb..9343a78cc5d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
@@ -73,7 +73,7 @@ static HMODULE st_DebugDLL;
#define DEFINE_PARTICLE_SYSTEM_NAMES 1
#include "GameClient/ParticleSys.h"
#include "Common/MapObject.h"
-#include "../../GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h"
+#include "WW3D2/assetmgr.h"
static void _addUpdatedParticleSystem( AsciiString particleSystemName );
static void _appendAllParticleSystems();
@@ -9655,7 +9655,7 @@ static void _updateCurrentParticleCount()
static void _reloadTextures()
{
// Need no interaction with the particle editor now.
- ReloadAllTextures();
+ WW3DAssetManager::Get_Instance()->Release_All_Textures();
}
#ifdef DO_VTUNE_STUFF
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
index c6088ec6237..c8c904bd5ee 100644
--- a/Generals/Code/GameEngineDevice/CMakeLists.txt
+++ b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -25,7 +25,6 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/TerrainTex.h
# Include/W3DDevice/GameClient/TileData.h
Include/W3DDevice/GameClient/W3DAssetManager.h
- Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
Include/W3DDevice/GameClient/W3DBibBuffer.h
Include/W3DDevice/GameClient/W3DBridgeBuffer.h
Include/W3DDevice/GameClient/W3DBufferManager.h
@@ -129,7 +128,6 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/TerrainTex.cpp
# Source/W3DDevice/GameClient/TileData.cpp
Source/W3DDevice/GameClient/W3DAssetManager.cpp
- Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
Source/W3DDevice/GameClient/W3DBibBuffer.cpp
Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
# Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
deleted file mode 100644
index 64740387307..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-** Command & Conquer Generals(tm)
-** Copyright 2025 Electronic Arts Inc.
-**
-** This program is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program. If not, see .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DAssetManagerExposed.h
-/*---------------------------------------------------------------------------*/
-/* EA Pacific */
-/* Confidential Information */
-/* Copyright (C) 2001 - All Rights Reserved */
-/* DO NOT DISTRIBUTE */
-/*---------------------------------------------------------------------------*/
-/* Project: RTS3 */
-/* File name: W3DAssetManagerExposed.h */
-/* Created: John K. McDonald, Jr., 4/27/2002 */
-/* Desc: A hack to get around our build structure. */
-/* Revision History: */
-/* 4/27/2002 : Initial creation */
-/*---------------------------------------------------------------------------*/
-
-#pragma once
-
-// INCLUDES ///////////////////////////////////////////////////////////////////
-// DEFINES ////////////////////////////////////////////////////////////////////
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////
-
-// This function is here because the particle editor needs to be able to force
-// the asset manager to release all his textures and then reload them on demand.
-// Unfortunately, the asset manager can't be called directly from the gamelogic,
-// so this function is here. It should only be called by the particle editor,
-// @todo Remove this function when we are no longer editing particles.
-void ReloadAllTextures();
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
deleted file mode 100644
index abcf9e01245..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-** Command & Conquer Generals(tm)
-** Copyright 2025 Electronic Arts Inc.
-**
-** This program is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program. If not, see .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "W3DDevice/GameClient/W3DAssetManagerExposed.h"
-#include "W3DDevice/GameClient/W3DAssetManager.h"
-
-void ReloadAllTextures()
-{
- W3DAssetManager::Get_Instance()->Release_All_Textures();
-}
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
index 8ef3cd71c0b..7279938e618 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
@@ -74,7 +74,7 @@ static HMODULE st_DebugDLL;
#define DEFINE_PARTICLE_SYSTEM_NAMES 1
#include "GameClient/ParticleSys.h"
#include "Common/MapObject.h"
-#include "../../GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h"
+#include "WW3D2/assetmgr.h"
static void _addUpdatedParticleSystem( AsciiString particleSystemName );
static void _appendAllParticleSystems();
@@ -10356,7 +10356,7 @@ static void _updateCurrentParticleCount()
static void _reloadTextures()
{
// Need no interaction with the particle editor now.
- ReloadAllTextures();
+ WW3DAssetManager::Get_Instance()->Release_All_Textures();
}
#ifdef DO_VTUNE_STUFF
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
index 53048181ba6..008a1a623c4 100644
--- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -32,7 +32,6 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/TerrainTex.h
# Include/W3DDevice/GameClient/TileData.h
Include/W3DDevice/GameClient/W3DAssetManager.h
- Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
Include/W3DDevice/GameClient/W3DBibBuffer.h
Include/W3DDevice/GameClient/W3DBridgeBuffer.h
Include/W3DDevice/GameClient/W3DBufferManager.h
@@ -140,7 +139,6 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/TerrainTex.cpp
# Source/W3DDevice/GameClient/TileData.cpp
Source/W3DDevice/GameClient/W3DAssetManager.cpp
- Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
Source/W3DDevice/GameClient/W3DBibBuffer.cpp
Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
# Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
deleted file mode 100644
index 625367f420a..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-** Command & Conquer Generals Zero Hour(tm)
-** Copyright 2025 Electronic Arts Inc.
-**
-** This program is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program. If not, see .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DAssetManagerExposed.h
-/*---------------------------------------------------------------------------*/
-/* EA Pacific */
-/* Confidential Information */
-/* Copyright (C) 2001 - All Rights Reserved */
-/* DO NOT DISTRIBUTE */
-/*---------------------------------------------------------------------------*/
-/* Project: RTS3 */
-/* File name: W3DAssetManagerExposed.h */
-/* Created: John K. McDonald, Jr., 4/27/2002 */
-/* Desc: A hack to get around our build structure. */
-/* Revision History: */
-/* 4/27/2002 : Initial creation */
-/*---------------------------------------------------------------------------*/
-
-#pragma once
-
-// INCLUDES ///////////////////////////////////////////////////////////////////
-// DEFINES ////////////////////////////////////////////////////////////////////
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////
-
-// This function is here because the particle editor needs to be able to force
-// the asset manager to release all his textures and then reload them on demand.
-// Unfortunately, the asset manager can't be called directly from the gamelogic,
-// so this function is here. It should only be called by the particle editor,
-// @todo Remove this function when we are no longer editing particles.
-void ReloadAllTextures();
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
deleted file mode 100644
index b5f2c0e44f8..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-** Command & Conquer Generals Zero Hour(tm)
-** Copyright 2025 Electronic Arts Inc.
-**
-** This program is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program. If not, see .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "W3DDevice/GameClient/W3DAssetManagerExposed.h"
-#include "W3DDevice/GameClient/W3DAssetManager.h"
-
-void ReloadAllTextures()
-{
- W3DAssetManager::Get_Instance()->Release_All_Textures();
-}
-
-