Rename namespaces

Runtime/Audio/CAudioStateWin.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CAUDIOSTATEWIN_HPP__
-#define __RETRO_CAUDIOSTATEWIN_HPP__
+#ifndef __PSHAG_CAUDIOSTATEWIN_HPP__
+#define __PSHAG_CAUDIOSTATEWIN_HPP__
 
 #include "../CIOWin.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CAudioStateWin : public CIOWin
@@ -18,4 +18,4 @@ public:
 
 }
 
-#endif // __RETRO_CAUDIOSTATEWIN_HPP__
+#endif // __PSHAG_CAUDIOSTATEWIN_HPP__

Runtime/Audio/CAudioSys.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CAUDIOSYS_HPP__
-#define __RETRO_CAUDIOSYS_HPP__
+#ifndef __PSHAG_CAUDIOSYS_HPP__
+#define __PSHAG_CAUDIOSYS_HPP__
 
 #include "../GCNTypes.hpp"
 #include "CVector3f.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CAudioSys
@@ -29,4 +29,4 @@ public:
 
 }
 
-#endif // __RETRO_CAUDIOSYS_HPP__
+#endif // __PSHAG_CAUDIOSYS_HPP__

Runtime/Audio/CSfxHandle.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CSFXHANDLE_HPP__
-#define __RETRO_CSFXHANDLE_HPP__
+#ifndef __PSHAG_CSFXHANDLE_HPP__
+#define __PSHAG_CSFXHANDLE_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CSfxHandle
@@ -10,4 +10,4 @@ class CSfxHandle
 
 }
 
-#endif // __RETRO_CSFXHANDLE_HPP__
+#endif // __PSHAG_CSFXHANDLE_HPP__

Runtime/Audio/CSfxManager.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_CSFXMANAGER_HPP__
-#define __RETRO_CSFXMANAGER_HPP__
+#ifndef __PSHAG_CSFXMANAGER_HPP__
+#define __PSHAG_CSFXMANAGER_HPP__
 
 #include <vector>
 #include "../RetroTypes.hpp"
@@ -7,7 +7,7 @@
 #include "CVector3f.hpp"
 #include "CAudioSys.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CSfxManager
@@ -130,4 +130,4 @@ class CSfxManager
 
 }
 
-#endif // __RETRO_CSFXMANAGER_HPP__
+#endif // __PSHAG_CSFXMANAGER_HPP__

Runtime/CActor.cpp

@@ -1,5 +1,5 @@
 #include "CActor.hpp"
 
-namespace Retro
+namespace pshag
 {
 }

Runtime/CActor.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CACTOR_HPP__
-#define __RETRO_CACTOR_HPP__
+#ifndef __PSHAG_CACTOR_HPP__
+#define __PSHAG_CACTOR_HPP__
 
 #include "CEntity.hpp"
 #include <MathLib.hpp>
 
-namespace Retro
+namespace pshag
 {
 
 enum class ECollisionResponseType
@@ -80,4 +80,4 @@ public:
 
 }
 
-#endif // __RETRO_CACTOR_HPP__
+#endif // __PSHAG_CACTOR_HPP__

Runtime/CAi.cpp

@@ -1,6 +1,6 @@
 #include "CAi.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 }

Runtime/CAi.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_CAI_HPP__
-#define __RETRO_CAI_HPP__
+#ifndef __PSHAG_CAI_HPP__
+#define __PSHAG_CAI_HPP__
 
 #include "GCNTypes.hpp"
 #include "ScriptObjectSupport.hpp"
@@ -9,7 +9,7 @@
 
 #include <MathLib.hpp>
 
-namespace Retro
+namespace pshag
 {
 
 /* TODO: Figure out what all this is for and move it somewhere appropriate */
@@ -175,4 +175,4 @@ public:
 
 }
 
-#endif // __RETRO_CAI_HPP__
+#endif // __PSHAG_CAI_HPP__

Runtime/CArchitectureMessage.hpp

@@ -1,11 +1,11 @@
-#ifndef __RETRO_CARCHITECTUREMESSAGE_HPP__
-#define __RETRO_CARCHITECTUREMESSAGE_HPP__
+#ifndef __PSHAG_CARCHITECTUREMESSAGE_HPP__
+#define __PSHAG_CARCHITECTUREMESSAGE_HPP__
 
 #include "GCNTypes.hpp"
 #include "Input/CFinalInput.hpp"
 #include "rstl.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CIOWin;
 
@@ -147,4 +147,4 @@ public:
 
 }
 
-#endif // __RETRO_CARCHITECTUREMESSAGE_HPP__
+#endif // __PSHAG_CARCHITECTUREMESSAGE_HPP__

Runtime/CArchitectureQueue.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CARCHITECTUREQUEUE_HPP__
-#define __RETRO_CARCHITECTUREQUEUE_HPP__
+#ifndef __PSHAG_CARCHITECTUREQUEUE_HPP__
+#define __PSHAG_CARCHITECTUREQUEUE_HPP__
 
 #include <list>
 #include "CArchitectureMessage.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CArchitectureQueue
@@ -27,4 +27,4 @@ public:
 
 }
 
-#endif // __RETRO_CARCHITECTUREQUEUE_HPP__
+#endif // __PSHAG_CARCHITECTUREQUEUE_HPP__

Runtime/CAreaOctTree.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CAREAOCTTREE_HPP__
-#define __RETRO_CAREAOCTTREE_HPP__
+#ifndef __PSHAG_CAREAOCTTREE_HPP__
+#define __PSHAG_CAREAOCTTREE_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CAreaOctTree
@@ -10,4 +10,4 @@ class CAreaOctTree
 
 }
 
-#endif // __RETRO_CAREAOCTTREE_HPP__
+#endif // __PSHAG_CAREAOCTTREE_HPP__

Runtime/CBasics.hpp

@@ -1,12 +1,12 @@
-#ifndef __RETRO_CBASICS_HPP__
-#define __RETRO_CBASICS_HPP__
+#ifndef __PSHAG_CBASICS_HPP__
+#define __PSHAG_CBASICS_HPP__
 
 #include <stdint.h>
 #include <stdlib.h>
 
 #include "RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CBasics
@@ -18,4 +18,4 @@ public:
 
 }
 
-#endif // __RETRO_CBASICS_HPP__
+#endif // __PSHAG_CBASICS_HPP__

Runtime/CBasicsPC.cpp

@@ -3,7 +3,7 @@
 
 #include "CBasics.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 void CBasics::Init()

Runtime/CCRC32.cpp

@@ -1,6 +1,6 @@
 #include "CCRC32.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 const uint32_t CCRC32::crc32Table[256] =

Runtime/CCRC32.hpp

@@ -2,7 +2,7 @@
 #define RETRO_CRC32_HPP
 #include <cstdint>
 
-namespace Retro
+namespace pshag
 {
 
 class CCRC32

Runtime/CCallStack.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CCALLSTACK_HPP__
-#define __RETRO_CCALLSTACK_HPP__
+#ifndef __PSHAG_CCALLSTACK_HPP__
+#define __PSHAG_CCALLSTACK_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CCallStack
@@ -17,4 +17,4 @@ public:
 
 }
 
-#endif // __RETRO_CCALLSTACK_HPP__
+#endif // __PSHAG_CCALLSTACK_HPP__

Runtime/CDvdFile.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CDVDFILE_HPP__
-#define __RETRO_CDVDFILE_HPP__
+#ifndef __PSHAG_CDVDFILE_HPP__
+#define __PSHAG_CDVDFILE_HPP__
 
 #include "RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 static const char* DecodeARAMFile(const char* name)
@@ -49,4 +49,4 @@ public:
 };
 }
 
-#endif // __RETRO_CDVDFILE_HPP__
+#endif // __PSHAG_CDVDFILE_HPP__

Runtime/CDvdRequest.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CDVDREQUEST_HPP__
-#define __RETRO_CDVDREQUEST_HPP__
+#ifndef __PSHAG_CDVDREQUEST_HPP__
+#define __PSHAG_CDVDREQUEST_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class IDvdRequest
@@ -39,4 +39,4 @@ class CDvdRequest : public IDvdRequest
 
 }
 
-#endif // __RETRO_CDVDREQUEST_HPP__
+#endif // __PSHAG_CDVDREQUEST_HPP__

Runtime/CEntity.cpp

@@ -1,7 +1,7 @@
 #include "CEntity.hpp"
 #include "CStateManager.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CEntity::CEntity(TUniqueId uniqueId, const CEntityInfo& info, bool active)

Runtime/CEntity.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CENTITY_HPP__
-#define __RETRO_CENTITY_HPP__
+#ifndef __PSHAG_CENTITY_HPP__
+#define __PSHAG_CENTITY_HPP__
 
 #include "RetroTypes.hpp"
 #include "ScriptObjectSupport.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CStateManager;
 
@@ -45,4 +45,4 @@ public:
 
 }
 
-#endif // __RETRO_CENTITY_HPP__
+#endif // __PSHAG_CENTITY_HPP__

Runtime/CFactoryMgr.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CFACTORYMGR_HPP__
-#define __RETRO_CFACTORYMGR_HPP__
+#ifndef __PSHAG_CFACTORYMGR_HPP__
+#define __PSHAG_CFACTORYMGR_HPP__
 
 #include <unordered_map>
 #include "RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 class SObjectTag;
 class CVParamTransfer;
@@ -25,4 +25,4 @@ public:
 
 }
 
-#endif // __RETRO_CFACTORYMGR_HPP__
+#endif // __PSHAG_CFACTORYMGR_HPP__

Runtime/CGameAllocator.cpp

@@ -1,6 +1,6 @@
 #include "CGameAllocator.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 LogVisor::LogModule AllocLog("CGameAllocator");

Runtime/CGameAllocator.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CGAMEALLOCATOR_HPP__
-#define __RETRO_CGAMEALLOCATOR_HPP__
+#ifndef __PSHAG_CGAMEALLOCATOR_HPP__
+#define __PSHAG_CGAMEALLOCATOR_HPP__
 
 #include "IAllocator.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CCallStack;
 
@@ -48,4 +48,4 @@ public:
 
 }
 
-#endif // __RETRO_CGAMEALLOCATOR_HPP__
+#endif // __PSHAG_CGAMEALLOCATOR_HPP__

Runtime/CGameDebug.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CGAMEDEBUG_HPP__
-#define __RETRO_CGAMEDEBUG_HPP__
+#ifndef __PSHAG_CGAMEDEBUG_HPP__
+#define __PSHAG_CGAMEDEBUG_HPP__
 
 #include <string>
 
-namespace Retro
+namespace pshag
 {
 class CFinalInput;
 
@@ -53,4 +53,4 @@ public:
 
 }
 
-#endif // __RETRO_CGAMEDEBUG_HPP__
+#endif // __PSHAG_CGAMEDEBUG_HPP__

Runtime/CGameOptions.cpp

@@ -1,6 +1,6 @@
 #include "CGameOptions.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 }

Runtime/CGameOptions.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CGAMEOPTIONS_HPP__
-#define __RETRO_CGAMEOPTIONS_HPP__
+#ifndef __PSHAG_CGAMEOPTIONS_HPP__
+#define __PSHAG_CGAMEOPTIONS_HPP__
 
 #include "RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CGameOptions
@@ -19,4 +19,4 @@ class CGameOptions
 
 }
 
-#endif // __RETRO_CGAMEOPTIONS_HPP__
+#endif // __PSHAG_CGAMEOPTIONS_HPP__

Runtime/CGameState.cpp

@@ -1,7 +1,7 @@
 #include "CGameState.hpp"
 #include "IOStreams.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CGameState::CGameState(CInputStream& stream)

Runtime/CGameState.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_CGAMESTATE_HPP__
-#define __RETRO_CGAMESTATE_HPP__
+#ifndef __PSHAG_CGAMESTATE_HPP__
+#define __PSHAG_CGAMESTATE_HPP__
 
 #include <memory>
 #include "CBasics.hpp"
@@ -7,7 +7,7 @@
 #include "CGameOptions.hpp"
 #include "CWorldTransManager.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CGameState
@@ -26,4 +26,4 @@ public:
 
 }
 
-#endif // __RETRO_CGAMESTATE_HPP__
+#endif // __PSHAG_CGAMESTATE_HPP__

Runtime/CGraphics.cpp

@@ -1,7 +1,7 @@
 #include "CGraphics.hpp"
 #include <Math.hpp>
 
-namespace Retro
+namespace pshag
 {
 
 u32 CGraphics::g_NumLightsActive = 0;

Runtime/CGraphics.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CGRAPHICS_HPP__
-#define __RETRO_CGRAPHICS_HPP__
+#ifndef __PSHAG_CGRAPHICS_HPP__
+#define __PSHAG_CGRAPHICS_HPP__
 
 #include "RetroTypes.hpp"
 #include "CTransform.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 enum class ERglLight : u8
@@ -120,4 +120,4 @@ public:
 
 }
 
-#endif // __RETRO_CGRAPHICS_HPP__
+#endif // __PSHAG_CGRAPHICS_HPP__

Runtime/CIOWin.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CIOWIN_HPP__
-#define __RETRO_CIOWIN_HPP__
+#ifndef __PSHAG_CIOWIN_HPP__
+#define __PSHAG_CIOWIN_HPP__
 
 #include <string>
 #include <memory>
 
-namespace Retro
+namespace pshag
 {
 class CArchitectureMessage;
 class CArchitectureQueue;
@@ -38,4 +38,4 @@ static bool operator==(std::shared_ptr<CIOWin> a, std::shared_ptr<CIOWin> b)
 
 }
 
-#endif // __RETRO_CIOWIN_HPP__
+#endif // __PSHAG_CIOWIN_HPP__

Runtime/CIOWinManager.cpp

@@ -2,7 +2,7 @@
 #include "CArchitectureMessage.hpp"
 #include "CIOWin.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 bool CIOWinManager::OnIOWinMessage(const CArchitectureMessage& msg)

Runtime/CIOWinManager.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_CIOWINMANAGER_HPP__
-#define __RETRO_CIOWINMANAGER_HPP__
+#ifndef __PSHAG_CIOWINMANAGER_HPP__
+#define __PSHAG_CIOWINMANAGER_HPP__
 
 #include <memory>
 #include <list>
@@ -7,7 +7,7 @@
 #include "rstl.hpp"
 #include "CArchitectureQueue.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CIOWinManager
@@ -41,4 +41,4 @@ public:
 
 }
 
-#endif // __RETRO_CIOWINMANAGER_HPP__
+#endif // __PSHAG_CIOWINMANAGER_HPP__

Runtime/CInGameTweakManagerBase.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CINGAMETWEAKMANAGERBASE_HPP__
-#define __RETRO_CINGAMETWEAKMANAGERBASE_HPP__
+#ifndef __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__
+#define __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__
 
 #include <string>
 
-namespace Retro
+namespace pshag
 {
 
 class CInGameTweakManagerBase
@@ -17,4 +17,4 @@ public:
 
 }
 
-#endif // __RETRO_CINGAMETWEAKMANAGERBASE_HPP__
+#endif // __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__

Runtime/CLight.cpp

@@ -1,6 +1,6 @@
 #include "CLight.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CLight CLight::BuildDirectional(const Zeus::CVector3f& dir, const Zeus::CColor& color)

Runtime/CLight.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CLIGHT_HPP__
-#define __RETRO_CLIGHT_HPP__
+#ifndef __PSHAG_CLIGHT_HPP__
+#define __PSHAG_CLIGHT_HPP__
 
 #include "CVector3f.hpp"
 #include "CColor.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 enum class ELightType
@@ -36,4 +36,4 @@ public:
 
 }
 
-#endif // __RETRO_CLIGHT_HPP__
+#endif // __PSHAG_CLIGHT_HPP__

Runtime/CMFGameBase.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CMFGAMEBASE_HPP__
-#define __RETRO_CMFGAMEBASE_HPP__
+#ifndef __PSHAG_CMFGAMEBASE_HPP__
+#define __PSHAG_CMFGAMEBASE_HPP__
 
 #include "CIOWin.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CMFGameBase : public CIOWin
@@ -20,4 +20,4 @@ public:
 
 }
 
-#endif // __RETRO_CMFGAMEBASE_HPP__
+#endif // __PSHAG_CMFGAMEBASE_HPP__

Runtime/CMainFlowBase.cpp

@@ -1,7 +1,7 @@
 #include "CMainFlowBase.hpp"
 #include "CArchitectureMessage.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CIOWin::EMessageReturn CMainFlowBase::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue)

Runtime/CMainFlowBase.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CMAINFLOWBASE_HPP__
-#define __RETRO_CMAINFLOWBASE_HPP__
+#ifndef __PSHAG_CMAINFLOWBASE_HPP__
+#define __PSHAG_CMAINFLOWBASE_HPP__
 
 #include "CIOWin.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 enum class EClientFlowStates
@@ -27,4 +27,4 @@ public:
 
 }
 
-#endif // __RETRO_CMAINFLOWBASE_HPP__
+#endif // __PSHAG_CMAINFLOWBASE_HPP__

Runtime/CMapWorldInfo.cpp

@@ -1,6 +1,6 @@
 #include "CMapWorldInfo.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 }

Runtime/CMapWorldInfo.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CMAPWORLDINFO_HPP__
-#define __RETRO_CMAPWORLDINFO_HPP__
+#ifndef __PSHAG_CMAPWORLDINFO_HPP__
+#define __PSHAG_CMAPWORLDINFO_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CMapWorldInfo
@@ -10,4 +10,4 @@ class CMapWorldInfo
 
 }
 
-#endif // __RETRO_CMAPWORLDINFO_HPP__
+#endif // __PSHAG_CMAPWORLDINFO_HPP__

Runtime/CMemory.cpp

@@ -3,7 +3,7 @@
 #include "CCallStack.hpp"
 #include <LogVisor/LogVisor.hpp>
 
-namespace Retro
+namespace pshag
 {
 
 LogVisor::LogModule Log("CMemory");
@@ -73,70 +73,70 @@ IAllocator& CMemorySys::GetGameAllocator() {return g_gameAllocator;}
 
 void* operator new(std::size_t sz)
 {
-    if (!Retro::g_memoryAllocatorReady)
+    if (!pshag::g_memoryAllocatorReady)
         return malloc(sz);
-    Retro::CCallStack cs("?\?(?\?)", "UnknownType");
-    return Retro::CMemory::Alloc(sz,
-                                 Retro::IAllocator::EHint::None,
-                                 Retro::IAllocator::EScope::Default,
-                                 Retro::IAllocator::EType::Primitive,
+    pshag::CCallStack cs("?\?(?\?)", "UnknownType");
+    return pshag::CMemory::Alloc(sz,
+                                 pshag::IAllocator::EHint::None,
+                                 pshag::IAllocator::EScope::Default,
+                                 pshag::IAllocator::EType::Primitive,
                                  cs);
 }
 
 void* operator new(std::size_t sz,
                    const char* funcName, const char* typeName)
 {
-    if (!Retro::g_memoryAllocatorReady)
+    if (!pshag::g_memoryAllocatorReady)
         return malloc(sz);
-    Retro::CCallStack cs(funcName, typeName);
-    return Retro::CMemory::Alloc(sz,
-                                 Retro::IAllocator::EHint::None,
-                                 Retro::IAllocator::EScope::Default,
-                                 Retro::IAllocator::EType::Primitive,
+    pshag::CCallStack cs(funcName, typeName);
+    return pshag::CMemory::Alloc(sz,
+                                 pshag::IAllocator::EHint::None,
+                                 pshag::IAllocator::EScope::Default,
+                                 pshag::IAllocator::EType::Primitive,
                                  cs);
 }
 
 void operator delete(void* ptr) noexcept
 {
-    if (!Retro::g_memoryAllocatorReady)
+    if (!pshag::g_memoryAllocatorReady)
     {
         free(ptr);
         return;
     }
-    Retro::CMemory::Free(ptr);
+    pshag::CMemory::Free(ptr);
 }
 
 void* operator new[](std::size_t sz)
 {
-    if (!Retro::g_memoryAllocatorReady)
+    if (!pshag::g_memoryAllocatorReady)
         return malloc(sz);
-    Retro::CCallStack cs("?\?(?\?)", "UnknownType");
-    return Retro::CMemory::Alloc(sz,
-                                 Retro::IAllocator::EHint::None,
-                                 Retro::IAllocator::EScope::Default,
-                                 Retro::IAllocator::EType::Array,
+    pshag::CCallStack cs("?\?(?\?)", "UnknownType");
+    return pshag::CMemory::Alloc(sz,
+                                 pshag::IAllocator::EHint::None,
+                                 pshag::IAllocator::EScope::Default,
+                                 pshag::IAllocator::EType::Array,
                                  cs);
 }
 
 void* operator new[](std::size_t sz,
                      const char* funcName, const char* typeName)
 {
-    if (!Retro::g_memoryAllocatorReady)
+    if (!pshag::g_memoryAllocatorReady)
         return malloc(sz);
-    Retro::CCallStack cs(funcName, typeName);
-    return Retro::CMemory::Alloc(sz,
-                                 Retro::IAllocator::EHint::None,
-                                 Retro::IAllocator::EScope::Default,
-                                 Retro::IAllocator::EType::Array,
+    pshag::CCallStack cs(funcName, typeName);
+    return pshag::CMemory::Alloc(sz,
+                                 pshag::IAllocator::EHint::None,
+                                 pshag::IAllocator::EScope::Default,
+                                 pshag::IAllocator::EType::Array,
                                  cs);
 }
 
 void operator delete[](void* ptr) noexcept
 {
-    if (!Retro::g_memoryAllocatorReady)
+    if (!pshag::g_memoryAllocatorReady)
     {
         free(ptr);
         return;
     }
-    Retro::CMemory::Free(ptr);
+    pshag::CMemory::Free(ptr);
 }

Runtime/CMemory.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CMEMORY_HPP__
-#define __RETRO_CMEMORY_HPP__
+#ifndef __PSHAG_CMEMORY_HPP__
+#define __PSHAG_CMEMORY_HPP__
 
 #include "IAllocator.hpp"
 
-namespace Retro
+namespace pshag
 {
 class COsContext;
 
@@ -33,4 +33,4 @@ public:
 void* operator new(std::size_t sz, const char* funcName, const char* typeName);
 void* operator new[](std::size_t sz, const char* funcName, const char* typeName);
 
-#endif // __RETRO_CMEMORY_HPP__
+#endif // __PSHAG_CMEMORY_HPP__

Runtime/CMemoryCardSys.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CMEMORYCARDSYS_HPP__
-#define __RETRO_CMEMORYCARDSYS_HPP__
+#ifndef __PSHAG_CMEMORYCARDSYS_HPP__
+#define __PSHAG_CMEMORYCARDSYS_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CMemoryCardSys
@@ -10,4 +10,4 @@ class CMemoryCardSys
 
 }
 
-#endif // __RETRO_CMEMORYCARDSYS_HPP__
+#endif // __PSHAG_CMEMORYCARDSYS_HPP__

Runtime/CMemoryCardSysNix.cpp

@@ -1,6 +1,6 @@
 #include "CMemoryCardSys.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 }

Runtime/CModel.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CMODEL_HPP__
-#define __RETRO_CMODEL_HPP__
+#ifndef __PSHAG_CMODEL_HPP__
+#define __PSHAG_CMODEL_HPP__
 
 #include "RetroTypes.hpp"
 #include "CColor.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 struct CModelFlags
@@ -23,4 +23,4 @@ public:
 
 }
 
-#endif // __RETRO_CMODEL_HPP__
+#endif // __PSHAG_CMODEL_HPP__

Runtime/CModelBoo.cpp

@@ -1,6 +1,6 @@
 #include "CModel.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 void CModel::Draw(const CModelFlags& flags) const

Runtime/CMoviePlayer.cpp

@@ -1,6 +1,6 @@
 #include "CMoviePlayer.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CMoviePlayer::CMoviePlayer(const char* path, float startTime, bool flag)

Runtime/CMoviePlayer.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CMOVIEPLAYER_HPP__
-#define __RETRO_CMOVIEPLAYER_HPP__
+#ifndef __PSHAG_CMOVIEPLAYER_HPP__
+#define __PSHAG_CMOVIEPLAYER_HPP__
 
 #include "RetroTypes.hpp"
 #include "CDvdFile.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CVector3f;
 
@@ -41,4 +41,4 @@ public:
 
 }
 
-#endif // __RETRO_CMOVIEPLAYER_HPP__
+#endif // __PSHAG_CMOVIEPLAYER_HPP__

Runtime/CNODDvdRequest.cpp

@@ -1,6 +1,6 @@
 #include "CDvdRequest.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 void CNODDvdRequest::WaitUntilComplete()

Runtime/CObjectList.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_COBJECTLIST_HPP__
-#define __RETRO_COBJECTLIST_HPP__
+#ifndef __PSHAG_COBJECTLIST_HPP__
+#define __PSHAG_COBJECTLIST_HPP__
 
 #include "CEntity.hpp"
 #include "RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 enum class EGameObjectList
@@ -95,4 +95,4 @@ public:
 
 }
 
-#endif // __RETRO_COBJECTLIST_HPP__
+#endif // __PSHAG_COBJECTLIST_HPP__

Runtime/CPakFile.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_CPAKFILE_HPP__
-#define __RETRO_CPAKFILE_HPP__
+#ifndef __PSHAG_CPAKFILE_HPP__
+#define __PSHAG_CPAKFILE_HPP__
 
 #include <vector>
 #include "RetroTypes.hpp"
@@ -7,7 +7,7 @@
 #include "CDvdFile.hpp"
 #include "CDvdRequest.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CPakFile : public CDvdFile
@@ -74,4 +74,4 @@ public:
 
 }
 
-#endif // __RETRO_CPAKFILE_HPP__
+#endif // __PSHAG_CPAKFILE_HPP__

Runtime/CPhysicsActor.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CPHYSICSACTOR_HPP__
-#define __RETRO_CPHYSICSACTOR_HPP__
+#ifndef __PSHAG_CPHYSICSACTOR_HPP__
+#define __PSHAG_CPHYSICSACTOR_HPP__
 
 #include "CActor.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CCollisionPrimitive
@@ -120,4 +120,4 @@ public:
 
 }
 
-#endif // __RETRO_CPHYSICSACTOR_HPP__
+#endif // __PSHAG_CPHYSICSACTOR_HPP__

Runtime/CPlayMovieBase.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CPLAYMOVIEBASE_HPP__
-#define __RETRO_CPLAYMOVIEBASE_HPP__
+#ifndef __PSHAG_CPLAYMOVIEBASE_HPP__
+#define __PSHAG_CPLAYMOVIEBASE_HPP__
 
 #include "CIOWin.hpp"
 #include "CMoviePlayer.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CPlayMovieBase : public CIOWin
@@ -19,4 +19,4 @@ public:
 
 }
 
-#endif // __RETRO_CPLAYMOVIEBASE_HPP__
+#endif // __PSHAG_CPLAYMOVIEBASE_HPP__

Runtime/CPlayerState.cpp

@@ -1,6 +1,6 @@
 #include "CPlayerState.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CPlayerState::CPlayerState(CInputStream& stream)

Runtime/CPlayerState.hpp

@@ -1,12 +1,12 @@
-#ifndef __RETRO_CPLAYERSTATE_HPP__
-#define __RETRO_CPLAYERSTATE_HPP__
+#ifndef __PSHAG_CPLAYERSTATE_HPP__
+#define __PSHAG_CPLAYERSTATE_HPP__
 
 #include "RetroTypes.hpp"
 #include "CBasics.hpp"
 #include "CStaticInterference.hpp"
 #include "IOStreams.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CPlayerState
@@ -29,4 +29,4 @@ public:
 
 }
 
-#endif // __RETRO_CPLAYERSTATE_HPP__
+#endif // __PSHAG_CPLAYERSTATE_HPP__

Runtime/CRandom16.cpp

@@ -1,6 +1,6 @@
 #include "CRandom16.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CRandom16* CRandom16::g_randomNumber = nullptr;

Runtime/CRandom16.hpp

@@ -3,7 +3,7 @@
 
 #include "GCNTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 

Runtime/CResFactory.cpp

@@ -1,7 +1,7 @@
 #include "CResFactory.hpp"
 #include "IObj.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 std::unique_ptr<IObj> CResFactory::Build(const SObjectTag&, const CVParamTransfer&)

Runtime/CResFactory.hpp

@@ -1,12 +1,12 @@
-#ifndef __RETRO_CRESFACTORY_HPP__
-#define __RETRO_CRESFACTORY_HPP__
+#ifndef __PSHAG_CRESFACTORY_HPP__
+#define __PSHAG_CRESFACTORY_HPP__
 
 #include <unordered_map>
 #include "IFactory.hpp"
 #include "CResLoader.hpp"
 #include "IVParamObj.hpp"
 
-namespace Retro
+namespace pshag
 {
 class IDvdRequest;
 
@@ -43,4 +43,4 @@ public:
 
 }
 
-#endif // __RETRO_CRESFACTORY_HPP__
+#endif // __PSHAG_CRESFACTORY_HPP__

Runtime/CResLoader.cpp

@@ -3,7 +3,7 @@
 #include "CMemory.hpp"
 #include "CCallStack.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 const std::vector<u32>* CResLoader::GetTagListForFile(const std::string& name) const

Runtime/CResLoader.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_CRESLOADER_HPP__
-#define __RETRO_CRESLOADER_HPP__
+#ifndef __PSHAG_CRESLOADER_HPP__
+#define __PSHAG_CRESLOADER_HPP__
 
 #include <memory>
 #include <string>
@@ -7,7 +7,7 @@
 #include "CPakFile.hpp"
 #include "IOStreams.hpp"
 
-namespace Retro
+namespace pshag
 {
 struct SObjectTag;
 class IDvdRequest;
@@ -48,4 +48,4 @@ public:
 
 }
 
-#endif // __RETRO_CRESLOADER_HPP__
+#endif // __PSHAG_CRESLOADER_HPP__

Runtime/CScriptMailbox.cpp

@@ -1,6 +1,6 @@
 #include "CScriptMailbox.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 }

Runtime/CScriptMailbox.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CSCRIPTMAILBOX_HPP__
-#define __RETRO_CSCRIPTMAILBOX_HPP__
+#ifndef __PSHAG_CSCRIPTMAILBOX_HPP__
+#define __PSHAG_CSCRIPTMAILBOX_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CScriptMailbox
@@ -10,4 +10,4 @@ class CScriptMailbox
 
 }
 
-#endif // __RETRO_CSCRIPTMAILBOX_HPP__
+#endif // __PSHAG_CSCRIPTMAILBOX_HPP__

Runtime/CSimplePool.cpp

@@ -2,7 +2,7 @@
 #include "IVParamObj.hpp"
 #include "CToken.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 CSimplePool::CSimplePool(IFactory& factory)

Runtime/CSimplePool.hpp

@@ -1,12 +1,12 @@
-#ifndef __RETRO_CSIMPLEPOOL_HPP__
-#define __RETRO_CSIMPLEPOOL_HPP__
+#ifndef __PSHAG_CSIMPLEPOOL_HPP__
+#define __PSHAG_CSIMPLEPOOL_HPP__
 
 #include "IObjectStore.hpp"
 #include "RetroTypes.hpp"
 #include "IVParamObj.hpp"
 #include <unordered_map>
 
-namespace Retro
+namespace pshag
 {
 class IFactory;
 class CObjectReference;
@@ -32,4 +32,4 @@ public:
 
 }
 
-#endif // __RETRO_CSIMPLEPOOL_HPP__
+#endif // __PSHAG_CSIMPLEPOOL_HPP__

Runtime/CStateManager.cpp

@@ -1,6 +1,6 @@
 #include "CStateManager.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 void CStateManager::SendScriptMsg(TUniqueId uid, TEditorId eid, EScriptObjectMessage msg, EScriptObjectState state)

Runtime/CStateManager.hpp

@@ -1,11 +1,11 @@
-#ifndef __RETRO_CSTATEMANAGER_HPP__
-#define __RETRO_CSTATEMANAGER_HPP__
+#ifndef __PSHAG_CSTATEMANAGER_HPP__
+#define __PSHAG_CSTATEMANAGER_HPP__
 
 #include <memory>
 #include "CBasics.hpp"
 #include "ScriptObjectSupport.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CScriptMailbox;
 class CMapWorldInfo;

Runtime/CStaticInterference.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CSTATICINTERFERENCE_HPP__
-#define __RETRO_CSTATICINTERFERENCE_HPP__
+#ifndef __PSHAG_CSTATICINTERFERENCE_HPP__
+#define __PSHAG_CSTATICINTERFERENCE_HPP__
 
 #include <vector>
 #include "RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CStateManager;
 
@@ -72,4 +72,4 @@ public:
 
 }
 
-#endif // __RETRO_CSTATICINTERFERENCE_HPP__
+#endif // __PSHAG_CSTATICINTERFERENCE_HPP__

Runtime/CStringExtras.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CSTRINGEXTRAS_HPP__
-#define __RETRO_CSTRINGEXTRAS_HPP__
+#ifndef __PSHAG_CSTRINGEXTRAS_HPP__
+#define __PSHAG_CSTRINGEXTRAS_HPP__
 
 #include <string>
 #include <string.h>
 
-namespace Retro
+namespace pshag
 {
 
 class CStringExtras
@@ -26,4 +26,4 @@ public:
 
 }
 
-#endif // __RETRO_CSTRINGEXTRAS_HPP__
+#endif // __PSHAG_CSTRINGEXTRAS_HPP__

Runtime/CTexture.cpp

@@ -1,6 +1,6 @@
 #include "CTexture.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 void CTexture::Load(int slot, EClampMode clamp)

Runtime/CTexture.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CTEXTURE_HPP__
-#define __RETRO_CTEXTURE_HPP__
+#ifndef __PSHAG_CTEXTURE_HPP__
+#define __PSHAG_CTEXTURE_HPP__
 
 #include "GCNTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CTexture
@@ -23,4 +23,4 @@ public:
 
 }
 
-#endif // __RETRO_CTEXTURE_HPP__
+#endif // __PSHAG_CTEXTURE_HPP__

Runtime/CTimeProvider.cpp

@@ -3,7 +3,7 @@
 #include "CGraphics.hpp"
 #endif
 
-namespace Retro
+namespace pshag
 {
 CTimeProvider* CTimeProvider::g_currentTimeProvider = nullptr;
 CTimeProvider::CTimeProvider(const float& time)

Runtime/CTimeProvider.hpp

@@ -1,6 +1,6 @@
-#ifndef __RETRO__CTIMEPROVIDER_HPP__
-#define __RETRO__CTIMEPROVIDER_HPP__
-namespace Retro
+#ifndef __PSHAG__CTIMEPROVIDER_HPP__
+#define __PSHAG__CTIMEPROVIDER_HPP__
+namespace pshag
 {
 class CTimeProvider;
 class CTimeProvider

Runtime/CToken.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_CTOKEN_HPP__
-#define __RETRO_CTOKEN_HPP__
+#ifndef __PSHAG_CTOKEN_HPP__
+#define __PSHAG_CTOKEN_HPP__
 
 #include <memory>
 #include "IObj.hpp"
@@ -8,7 +8,7 @@
 #include "IObjectStore.hpp"
 #include "IFactory.hpp"
 
-namespace Retro
+namespace pshag
 {
 class IObjectStore;
 class IObj;
@@ -250,4 +250,4 @@ public:
 
 }
 
-#endif // __RETRO_CTOKEN_HPP__
+#endif // __PSHAG_CTOKEN_HPP__

Runtime/CWorldTransManager.cpp

@@ -1,6 +1,6 @@
 #include "CWorldTransManager.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 void CWorldTransManager::DrawEnabled() const

Runtime/CWorldTransManager.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CWORLDTRANSMANAGER_HPP__
-#define __RETRO_CWORLDTRANSMANAGER_HPP__
+#ifndef __PSHAG_CWORLDTRANSMANAGER_HPP__
+#define __PSHAG_CWORLDTRANSMANAGER_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CWorldTransManager
@@ -21,4 +21,4 @@ public:
 
 }
 
-#endif // __RETRO_CWORLDTRANSMANAGER_HPP__
+#endif // __PSHAG_CWORLDTRANSMANAGER_HPP__

Runtime/Character/CAnimData.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CANIMDATA_HPP__
-#define __RETRO_CANIMDATA_HPP__
+#ifndef __PSHAG_CANIMDATA_HPP__
+#define __PSHAG_CANIMDATA_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CAnimData
@@ -14,4 +14,4 @@ public:
 
 }
 
-#endif // __RETRO_CANIMDATA_HPP__
+#endif // __PSHAG_CANIMDATA_HPP__

Runtime/Character/CAnimationDatabase.hpp

@@ -1,12 +1,12 @@
-#ifndef __RETRO_CANIMATIONDATABASE_HPP__
-#define __RETRO_CANIMATIONDATABASE_HPP__
+#ifndef __PSHAG_CANIMATIONDATABASE_HPP__
+#define __PSHAG_CANIMATIONDATABASE_HPP__
 
 #include "../RetroTypes.hpp"
 #include <vector>
 #include <set>
 #include <string>
 
-namespace Retro
+namespace pshag
 {
 class IMetaAnim;
 class CPrimitive;
@@ -23,4 +23,4 @@ public:
 
 }
 
-#endif // __RETRO_CANIMATIONDATABASE_HPP__
+#endif // __PSHAG_CANIMATIONDATABASE_HPP__

Runtime/Character/CAnimationDatabaseGame.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CANIMATIONDATABASEGAME_HPP__
-#define __RETRO_CANIMATIONDATABASEGAME_HPP__
+#ifndef __PSHAG_CANIMATIONDATABASEGAME_HPP__
+#define __PSHAG_CANIMATIONDATABASEGAME_HPP__
 
 #include "CAnimationDatabase.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CAnimationDatabaseGame : public CAnimationDatabase
@@ -18,4 +18,4 @@ public:
 
 }
 
-#endif // __RETRO_CANIMATIONDATABASEGAME_HPP__
+#endif // __PSHAG_CANIMATIONDATABASEGAME_HPP__

Runtime/Character/CAssetFactory.cpp

@@ -1,6 +1,6 @@
 #include "CAssetFactory.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 }

Runtime/Character/CAssetFactory.hpp

@@ -1,10 +1,10 @@
-#ifndef __RETRO_CASSETFACTORY_HPP__
-#define __RETRO_CASSETFACTORY_HPP__
+#ifndef __PSHAG_CASSETFACTORY_HPP__
+#define __PSHAG_CASSETFACTORY_HPP__
 
 #include "../IFactory.hpp"
 #include "../IObj.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CCharacterFactoryBuilder : public IFactory
 {
@@ -17,4 +17,4 @@ public:
 };
 }
 
-#endif // __RETRO_CASSETFACTORY_HPP__
+#endif // __PSHAG_CASSETFACTORY_HPP__

Runtime/Character/CCharAnimTime.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CCHARANIMTIME_HPP__
-#define __RETRO_CCHARANIMTIME_HPP__
+#ifndef __PSHAG_CCHARANIMTIME_HPP__
+#define __PSHAG_CCHARANIMTIME_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CCharAnimTime
@@ -59,4 +59,4 @@ public:
 };
 }
 
-#endif // __RETRO_CCHARANIMTIME_HPP__
+#endif // __PSHAG_CCHARANIMTIME_HPP__

Runtime/Character/CCharacterFactory.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CCHARACTERFACTORY_HPP__
-#define __RETRO_CCHARACTERFACTORY_HPP__
+#ifndef __PSHAG_CCHARACTERFACTORY_HPP__
+#define __PSHAG_CCHARACTERFACTORY_HPP__
 
 #include "../IFactory.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CCharacterFactory : public IFactory
@@ -16,4 +16,4 @@ public:
 
 }
 
-#endif // __RETRO_CCHARACTERFACTORY_HPP__
+#endif // __PSHAG_CCHARACTERFACTORY_HPP__

Runtime/Character/CHierarchyPoseBuilder.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CHIERARCHYPOSEBUILDER_HPP__
-#define __RETRO_CHIERARCHYPOSEBUILDER_HPP__
+#ifndef __PSHAG_CHIERARCHYPOSEBUILDER_HPP__
+#define __PSHAG_CHIERARCHYPOSEBUILDER_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CHierarchyPoseBuilder
@@ -10,4 +10,4 @@ class CHierarchyPoseBuilder
 
 }
 
-#endif // __RETRO_CHIERARCHYPOSEBUILDER_HPP__
+#endif // __PSHAG_CHIERARCHYPOSEBUILDER_HPP__

Runtime/Character/CTransitionDatabase.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CTRANSITIONDATABASE_HPP__
-#define __RETRO_CTRANSITIONDATABASE_HPP__
+#ifndef __PSHAG_CTRANSITIONDATABASE_HPP__
+#define __PSHAG_CTRANSITIONDATABASE_HPP__
 
 #include "../RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 class IMetaTrans;
 
@@ -15,4 +15,4 @@ public:
 
 }
 
-#endif // __RETRO_CTRANSITIONDATABASE_HPP__
+#endif // __PSHAG_CTRANSITIONDATABASE_HPP__

Runtime/Character/CTransitionDatabaseGame.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_CTRANSITIONDATABASEGAME_HPP__
-#define __RETRO_CTRANSITIONDATABASEGAME_HPP__
+#ifndef __PSHAG_CTRANSITIONDATABASEGAME_HPP__
+#define __PSHAG_CTRANSITIONDATABASEGAME_HPP__
 
 #include "CTransitionDatabase.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class CTransitionDatabaseGame : public CTransitionDatabase
@@ -14,4 +14,4 @@ public:
 
 }
 
-#endif // __RETRO_CTRANSITIONDATABASEGAME_HPP__
+#endif // __PSHAG_CTRANSITIONDATABASEGAME_HPP__

Runtime/Character/IMetaAnim.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_IMETAANIM_HPP__
-#define __RETRO_IMETAANIM_HPP__
+#ifndef __PSHAG_IMETAANIM_HPP__
+#define __PSHAG_IMETAANIM_HPP__
 
 #include "../RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class IMetaAnim
@@ -12,4 +12,4 @@ class IMetaAnim
 
 }
 
-#endif // __RETRO_IMETAANIM_HPP__
+#endif // __PSHAG_IMETAANIM_HPP__

Runtime/Character/IMetaTrans.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_IMETATRANS_HPP__
-#define __RETRO_IMETATRANS_HPP__
+#ifndef __PSHAG_IMETATRANS_HPP__
+#define __PSHAG_IMETATRANS_HPP__
 
 #include "../RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 class IMetaTrans
@@ -12,4 +12,4 @@ class IMetaTrans
 
 }
 
-#endif // __RETRO_IMETATRANS_HPP__
+#endif // __PSHAG_IMETATRANS_HPP__

Runtime/GCNTypes.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_GCTYPES_HPP__
-#define __RETRO_GCTYPES_HPP__
+#ifndef __PSHAG_GCTYPES_HPP__
+#define __PSHAG_GCTYPES_HPP__
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -13,4 +13,4 @@ using u32 = uint32_t;
 using s64 = int64_t;
 using u64 = uint64_t;
 
-#endif // __RETRO_GCTYPES_HPP__
+#endif // __PSHAG_GCTYPES_HPP__

Runtime/GameGlobalObjects.hpp

@@ -1,7 +1,10 @@
-#ifndef __RETRO_GAMEGLOBALOBJECTS_HPP__
-#define __RETRO_GAMEGLOBALOBJECTS_HPP__
+#ifndef __PSHAG_GAMEGLOBALOBJECTS_HPP__
+#define __PSHAG_GAMEGLOBALOBJECTS_HPP__
+#include "../DataSpec/DNACommon/Tweaks/ITweakGame.hpp"
+#include "../DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp"
+#include "../DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 extern class CMemoryCardSys* g_MemoryCardSys;
@@ -13,10 +16,10 @@ extern class CGameState* g_GameState;
 extern class CInGameTweakManagerBase* g_TweakManager;
 extern class CBooRenderer* g_Renderer;
 
-extern struct ITweakGame*   g_tweakGame;
-extern struct ITweakPlayer* g_tweakPlayer;
-extern struct ITweakPlayerControl* g_tweakPlayerControl;
+extern DataSpec::ITweakGame*   g_tweakGame;
+extern DataSpec::ITweakPlayer* g_tweakPlayer;
+extern DataSpec::ITweakPlayerControl* g_tweakPlayerControl;
 
 }
 
-#endif // __RETRO_GAMEGLOBALOBJECTS_HPP__
+#endif // __PSHAG_GAMEGLOBALOBJECTS_HPP__

Runtime/Graphics/CBooRenderer.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CBOORENDERER_HPP__
-#define __RETRO_CBOORENDERER_HPP__
+#ifndef __PSHAG_CBOORENDERER_HPP__
+#define __PSHAG_CBOORENDERER_HPP__
 
-namespace Retro
+namespace pshag
 {
 class IObjectStore;
 class CMemorySys;
@@ -17,4 +17,4 @@ public:
 
 }
 
-#endif // __RETRO_CBOORENDERER_HPP__
+#endif // __PSHAG_CBOORENDERER_HPP__

Runtime/Graphics/CLight.hpp

@@ -1,8 +1,8 @@
-#ifndef __RETRO_CLIGHT_HPP__
-#define __RETRO_CLIGHT_HPP__
+#ifndef __PSHAG_CLIGHT_HPP__
+#define __PSHAG_CLIGHT_HPP__
 
 class CLight
 {
 };
 
-#endif // __RETRO_CLIGHT_HPP__
+#endif // __PSHAG_CLIGHT_HPP__

Runtime/Graphics/CMetroidModelInstance.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CMETROIDMODELINSTANCE_HPP__
-#define __RETRO_CMETROIDMODELINSTANCE_HPP__
+#ifndef __PSHAG_CMETROIDMODELINSTANCE_HPP__
+#define __PSHAG_CMETROIDMODELINSTANCE_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CMetroidModelInstance
@@ -10,4 +10,4 @@ class CMetroidModelInstance
 
 }
 
-#endif // __RETRO_CMETROIDMODELINSTANCE_HPP__
+#endif // __PSHAG_CMETROIDMODELINSTANCE_HPP__

Runtime/Graphics/IRenderer.hpp

@@ -1,5 +1,5 @@
-#ifndef __RETRO_IRENDERER_HPP__
-#define __RETRO_IRENDERER_HPP__
+#ifndef __PSHAG_IRENDERER_HPP__
+#define __PSHAG_IRENDERER_HPP__
 
 #include <vector>
 #include "../RetroTypes.hpp"
@@ -9,7 +9,7 @@
 #include "CFrustum.hpp"
 #include "CColor.hpp"
 
-namespace Retro
+namespace pshag
 {
 class CMetroidModelInstance;
 class CLight;
@@ -95,4 +95,4 @@ public:
 
 }
 
-#endif // __RETRO_IRENDERER_HPP__
+#endif // __PSHAG_IRENDERER_HPP__

Runtime/GuiSys/CConsoleOutputWindow.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CCONSOLEOUTPUTWINDOW_HPP__
-#define __RETRO_CCONSOLEOUTPUTWINDOW_HPP__
+#ifndef __PSHAG_CCONSOLEOUTPUTWINDOW_HPP__
+#define __PSHAG_CCONSOLEOUTPUTWINDOW_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CConsoleOutputWindow
@@ -10,4 +10,4 @@ class CConsoleOutputWindow
 
 }
 
-#endif // __RETRO_CCONSOLEOUTPUTWINDOW_HPP__
+#endif // __PSHAG_CCONSOLEOUTPUTWINDOW_HPP__

Runtime/GuiSys/CGuiSys.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CGUISYS_HPP__
-#define __RETRO_CGUISYS_HPP__
+#ifndef __PSHAG_CGUISYS_HPP__
+#define __PSHAG_CGUISYS_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CGuiSys
@@ -10,4 +10,4 @@ class CGuiSys
 
 }
 
-#endif // __RETRO_CGUISYS_HPP__
+#endif // __PSHAG_CGUISYS_HPP__

Runtime/GuiSys/CSplashScreen.hpp

@@ -1,7 +1,7 @@
-#ifndef __RETRO_CSPLASHSCREEN_HPP__
-#define __RETRO_CSPLASHSCREEN_HPP__
+#ifndef __PSHAG_CSPLASHSCREEN_HPP__
+#define __PSHAG_CSPLASHSCREEN_HPP__
 
-namespace Retro
+namespace pshag
 {
 
 class CSplashScreen
@@ -10,4 +10,4 @@ class CSplashScreen
 
 }
 
-#endif // __RETRO_CSPLASHSCREEN_HPP__
+#endif // __PSHAG_CSPLASHSCREEN_HPP__

Runtime/IAllocator.cpp

@@ -1,6 +1,6 @@
 #include "IAllocator.hpp"
 
-namespace Retro
+namespace pshag
 {
 
 }

Runtime/IAllocator.hpp

@@ -1,9 +1,9 @@
-#ifndef __RETRO_IALLOCATOR_HPP__
-#define __RETRO_IALLOCATOR_HPP__
+#ifndef __PSHAG_IALLOCATOR_HPP__
+#define __PSHAG_IALLOCATOR_HPP__
 
 #include "RetroTypes.hpp"
 
-namespace Retro
+namespace pshag
 {
 class COsContext;
 class CCallStack;
@@ -76,4 +76,4 @@ public:
 
 }
 
-#endif // __RETRO_IALLOCATOR_HPP__
+#endif // __PSHAG_IALLOCATOR_HPP__