RuntimeCommonB: Normalize cpp file includes

Like the prior changes normalizing the inclusions within headers, this
tackles the cpp files of the RuntimeCommonB target, making these source
files consistent with their headers.

Runtime/CBasicsPC.cpp

@@ -15,7 +15,7 @@
 #include <cstdarg>
 #include <ctime>
 
-#include "CBasics.hpp"
+#include "Runtime/CBasics.hpp"
 
 #if __APPLE__
 static u64 MachToDolphinNum;

Runtime/CDependencyGroup.cpp

@@ -1,5 +1,5 @@
-#include "CDependencyGroup.hpp"
-#include "CToken.hpp"
+#include "Runtime/CDependencyGroup.hpp"
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 CDependencyGroup::CDependencyGroup(CInputStream& in) { ReadFromStream(in); }

Runtime/CDvdFile.cpp

@@ -1,6 +1,7 @@
-#include "CDvdFile.hpp"
-#include "CDvdRequest.hpp"
-#include "CStopwatch.hpp"
+#include "Runtime/CDvdFile.hpp"
+
+#include "Runtime/CDvdRequest.hpp"
+#include "Runtime/CStopwatch.hpp"
 
 namespace urde {
 

Runtime/CFactoryMgr.cpp

@@ -1,6 +1,7 @@
-#include "CFactoryMgr.hpp"
-#include "IObj.hpp"
-#include "CStopwatch.hpp"
+#include "Runtime/CFactoryMgr.hpp"
+
+#include "Runtime/CStopwatch.hpp"
+#include "Runtime/IObj.hpp"
 
 namespace urde {
 

Runtime/CGameAllocator.cpp

@@ -1,4 +1,4 @@
-#include "CGameAllocator.hpp"
+#include "Runtime/CGameAllocator.hpp"
 
 namespace urde {
 logvisor::Module AllocLog("urde::CGameAllocator");

Runtime/CGameHintInfo.cpp

@@ -1,7 +1,8 @@
-#include "CGameHintInfo.hpp"
-#include "CToken.hpp"
-#include "CMemoryCardSys.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/CGameHintInfo.hpp"
+
+#include "Runtime/CMemoryCardSys.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 

Runtime/CGameOptions.cpp

@@ -1,17 +1,18 @@
-#include "CGameOptions.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CMemoryCardSys.hpp"
-#include "CSimplePool.hpp"
-#include "CSaveWorld.hpp"
-#include "CGameHintInfo.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CGameState.hpp"
-#include "Input/CFinalInput.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "Audio/CStreamAudioManager.hpp"
-#include "Graphics/CMoviePlayer.hpp"
-#include "CStateManager.hpp"
-#include "hecl/CVarManager.hpp"
+#include "Runtime/CGameOptions.hpp"
+
+#include "Runtime/CGameHintInfo.hpp"
+#include "Runtime/CGameState.hpp"
+#include "Runtime/CMemoryCardSys.hpp"
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/Audio/CStreamAudioManager.hpp"
+#include "Runtime/Graphics/CMoviePlayer.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
+
+#include <hecl/CVarManager.hpp>
 
 namespace urde {
 

Runtime/CGameOptionsTouchBar.cpp

@@ -1,4 +1,4 @@
-#include "CGameOptionsTouchBar.hpp"
+#include "Runtime/CGameOptionsTouchBar.hpp"
 
 namespace urde {
 

Runtime/CGameState.cpp

@@ -1,11 +1,13 @@
-#include "CGameState.hpp"
-#include "IOStreams.hpp"
-#include "zeus/Math.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CMemoryCardSys.hpp"
-#include "CSimplePool.hpp"
-#include "CSaveWorld.hpp"
-#include "MP1/MP1.hpp"
+#include "Runtime/CGameState.hpp"
+
+#include "Runtime/CMemoryCardSys.hpp"
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/MP1/MP1.hpp"
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 union BitsToDouble {

Runtime/CIOWinManager.cpp

@@ -1,6 +1,7 @@
-#include "CIOWinManager.hpp"
-#include "CArchitectureMessage.hpp"
-#include "CIOWin.hpp"
+#include "Runtime/CIOWinManager.hpp"
+
+#include "Runtime/CArchitectureMessage.hpp"
+#include "Runtime/CIOWin.hpp"
 
 namespace urde {
 

Runtime/CMainFlowBase.cpp

@@ -1,5 +1,6 @@
-#include "CMainFlowBase.hpp"
-#include "CArchitectureMessage.hpp"
+#include "Runtime/CMainFlowBase.hpp"
+
+#include "Runtime/CArchitectureMessage.hpp"
 
 namespace urde {
 

Runtime/CMemoryCardSys.cpp

@@ -1,10 +1,11 @@
-#include "CMemoryCardSys.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CGameState.hpp"
-#include "GuiSys/CStringTable.hpp"
-#include "CCRC32.hpp"
-#include "Graphics/CTexture.hpp"
+#include "Runtime/CMemoryCardSys.hpp"
+
+#include "Runtime/CCRC32.hpp"
+#include "Runtime/CGameState.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
 
 namespace urde {
 

Runtime/CMemoryCardSysWin.cpp

@@ -1,4 +1,5 @@
-#include "CMemoryCardSys.hpp"
+#include "Runtime/CMemoryCardSys.hpp"
+
 #include <shlobj.h>
 
 namespace urde {

Runtime/CObjectList.cpp

@@ -1,4 +1,4 @@
-#include "CObjectList.hpp"
+#include "Runtime/CObjectList.hpp"
 
 namespace urde {
 

Runtime/CPakFile.cpp

@@ -1,4 +1,4 @@
-#include "CPakFile.hpp"
+#include "Runtime/CPakFile.hpp"
 
 namespace urde {
 static logvisor::Module Log("urde::CPakFile");

Runtime/CRandom16.cpp

@@ -1,4 +1,4 @@
-#include "CRandom16.hpp"
+#include "Runtime/CRandom16.hpp"
 
 namespace urde {
 

Runtime/CRelayTracker.cpp

@@ -1,7 +1,9 @@
-#include "CRelayTracker.hpp"
-#include "CStateManager.hpp"
-#include "CSaveWorld.hpp"
-#include "World/CWorld.hpp"
+#include "Runtime/CRelayTracker.hpp"
+
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include <algorithm>
 
 namespace urde {

Runtime/CResFactory.cpp

@@ -1,6 +1,7 @@
-#include "CResFactory.hpp"
-#include "CSimplePool.hpp"
-#include "CStopwatch.hpp"
+#include "Runtime/CResFactory.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStopwatch.hpp"
 
 namespace urde {
 static logvisor::Module Log("CResFactory");

Runtime/CResLoader.cpp

@@ -1,5 +1,6 @@
-#include "CResLoader.hpp"
-#include "CPakFile.hpp"
+#include "Runtime/CResLoader.hpp"
+
+#include "Runtime/CPakFile.hpp"
 
 namespace urde {
 static logvisor::Module Log("CResLoader");

Runtime/CSaveWorld.cpp

@@ -1,5 +1,6 @@
-#include "CSaveWorld.hpp"
-#include "CToken.hpp"
+#include "Runtime/CSaveWorld.hpp"
+
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 CSaveWorld::CSaveWorld(CInputStream& in) {

Runtime/CScannableObjectInfo.cpp

@@ -1,5 +1,6 @@
-#include "CScannableObjectInfo.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/CScannableObjectInfo.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 CScannableObjectInfo::CScannableObjectInfo(CInputStream& in, CAssetId resId) : x0_scannableObjectId(resId) {

Runtime/CSimplePool.cpp

@@ -1,6 +1,8 @@
-#include "CSimplePool.hpp"
-#include "IVParamObj.hpp"
-#include "CToken.hpp"
+#include "Runtime/CSimplePool.hpp"
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/IVParamObj.hpp"
+
 #include <cassert>
 
 namespace urde {

Runtime/CSortedLists.cpp

@@ -1,8 +1,9 @@
 #include "Runtime/CSortedLists.hpp"
 
+#include "Runtime/World/CActor.hpp"
+
 #include <algorithm>
 #include <cassert>
-#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 namespace {

Runtime/CStaticInterference.cpp

@@ -1,5 +1,6 @@
-#include "CStaticInterference.hpp"
-#include "zeus/Math.hpp"
+#include "Runtime/CStaticInterference.hpp"
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 

Runtime/CTimeProvider.cpp

@@ -1,5 +1,6 @@
-#include "CTimeProvider.hpp"
-#include "Graphics/CGraphics.hpp"
+#include "Runtime/CTimeProvider.hpp"
+
+#include "Runtime/Graphics/CGraphics.hpp"
 
 namespace urde {
 CTimeProvider* CTimeProvider::g_currentTimeProvider = nullptr;

Runtime/CToken.cpp

@@ -1,4 +1,4 @@
-#include "CToken.hpp"
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 u16 CObjectReference::RemoveReference() {

Runtime/GameGlobalObjects.cpp

@@ -1,4 +1,4 @@
-#include "GameGlobalObjects.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 namespace MP1 {

Runtime/GameObjectLists.cpp

@@ -1,11 +1,13 @@
-#include "GameObjectLists.hpp"
-#include "World/CGameLight.hpp"
-#include "World/CScriptDoor.hpp"
-#include "World/CScriptPlatform.hpp"
-#include "World/CScriptCoverPoint.hpp"
-#include "World/CScriptAiJumpPoint.hpp"
-#include "World/CPatterned.hpp"
-#include "Camera/CGameCamera.hpp"
+#include "Runtime/GameObjectLists.hpp"
+
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CPatterned.hpp"
+#include "Runtime/World/CScriptAiJumpPoint.hpp"
+#include "Runtime/World/CScriptCoverPoint.hpp"
+#include "Runtime/World/CScriptDoor.hpp"
+#include "Runtime/World/CScriptPlatform.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {

Runtime/GuiSys/CAuiEnergyBarT01.cpp

@@ -1,7 +1,8 @@
-#include "CAuiEnergyBarT01.hpp"
-#include "CGuiSys.hpp"
-#include "CSimplePool.hpp"
-#include "CGuiWidgetDrawParms.hpp"
+#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CAuiMeter.cpp

@@ -1,4 +1,9 @@
-#include "CAuiMeter.hpp"
+#include "Runtime/GuiSys/CAuiMeter.hpp"
+
+#include <algorithm>
+#include <memory>
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 

Runtime/GuiSys/CCompoundTargetReticle.cpp

@@ -1,13 +1,16 @@
+#include "Runtime/GuiSys/CCompoundTargetReticle.hpp"
+
 #include <cstdlib>
-#include "CCompoundTargetReticle.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptGrapplePoint.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CScriptGrapplePoint.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CWorld.hpp"
 
 namespace urde {
 namespace {

Runtime/GuiSys/CConsoleOutputWindow.cpp

@@ -1,5 +1,5 @@
-#include "CConsoleOutputWindow.hpp"
-#include "Graphics/CGraphics.hpp"
+#include "Runtime/GuiSys/CConsoleOutputWindow.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CErrorOutputWindow.cpp

@@ -1,5 +1,6 @@
-#include "CErrorOutputWindow.hpp"
-#include "Graphics/CGraphics.hpp"
+#include "Runtime/GuiSys/CErrorOutputWindow.hpp"
+
+#include "Runtime/Graphics/CGraphics.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CFontImageDef.cpp

@@ -1,5 +1,6 @@
-#include "CFontImageDef.hpp"
-#include "Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+
+#include "Runtime/Graphics/CTexture.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CFontRenderState.cpp

@@ -1,5 +1,6 @@
-#include "CFontRenderState.hpp"
-#include "CRasterFont.hpp"
+#include "Runtime/GuiSys/CFontRenderState.hpp"
+
+#include "Runtime/GuiSys/CRasterFont.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudBallInterface.cpp

@@ -1,10 +1,11 @@
-#include "CHudBallInterface.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiGroup.hpp"
-#include "CGuiCamera.hpp"
-#include "CGuiTextPane.hpp"
-#include "CGuiModel.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CHudBallInterface.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiGroup.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudBossEnergyInterface.cpp

@@ -1,8 +1,9 @@
-#include "CHudBossEnergyInterface.hpp"
-#include "CGuiFrame.hpp"
-#include "CAuiEnergyBarT01.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CHudBossEnergyInterface.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudDecoInterface.cpp

@@ -1,14 +1,16 @@
-#include "CHudDecoInterface.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiTextPane.hpp"
-#include "CGuiCamera.hpp"
-#include "CGuiModel.hpp"
-#include "CAuiEnergyBarT01.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "MP1/CSamusHud.hpp"
+#include "Runtime/GuiSys/CHudDecoInterface.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/MP1/CSamusHud.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CGuiWidgetDrawParms.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudEnergyInterface.cpp

@@ -1,11 +1,12 @@
-#include "CHudEnergyInterface.hpp"
-#include "CAuiEnergyBarT01.hpp"
-#include "CAuiMeter.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CStringTable.hpp"
-#include "CGuiTextPane.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "CGuiFrame.hpp"
+#include "Runtime/GuiSys/CHudEnergyInterface.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
+#include "Runtime/GuiSys/CAuiMeter.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudFreeLookInterface.cpp

@@ -1,7 +1,8 @@
-#include "CHudFreeLookInterface.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiModel.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CHudFreeLookInterface.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudHelmetInterface.cpp

@@ -1,8 +1,9 @@
-#include "CHudHelmetInterface.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiCamera.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CGameState.hpp"
+#include "Runtime/GuiSys/CHudHelmetInterface.hpp"
+
+#include "Runtime/CGameState.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudMissileInterface.cpp

@@ -1,11 +1,12 @@
-#include "CHudMissileInterface.hpp"
-#include "CGuiFrame.hpp"
-#include "CAuiEnergyBarT01.hpp"
-#include "CGuiTextPane.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CStateManager.hpp"
-#include "CGuiModel.hpp"
-#include "CStringTable.hpp"
+#include "Runtime/GuiSys/CHudMissileInterface.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudRadarInterface.cpp

@@ -1,18 +1,21 @@
-#include "CHudRadarInterface.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiCamera.hpp"
-#include "CStateManager.hpp"
-#include "CGameState.hpp"
-#include "World/CPlayer.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "zeus/CEulerAngles.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "World/CWallCrawlerSwarm.hpp"
-#include "GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/GuiSys/CHudRadarInterface.hpp"
+
+#include "Runtime/CGameState.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CWallCrawlerSwarm.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
+#include <zeus/CEulerAngles.hpp>
+
 namespace urde {
 
 CHudRadarInterface::CHudRadarInterface(CGuiFrame& baseHud, CStateManager& stateMgr) {

Runtime/GuiSys/CHudThreatInterface.cpp

@@ -1,11 +1,12 @@
-#include "CHudThreatInterface.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiModel.hpp"
-#include "CGuiTextPane.hpp"
-#include "CAuiEnergyBarT01.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CStringTable.hpp"
-#include "Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CHudThreatInterface.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CHudVisorBeamMenu.cpp

@@ -1,11 +1,12 @@
-#include "CHudVisorBeamMenu.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CGameState.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiModel.hpp"
-#include "CGuiTextPane.hpp"
-#include "CStringTable.hpp"
-#include "Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CHudVisorBeamMenu.hpp"
+
+#include "Runtime/CGameState.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CInstruction.cpp

@@ -1,8 +1,9 @@
-#include "CInstruction.hpp"
-#include "CFontRenderState.hpp"
-#include "CTextRenderBuffer.hpp"
-#include "CRasterFont.hpp"
-#include "Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CInstruction.hpp"
+
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CFontRenderState.hpp"
+#include "Runtime/GuiSys/CRasterFont.hpp"
+#include "Runtime/GuiSys/CTextRenderBuffer.hpp"
 
 namespace urde {
 

Runtime/GuiSys/COrbitPointMarker.cpp

@@ -1,11 +1,13 @@
-#include "COrbitPointMarker.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "zeus/CEulerAngles.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/GuiSys/COrbitPointMarker.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
+#include <zeus/CEulerAngles.hpp>
 
 namespace urde {
 

Runtime/GuiSys/CRasterFont.cpp

@@ -1,8 +1,9 @@
-#include "GuiSys/CRasterFont.hpp"
-#include "CDrawStringOptions.hpp"
-#include "CTextRenderBuffer.hpp"
-#include "Graphics/CTexture.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/GuiSys/CRasterFont.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CDrawStringOptions.hpp"
+#include "Runtime/GuiSys/CTextRenderBuffer.hpp"
 
 namespace urde {
 CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store) {

Runtime/GuiSys/CSaveableState.cpp

@@ -1,5 +1,6 @@
-#include "CSaveableState.hpp"
-#include "CRasterFont.hpp"
+#include "Runtime/GuiSys/CSaveableState.hpp"
+
+#include "Runtime/GuiSys/CRasterFont.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CScanDisplay.cpp

@@ -1,18 +1,20 @@
-#include "CScanDisplay.hpp"
-#include "zeus/CTransform.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "GuiSys/CGuiWidget.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "GuiSys/CGuiModel.hpp"
-#include "GuiSys/CAuiImagePane.hpp"
-#include "GuiSys/CGuiCamera.hpp"
-#include "MP1/CPauseScreenBase.hpp"
-#include "CStringTable.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "Input/CFinalInput.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/GuiSys/CScanDisplay.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/GuiSys/CAuiImagePane.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
+#include "Runtime/MP1/CPauseScreenBase.hpp"
+
+#include <zeus/CTransform.hpp>
 
 namespace urde {
 void CScanDisplay::CDataDot::Update(float dt) {

Runtime/GuiSys/CTargetingManager.cpp

@@ -1,8 +1,9 @@
-#include "CTargetingManager.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "CStateManager.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CTargetingManager.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CTextExecuteBuffer.cpp

@@ -1,12 +1,13 @@
-#include "CTextExecuteBuffer.hpp"
-#include "CTextRenderBuffer.hpp"
-#include "CFontRenderState.hpp"
-#include "CFontImageDef.hpp"
-#include "CInstruction.hpp"
-#include "CRasterFont.hpp"
-#include "CWordBreakTables.hpp"
-#include "Graphics/CGraphicsPalette.hpp"
-#include "Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
+
+#include "Runtime/Graphics/CGraphicsPalette.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+#include "Runtime/GuiSys/CFontRenderState.hpp"
+#include "Runtime/GuiSys/CInstruction.hpp"
+#include "Runtime/GuiSys/CRasterFont.hpp"
+#include "Runtime/GuiSys/CTextRenderBuffer.hpp"
+#include "Runtime/GuiSys/CWordBreakTables.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CTextParser.cpp

@@ -1,6 +1,7 @@
-#include "CTextParser.hpp"
-#include "CFontImageDef.hpp"
-#include "CTextExecuteBuffer.hpp"
+#include "Runtime/GuiSys/CTextParser.hpp"
+
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+#include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
 
 namespace urde {
 

Runtime/GuiSys/CTextRenderBuffer.cpp

@@ -1,13 +1,14 @@
-#include "CTextRenderBuffer.hpp"
-#include "CFontImageDef.hpp"
-#include "Graphics/CGraphicsPalette.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "CRasterFont.hpp"
-#include "Graphics/CTexture.hpp"
-#include "CTextExecuteBuffer.hpp"
-#include "CFontRenderState.hpp"
-#include "CInstruction.hpp"
-#include "Graphics/Shaders/CTextSupportShader.hpp"
+#include "Runtime/GuiSys/CTextRenderBuffer.hpp"
+
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CGraphicsPalette.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+#include "Runtime/GuiSys/CFontRenderState.hpp"
+#include "Runtime/GuiSys/CInstruction.hpp"
+#include "Runtime/GuiSys/CRasterFont.hpp"
+#include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
 
 namespace urde {
 

Runtime/Input/CFinalInput.cpp

@@ -1,5 +1,6 @@
-#include "zeus/Math.hpp"
-#include "CFinalInput.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 

Runtime/Input/CInputGenerator.cpp

@@ -1,6 +1,7 @@
-#include "CInputGenerator.hpp"
-#include "../CArchitectureMessage.hpp"
-#include "../CArchitectureQueue.hpp"
+#include "Runtime/Input/CInputGenerator.hpp"
+
+#include "Runtime/CArchitectureMessage.hpp"
+#include "Runtime/CArchitectureQueue.hpp"
 
 namespace urde {
 

Runtime/Input/CRumbleGenerator.cpp

@@ -1,5 +1,6 @@
-#include "CRumbleGenerator.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/Input/CRumbleGenerator.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 

Runtime/Input/CRumbleManager.cpp

@@ -1,9 +1,10 @@
-#include "CRumbleManager.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CGameState.hpp"
-#include "RumbleFxTable.hpp"
+#include "Runtime/Input/CRumbleManager.hpp"
+
+#include "Runtime/CGameState.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Input/RumbleFxTable.hpp"
+#include "Runtime/World/CPlayer.hpp"
 
 namespace urde {
 

Runtime/Input/CRumbleVoice.cpp

@@ -1,4 +1,4 @@
-#include "CRumbleVoice.hpp"
+#include "Runtime/Input/CRumbleVoice.hpp"
 
 namespace urde {
 

Runtime/Particle/CColorElement.cpp

@@ -1,9 +1,11 @@
-#include "CColorElement.hpp"
-#include "CElementGen.hpp"
-#include "CParticleGlobals.hpp"
-#include "CRandom16.hpp"
-#include "zeus/Math.hpp"
-#include "CGenDescription.hpp"
+#include "Runtime/Particle/CColorElement.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
+
+#include <zeus/Math.hpp>
 
 /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Color_Elements */
 

Runtime/Particle/CDecal.cpp

@@ -1,7 +1,8 @@
-#include "CDecal.hpp"
-#include "CParticleGlobals.hpp"
-#include "Graphics/Shaders/CDecalShaders.hpp"
-#include "Graphics/CModel.hpp"
+#include "Runtime/Particle/CDecal.hpp"
+
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Graphics/Shaders/CDecalShaders.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
 
 namespace urde {
 CRandom16 CDecal::sDecalRandom;

Runtime/Particle/CDecalDataFactory.cpp

@@ -1,11 +1,12 @@
-#include "CDecalDataFactory.hpp"
-#include "CGenDescription.hpp"
-#include "CSwooshDescription.hpp"
-#include "CElectricDescription.hpp"
-#include "CParticleDataFactory.hpp"
-#include "Graphics/CModel.hpp"
-#include "CSimplePool.hpp"
-#include "CRandom16.hpp"
+#include "Runtime/Particle/CDecalDataFactory.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
 
 namespace urde {
 static logvisor::Module Log("urde::CDecalDataFactory");

Runtime/Particle/CDecalManager.cpp

@@ -1,10 +1,11 @@
-#include "CDecalManager.hpp"
-#include "CDecalDescription.hpp"
-#include "CDecal.hpp"
-#include "CStateManager.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/Shaders/CDecalShaders.hpp"
+#include "Runtime/Particle/CDecalManager.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/Shaders/CDecalShaders.hpp"
+#include "Runtime/Particle/CDecal.hpp"
+#include "Runtime/Particle/CDecalDescription.hpp"
 
 namespace urde {
 bool CDecalManager::m_PoolInitialized = false;

Runtime/Particle/CElementGen.cpp

@@ -1,16 +1,17 @@
-#include "CElementGen.hpp"
-#include "CGenDescription.hpp"
-#include "CSwooshDescription.hpp"
-#include "CElectricDescription.hpp"
-#include "CParticleGlobals.hpp"
-#include "CParticleSwoosh.hpp"
-#include "CParticleElectric.hpp"
-#include "Graphics/CModel.hpp"
-#include "Graphics/Shaders/CElementGenShaders.hpp"
-#include "Character/CActorLights.hpp"
-#include "CWarp.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Graphics/Shaders/CElementGenShaders.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
+#include "Runtime/Particle/CParticleElectric.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Particle/CWarp.hpp"
 
 #define MAX_GLOBAL_PARTICLES 2560
 

Runtime/Particle/CEmitterElement.cpp

@@ -1,5 +1,6 @@
-#include "CEmitterElement.hpp"
-#include "CRandom16.hpp"
+#include "Runtime/Particle/CEmitterElement.hpp"
+
+#include "Runtime/CRandom16.hpp"
 
 /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Emitter_Elements */
 

Runtime/Particle/CFlameWarp.cpp

@@ -1,5 +1,6 @@
-#include "CFlameWarp.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Particle/CFlameWarp.hpp"
+
+#include "Runtime/CStateManager.hpp"
 
 namespace urde {
 

Runtime/Particle/CModVectorElement.cpp

@@ -1,7 +1,9 @@
-#include "CModVectorElement.hpp"
-#include "CParticleGlobals.hpp"
-#include "CRandom16.hpp"
-#include "zeus/Math.hpp"
+#include "Runtime/Particle/CModVectorElement.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
+
+#include <zeus/Math.hpp>
 
 /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Mod_Vector_Elements */
 

Runtime/Particle/CParticleDataFactory.cpp

@@ -1,11 +1,12 @@
-#include "CParticleDataFactory.hpp"
-#include "CToken.hpp"
-#include "CSimplePool.hpp"
-#include "CGenDescription.hpp"
-#include "CRandom16.hpp"
-#include "Graphics/CModel.hpp"
-#include "CSwooshDescription.hpp"
-#include "CElectricDescription.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
 
 namespace urde {
 static logvisor::Module Log("urde::CParticleDataFactory");

Runtime/Particle/CParticleElectric.cpp

@@ -1,16 +1,18 @@
-#include "CParticleElectric.hpp"
-#include "CElectricDescription.hpp"
-#include "CGenDescription.hpp"
-#include "CSwooshDescription.hpp"
-#include "CParticleSwoosh.hpp"
-#include "CElementGen.hpp"
-#include "Graphics/CModel.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "CParticleGlobals.hpp"
-#include "zeus/CRelAngle.hpp"
-#include "zeus/CQuaternion.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/Particle/CParticleElectric.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CRelAngle.hpp>
 
 namespace urde {
 

Runtime/Particle/CParticleElectricDataFactory.cpp

@@ -1,11 +1,12 @@
-#include "CParticleElectricDataFactory.hpp"
-#include "CSwooshDescription.hpp"
-#include "CElectricDescription.hpp"
-#include "CGenDescription.hpp"
-#include "Graphics/CModel.hpp"
-#include "CToken.hpp"
-#include "CSimplePool.hpp"
-#include "CRandom16.hpp"
+#include "Runtime/Particle/CParticleElectricDataFactory.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
 
 namespace urde {
 static logvisor::Module Log("urde::CParticleElectricDataFactory");

Runtime/Particle/CParticleGen.cpp

@@ -1,4 +1,4 @@
-#include "CParticleGen.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
 
 namespace urde {
 

Runtime/Particle/CParticleGlobals.cpp

@@ -1,4 +1,4 @@
-#include "CParticleGlobals.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
 
 namespace urde {
 std::unique_ptr<CParticleGlobals> CParticleGlobals::g_ParticleGlobals;

Runtime/Particle/CParticleSwoosh.cpp

@@ -1,8 +1,10 @@
-#include "CParticleSwoosh.hpp"
-#include "CSwooshDescription.hpp"
-#include "CParticleGlobals.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+
 #include <chrono>
 
 namespace urde {

Runtime/Particle/CParticleSwooshDataFactory.cpp

@@ -1,10 +1,11 @@
-#include "CParticleSwooshDataFactory.hpp"
-#include "CSwooshDescription.hpp"
-#include "CElectricDescription.hpp"
-#include "CGenDescription.hpp"
-#include "Graphics/CModel.hpp"
-#include "CRandom16.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
 
 namespace urde {
 static logvisor::Module Log("urde::CParticleSwooshDataFactory");

Runtime/Particle/CProjectileWeaponDataFactory.cpp

@@ -1,12 +1,13 @@
-#include "CProjectileWeaponDataFactory.hpp"
-#include "CWeaponDescription.hpp"
-#include "Collision/CCollisionResponseData.hpp"
-#include "CElectricDescription.hpp"
-#include "CSwooshDescription.hpp"
-#include "CGenDescription.hpp"
-#include "Graphics/CModel.hpp"
-#include "CRandom16.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Collision/CCollisionResponseData.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
 
 namespace urde {
 static logvisor::Module Log("urde::CProjectileWeaponDataFactory");

Runtime/Particle/CRealElement.cpp

@@ -1,10 +1,12 @@
-#include "CRealElement.hpp"
-#include "CParticleGlobals.hpp"
-#include "CRandom16.hpp"
-#include "CElementGen.hpp"
-#include "Graphics/CTexture.hpp"
-#include "zeus/Math.hpp"
-#include "CGenDescription.hpp"
+#include "Runtime/Particle/CRealElement.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
+
+#include <zeus/Math.hpp>
 
 /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Real_Elements */
 

Runtime/Particle/CSpawnSystemKeyframeData.cpp

@@ -1,9 +1,10 @@
-#include "CSpawnSystemKeyframeData.hpp"
-#include "CGenDescription.hpp"
-#include "CSwooshDescription.hpp"
-#include "CElectricDescription.hpp"
-#include "Graphics/CModel.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Particle/CSpawnSystemKeyframeData.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
 
 namespace urde {
 

Runtime/Particle/CUVElement.cpp

@@ -1,4 +1,4 @@
-#include "CUVElement.hpp"
+#include "Runtime/Particle/CUVElement.hpp"
 
 /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#UV_Elements */
 

Runtime/Particle/CVectorElement.cpp

@@ -1,9 +1,11 @@
-#include "CVectorElement.hpp"
-#include "CParticleGlobals.hpp"
-#include "CRandom16.hpp"
-#include "CElementGen.hpp"
-#include "zeus/Math.hpp"
-#include "CGenDescription.hpp"
+#include "Runtime/Particle/CVectorElement.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleGlobals.hpp"
+
+#include <zeus/Math.hpp>
 
 /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Vector_Elements */
 

Runtime/Weapon/CAuxWeapon.cpp

@@ -1,9 +1,10 @@
-#include "CAuxWeapon.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CWaveBuster.hpp"
-#include "CNewFlameThrower.hpp"
-#include "CEnergyProjectile.hpp"
+#include "Runtime/Weapon/CAuxWeapon.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Weapon/CEnergyProjectile.hpp"
+#include "Runtime/Weapon/CNewFlameThrower.hpp"
+#include "Runtime/Weapon/CWaveBuster.hpp"
 
 namespace urde {
 

Runtime/Weapon/CBeamProjectile.cpp

@@ -1,6 +1,7 @@
-#include "Weapon/CBeamProjectile.hpp"
+#include "Runtime/Weapon/CBeamProjectile.hpp"
+
+#include "Runtime/CStateManager.hpp"
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CStateManager.hpp"
 
 namespace urde {
 

Runtime/Weapon/CBomb.cpp

@@ -1,13 +1,16 @@
-#include "CBomb.hpp"
-#include "Particle/CElementGen.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CMorphBall.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "World/CGameLight.hpp"
-#include "TCastTo.hpp" // Generated file, do not modify include path
+#include "Runtime/Weapon/CBomb.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CMorphBall.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "DataSpec/DNAMP1/SFX/Weapons.h"
 
+#include "TCastTo.hpp" // Generated file, do not modify include path
+
 namespace urde {
 
 CBomb::CBomb(const TCachedToken<CGenDescription>& particle1, const TCachedToken<CGenDescription>& particle2,

Runtime/Weapon/CElectricBeamProjectile.cpp

@@ -1,11 +1,13 @@
-#include "CElectricBeamProjectile.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "Particle/CElectricDescription.hpp"
-#include "Particle/CParticleElectric.hpp"
-#include "Particle/CElementGen.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Weapon/CElectricBeamProjectile.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CParticleElectric.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {

Runtime/Weapon/CEnergyProjectile.cpp

@@ -1,15 +1,17 @@
-#include "GameGlobalObjects.hpp"
-#include "CEnergyProjectile.hpp"
-#include "CStateManager.hpp"
-#include "World/CWorld.hpp"
-#include "World/CGameLight.hpp"
-#include "World/CPlayer.hpp"
-#include "Particle/CDecalManager.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "World/CExplosion.hpp"
-#include "World/CScriptPlatform.hpp"
-#include "World/CIceImpact.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Weapon/CEnergyProjectile.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Particle/CDecalManager.hpp"
+#include "Runtime/World/CExplosion.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CIceImpact.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptPlatform.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {

Runtime/Weapon/CFidget.cpp

@@ -1,6 +1,7 @@
-#include "CFidget.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/Weapon/CFidget.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
 
 namespace urde {
 

Runtime/Weapon/CFlameInfo.cpp

@@ -1,4 +1,4 @@
-#include "Weapon/CFlameInfo.hpp"
+#include "Runtime/Weapon/CFlameInfo.hpp"
 
 namespace urde {
 

Runtime/Weapon/CFlameThrower.cpp

@@ -1,15 +1,17 @@
-#include "Weapon/CFlameThrower.hpp"
-#include "Weapon/CFlameInfo.hpp"
-#include "World/CGameLight.hpp"
-#include "World/CPlayer.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "Collision/CInternalRayCastStructure.hpp"
-#include "CStateManager.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Weapon/CFlameThrower.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Collision/CInternalRayCastStructure.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Weapon/CFlameInfo.hpp"
+#include "Runtime/Weapon/CFlameThrower.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CFlameThrower.hpp"
 
 namespace urde {
 const zeus::CVector3f CFlameThrower::kLightOffset(0, 3.f, 2.f);

Runtime/Weapon/CGSComboFire.cpp

@@ -1,7 +1,8 @@
-#include "CGSComboFire.hpp"
-#include "Character/CAnimData.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Weapon/CGSComboFire.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
 
 namespace urde {
 

Runtime/Weapon/CGSFidget.cpp

@@ -1,8 +1,9 @@
-#include "CGSFidget.hpp"
-#include "WeaponCommon.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "Character/CAnimData.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Weapon/CGSFidget.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
 
 namespace urde {
 bool CGSFidget::Update(CAnimData& data, float dt, CStateManager& mgr) {

Runtime/Weapon/CGSFreeLook.cpp

@@ -1,6 +1,7 @@
-#include "CGSFreeLook.hpp"
-#include "CStateManager.hpp"
-#include "Character/CPASAnimParmData.hpp"
+#include "Runtime/Weapon/CGSFreeLook.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
 
 namespace urde {
 

Runtime/Weapon/CGameProjectile.cpp

@@ -1,15 +1,17 @@
-#include "Weapon/CGameProjectile.hpp"
-#include "World/CGameLight.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CInternalRayCastStructure.hpp"
+#include "Runtime/MP1/World/CPuddleToadGamma.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CHUDBillboardEffect.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptDoor.hpp"
+#include "Runtime/World/CScriptPlatform.hpp"
+#include "Runtime/World/CWallCrawlerSwarm.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CPlayer.hpp"
-#include "World/CHUDBillboardEffect.hpp"
-#include "World/CWallCrawlerSwarm.hpp"
-#include "World/CScriptDoor.hpp"
-#include "Collision/CInternalRayCastStructure.hpp"
-#include "MP1/World/CPuddleToadGamma.hpp"
-#include "World/CScriptPlatform.hpp"
-#include "Collision/CCollisionActor.hpp"
 
 namespace urde {
 CGameProjectile::CGameProjectile(bool active, const TToken<CWeaponDescription>& wDesc, std::string_view name,

Runtime/Weapon/CGrappleArm.cpp

@@ -1,13 +1,15 @@
-#include "Particle/CElementGen.hpp"
-#include "CDependencyGroup.hpp"
-#include "CGrappleArm.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/Weapon/CGrappleArm.hpp"
+
+#include "Runtime/CDependencyGroup.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+#include "Runtime/Graphics/CVertexMorphEffect.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "Camera/CGameCamera.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "Graphics/CVertexMorphEffect.hpp"
 
 namespace urde {
 

Runtime/Weapon/CGunController.cpp

@@ -1,7 +1,8 @@
-#include "CGunController.hpp"
-#include "Character/CCharLayoutInfo.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Weapon/CGunController.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
 
 namespace urde {
 

Runtime/Weapon/CGunMotion.cpp

@@ -1,7 +1,8 @@
-#include "CGunMotion.hpp"
-#include "WeaponCommon.hpp"
-#include "CStateManager.hpp"
-#include "Character/CPASAnimParmData.hpp"
+#include "Runtime/Weapon/CGunMotion.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
 
 namespace urde {
 

Runtime/Weapon/CIceBeam.cpp

@@ -1,6 +1,7 @@
-#include "CIceBeam.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Weapon/CIceBeam.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 

Runtime/Weapon/CNewFlameThrower.cpp

@@ -1,8 +1,9 @@
-#include "CNewFlameThrower.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
-#include "World/CGameLight.hpp"
+#include "Runtime/Weapon/CNewFlameThrower.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/CGameLight.hpp"
 
 namespace urde {
 

Runtime/Weapon/CPhazonBeam.cpp

@@ -1,10 +1,11 @@
-#include "CPhazonBeam.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CWorld.hpp"
-#include "CProjectileWeapon.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/Weapon/CPhazonBeam.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Weapon/CProjectileWeapon.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 

Runtime/Weapon/CPlasmaBeam.cpp

@@ -1,8 +1,9 @@
-#include "CPlasmaBeam.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CWorld.hpp"
+#include "Runtime/Weapon/CPlasmaBeam.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 

Runtime/Weapon/CPlasmaProjectile.cpp

@@ -1,12 +1,14 @@
-#include "CPlasmaProjectile.hpp"
+#include "Runtime/Weapon/CPlasmaProjectile.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CHUDBillboardEffect.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CGameLight.hpp"
-#include "CStateManager.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CHUDBillboardEffect.hpp"
 
 namespace urde {
 

Runtime/Weapon/CPlayerGun.cpp

@@ -1,17 +1,19 @@
-#include "MP1/World/CMetroidBeta.hpp"
-#include "MP1/World/CMetroid.hpp"
-#include "MP1/CSamusHud.hpp"
-#include "CSimplePool.hpp"
-#include "Character/CPrimitive.hpp"
-#include "CEnergyProjectile.hpp"
-#include "World/CScriptWater.hpp"
-#include "World/CGameLight.hpp"
-#include "World/CScriptPlatform.hpp"
-#include "Input/ControlMapper.hpp"
-#include "CBomb.hpp"
-#include "CPowerBomb.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "Camera/CGameCamera.hpp"
+#include "Runtime/Weapon/CPlayerGun.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
+#include "Runtime/MP1/CSamusHud.hpp"
+#include "Runtime/MP1/World/CMetroid.hpp"
+#include "Runtime/MP1/World/CMetroidBeta.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CScriptPlatform.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+#include "Runtime/Weapon/CBomb.hpp"
+#include "Runtime/Weapon/CEnergyProjectile.hpp"
+#include "Runtime/Weapon/CPowerBomb.hpp"
 
 namespace urde {