refactor(GameEngine): Qualify WWVegas header includes

Core/GameEngine/Include/Common/FileSystem.h

@@ -53,7 +53,7 @@
 
 #include <Utility/hash_map_adapter.h>
 
-#include "mutex.h"
+#include "WWLib/mutex.h"
 
 //----------------------------------------------------------------------------
 //           Forward References

Core/GameEngine/Include/Common/GameCommon.h

@@ -51,7 +51,7 @@
 
 // ----------------------------------------------------------------------------------------------
 #include "Lib/BaseType.h"
-#include "WWCommon.h"
+#include "WWLib/WWCommon.h"
 #include "Common/GameDefines.h"
 
 // ----------------------------------------------------------------------------------------------

Core/GameEngine/Include/Common/GameDefines.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "WWDefines.h"
+#include "WWLib/WWDefines.h"
 
 // Note: Retail compatibility must not be broken before this project officially does.
 // Use RETAIL_COMPATIBLE_CRC and RETAIL_COMPATIBLE_XFER_SAVE to guard breaking changes.

Core/GameEngine/Include/Common/MiniDumper.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #ifdef RTS_ENABLE_CRASHDUMP
-#include "DbgHelpLoader.h"
+#include "WWLib/DbgHelpLoader.h"
 
 enum DumpType CPP_11(: Char)
 {

Core/GameEngine/Include/Common/OptionPreferences.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "ww3d.h"
-#include "texturefilter.h"
+#include "WW3D2/texturefilter.h"
 
 #include "Common/UserPreferences.h"
 

Core/GameEngine/Include/GameNetwork/GameSpyThread.h

@@ -28,8 +28,8 @@
 
 #pragma once
 
-#include "mutex.h"
-#include "thread.h"
+#include "WWLib/mutex.h"
+#include "WWLib/thread.h"
 
 class GameSpyThreadClass : public ThreadClass
 {

Core/GameEngine/Include/GameNetwork/NetPacketStructs.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "GameNetwork/NetworkDefs.h"
-#include "stringex.h"
+#include "WWLib/stringex.h"
 
 class AsciiString;
 class UnicodeString;

Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -26,7 +26,7 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Compression.h"
-#include "strtok_r.h"
+#include "WWLib/strtok_r.h"
 #include "Common/AudioEventRTS.h"
 #include "Common/CRCDebug.h"
 #include "Common/Debug.h"
@@ -53,7 +53,7 @@
 #include "GameLogic/VictoryConditions.h"
 #include "GameClient/DisconnectMenu.h"
 #include "GameClient/InGameUI.h"
-#include "TARGA.h"
+#include "WWLib/TARGA.h"
 
 static Bool hasValidTransferFileExtension(const AsciiString& filePath)
 {

Core/GameEngine/Source/GameNetwork/GameInfo.cpp

@@ -43,7 +43,7 @@
 #include "GameNetwork/GameSpy/StagingRoomGameInfo.h"
 #include "GameNetwork/LANAPI.h"						// for testing packet size
 #include "GameNetwork/LANAPICallbacks.h"	// for testing packet size
-#include "strtok_r.h"
+#include "WWLib/strtok_r.h"
 
 
 

Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp

@@ -36,8 +36,8 @@
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
 #include "GameNetwork/GameSpy/ThreadUtils.h"
 
-#include "mutex.h"
-#include "thread.h"
+#include "WWLib/mutex.h"
+#include "WWLib/thread.h"
 
 
 //-------------------------------------------------------------------------

Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp

@@ -31,8 +31,8 @@
 #include <winsock.h>	// This one has to be here. Prevents collisions with winsock2.h
 
 #include "GameNetwork/GameSpy/GameResultsThread.h"
-#include "mutex.h"
-#include "thread.h"
+#include "WWLib/mutex.h"
+#include "WWLib/thread.h"
 
 #include "Common/SubsystemInterface.h"
 

Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp

@@ -41,9 +41,9 @@
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
 #include "GameNetwork/GameSpy/ThreadUtils.h"
 
-#include "strtok_r.h"
-#include "mutex.h"
-#include "thread.h"
+#include "WWLib/strtok_r.h"
+#include "WWLib/mutex.h"
+#include "WWLib/thread.h"
 
 #include "Common/MiniLog.h"
 

Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp

@@ -36,8 +36,8 @@
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
 #include "GameNetwork/GameSpy/PeerDefs.h"
 
-#include "mutex.h"
-#include "thread.h"
+#include "WWLib/mutex.h"
+#include "WWLib/thread.h"
 
 #include "Common/SubsystemInterface.h"
 

Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp

@@ -31,8 +31,8 @@
 #include <winsock.h>	// This one has to be here. Prevents collisions with windsock2.h
 
 #include "GameNetwork/GameSpy/PingThread.h"
-#include "mutex.h"
-#include "thread.h"
+#include "WWLib/mutex.h"
+#include "WWLib/thread.h"
 
 #include "Common/SubsystemInterface.h"
 

Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp

@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#include "strtok_r.h"
+#include "WWLib/strtok_r.h"
 #include "Common/GameEngine.h"
 #include "Common/GlobalData.h"
 #include "Common/MessageStream.h"

Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp

@@ -34,7 +34,7 @@
 #include "GameNetwork/LANGameInfo.h"
 #include "GameNetwork/LANAPICallbacks.h"
 #include "Common/MultiplayerSettings.h"
-#include "strtok_r.h"
+#include "WWLib/strtok_r.h"
 /*
 #include "GameNetwork/LAN.h"
 #include "GameNetwork/LANGame.h"

Core/GameEngine/Source/GameNetwork/Network.cpp

@@ -39,7 +39,7 @@
 #include "GameNetwork/NetworkInterface.h"
 #include "GameNetwork/udp.h"
 #include "GameNetwork/Transport.h"
-#include "strtok_r.h"
+#include "WWLib/strtok_r.h"
 #include "GameClient/Shell.h"
 #include "Common/CRCDebug.h"
 #include "GameLogic/GameLogic.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp

@@ -47,13 +47,13 @@
 //-----------------------------------------------------------------------------
 
 #include <stdlib.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include <tri.h>
-#include <colmath.h>
-#include <coltest.h>
-#include <rinfo.h>
-#include <camera.h>
+#include <WW3D2/assetmgr.h>
+#include <WW3D2/texture.h>
+#include <WWMath/tri.h>
+#include <WWMath/colmath.h>
+#include <WW3D2/coltest.h>
+#include <WW3D2/rinfo.h>
+#include <WW3D2/camera.h>
 #include <d3dx8core.h>
 
 #include "Common/GlobalData.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/CameraShakeSystem.cpp

@@ -37,13 +37,13 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include <stdlib.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include <tri.h>
-#include <colmath.h>
-#include <coltest.h>
-#include <rinfo.h>
-#include <camera.h>
+#include <WW3D2/assetmgr.h>
+#include <WW3D2/texture.h>
+#include <WWMath/tri.h>
+#include <WWMath/colmath.h>
+#include <WW3D2/coltest.h>
+#include <WW3D2/rinfo.h>
+#include <WW3D2/camera.h>
 #include <d3dx8core.h>
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp

@@ -49,13 +49,13 @@
 #include "W3DDevice/GameClient/FlatHeightMap.h"
 
 #include <stdlib.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include <tri.h>
-#include <colmath.h>
-#include <coltest.h>
-#include <rinfo.h>
-#include <camera.h>
+#include <WW3D2/assetmgr.h>
+#include <WW3D2/texture.h>
+#include <WWMath/tri.h>
+#include <WWMath/colmath.h>
+#include <WW3D2/coltest.h>
+#include <WW3D2/rinfo.h>
+#include <WW3D2/camera.h>
 #include <d3dx8core.h>
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp

@@ -50,13 +50,13 @@
 #ifndef USE_FLAT_HEIGHT_MAP // Flat height map uses flattened textures. jba. [3/20/2003]
 
 #include <stdlib.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include <tri.h>
-#include <colmath.h>
-#include <coltest.h>
-#include <rinfo.h>
-#include <camera.h>
+#include <WW3D2/assetmgr.h>
+#include <WW3D2/texture.h>
+#include <WWMath/tri.h>
+#include <WWMath/colmath.h>
+#include <WW3D2/coltest.h>
+#include <WW3D2/rinfo.h>
+#include <WW3D2/camera.h>
 #include <d3dx8core.h>
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp

@@ -34,7 +34,7 @@
 #include "WW3D2/hanim.h"
 #include "WW3D2/camera.h"
 
-#include "assetmgr.h"
+#include "WW3D2/assetmgr.h"
 
 #include "W3DDevice/Common/W3DConvert.h"
 #include "W3DDevice/GameClient/W3DMouse.h"
@@ -44,8 +44,8 @@
 #include "GameClient/Display.h"
 #include "GameClient/Image.h"
 #include "GameClient/InGameUI.h"
-#include "mutex.h"
-#include "thread.h"
+#include "WWLib/mutex.h"
+#include "WWLib/thread.h"
 
 
 //Since there can't be more than 1 mouse, might as well keep these static.

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp

@@ -48,7 +48,7 @@
 
 #include "W3DDevice/GameClient/W3DPropBuffer.h"
 
-#include <assetmgr.h>
+#include <WW3D2/assetmgr.h>
 #include "Common/GameUtility.h"
 #include "Common/Geometry.h"
 #include "Common/PerfTimer.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp

@@ -53,8 +53,8 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "dx8wrapper.h"
-#include "assetmgr.h"
+#include "WW3D2/dx8wrapper.h"
+#include "WW3D2/assetmgr.h"
 #include "Lib/BaseType.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
@@ -71,7 +71,7 @@
 #include "Common/GlobalData.h"
 #include "Common/GameLOD.h"
 #include "d3dx8tex.h"
-#include "dx8caps.h"
+#include "WW3D2/dx8caps.h"
 
 
 // Turn this on to turn off pixel shaders. jba[4/3/2003]

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp

@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "Lib/BaseType.h"
-#include "always.h"
+#include "WWLib/always.h"
 #include "W3DDevice/GameClient/W3DSmudge.h"
 #include "W3DDevice/GameClient/W3DShaderManager.h"
 #include "Common/GameMemory.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp

@@ -48,8 +48,8 @@
 
 #include "W3DDevice/GameClient/W3DTerrainBackground.h"
 
-#include <assetmgr.h>
-#include <texture.h>
+#include <WW3D2/assetmgr.h>
+#include <WW3D2/texture.h>
 #include "Common/GlobalData.h"
 #include "GameClient/View.h"
 #include "W3DDevice/GameClient/TerrainTex.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp

@@ -48,12 +48,12 @@
 #include "Common/PerfTimer.h"
 #include "Common/GlobalData.h"
 #include "Common/Debug.h"
-#include "texture.h"
-#include "colmath.h"
-#include "coltest.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "assetmgr.h"
+#include "WW3D2/texture.h"
+#include "WWMath/colmath.h"
+#include "WW3D2/coltest.h"
+#include "WW3D2/rinfo.h"
+#include "WW3D2/camera.h"
+#include "WW3D2/assetmgr.h"
 #include "WW3D2/dx8wrapper.h"
 #include "WW3D2/scene.h"
 #include "GameLogic/TerrainLogic.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp

@@ -57,8 +57,8 @@ enum
 
 #include "W3DDevice/GameClient/W3DTreeBuffer.h"
 
-#include <assetmgr.h>
-#include <texture.h>
+#include <WW3D2/assetmgr.h>
+#include <WW3D2/texture.h>
 #include "Common/FramePacer.h"
 #include "Common/GameUtility.h"
 #include "Common/MapReaderWriterInfo.h"

Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp

@@ -37,17 +37,17 @@
 #include "W3DDevice/GameClient/W3DShroud.h"
 #include "W3DDevice/GameClient/W3DWaterTracks.h"
 #include "W3DDevice/GameClient/W3DAssetManager.h"
-#include "texture.h"
-#include "assetmgr.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "scene.h"
-#include "dx8wrapper.h"
-#include "light.h"
+#include "WW3D2/texture.h"
+#include "WW3D2/assetmgr.h"
+#include "WW3D2/rinfo.h"
+#include "WW3D2/camera.h"
+#include "WW3D2/scene.h"
+#include "WW3D2/dx8wrapper.h"
+#include "WW3D2/light.h"
 #include "d3dx8math.h"
-#include "simplevec.h"
-#include "mesh.h"
-#include "matinfo.h"
+#include "WWLib/simplevec.h"
+#include "WW3D2/mesh.h"
+#include "WW3D2/matinfo.h"
 
 #include "Common/FramePacer.h"
 #include "Common/GameState.h"