From af69c9d3abe76b074afc92dfeeac496e90d33b8c Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 13 Feb 2016 01:02:47 -0800 Subject: [PATCH] Rename namespaces --- CMakeLists.txt | 8 +-- DataSpec/Blender/BlenderSupport.cpp | 2 +- DataSpec/Blender/BlenderSupport.hpp | 2 +- DataSpec/DNACommon/ANCS.hpp | 2 +- DataSpec/DNACommon/ANIM.cpp | 2 +- DataSpec/DNACommon/ANIM.hpp | 2 +- DataSpec/DNACommon/BabeDead.hpp | 2 +- DataSpec/DNACommon/CMDL.cpp | 2 +- DataSpec/DNACommon/CMDL.hpp | 2 +- DataSpec/DNACommon/DNACommon.cpp | 2 +- DataSpec/DNACommon/DNACommon.hpp | 18 +++--- DataSpec/DNACommon/DeafBabe.hpp | 2 +- DataSpec/DNACommon/EGMC.hpp | 2 +- DataSpec/DNACommon/MAPA.hpp | 2 +- DataSpec/DNACommon/MLVL.hpp | 2 +- DataSpec/DNACommon/PAK.hpp | 2 +- DataSpec/DNACommon/PART.hpp | 2 +- DataSpec/DNACommon/ParticleCommon.cpp | 2 +- DataSpec/DNACommon/ParticleCommon.hpp | 2 +- DataSpec/DNACommon/STRG.cpp | 2 +- DataSpec/DNACommon/STRG.hpp | 2 +- DataSpec/DNACommon/TXTR.cpp | 2 +- DataSpec/DNACommon/TXTR.hpp | 2 +- DataSpec/DNACommon/Tweaks/ITweakGame.hpp | 2 +- DataSpec/DNACommon/Tweaks/ITweakParticle.hpp | 2 +- DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp | 2 +- .../DNACommon/Tweaks/ITweakPlayerControl.hpp | 2 +- DataSpec/DNAMP1/AFSM.hpp | 2 +- DataSpec/DNAMP1/ANCS.cpp | 2 +- DataSpec/DNAMP1/ANCS.hpp | 2 +- DataSpec/DNAMP1/ANIM.cpp | 2 +- DataSpec/DNAMP1/ANIM.hpp | 2 +- DataSpec/DNAMP1/CINF.hpp | 2 +- DataSpec/DNAMP1/CMDL.hpp | 2 +- DataSpec/DNAMP1/CMDLMaterials.cpp | 6 +- DataSpec/DNAMP1/CMDLMaterials.hpp | 2 +- DataSpec/DNAMP1/CSKR.hpp | 2 +- DataSpec/DNAMP1/DNAMP1.cpp | 2 +- DataSpec/DNAMP1/DNAMP1.hpp | 2 +- DataSpec/DNAMP1/DeafBabe.cpp | 2 +- DataSpec/DNAMP1/DeafBabe.hpp | 2 +- DataSpec/DNAMP1/EVNT.cpp | 2 +- DataSpec/DNAMP1/EVNT.hpp | 2 +- DataSpec/DNAMP1/FRME.cpp | 2 +- DataSpec/DNAMP1/FRME.hpp | 2 +- DataSpec/DNAMP1/MAPA.hpp | 2 +- DataSpec/DNAMP1/MLVL.hpp | 2 +- DataSpec/DNAMP1/MREA.cpp | 2 +- DataSpec/DNAMP1/MREA.hpp | 2 +- DataSpec/DNAMP1/PAK.cpp | 2 +- DataSpec/DNAMP1/PAK.hpp | 2 +- DataSpec/DNAMP1/SCAN.hpp | 2 +- DataSpec/DNAMP1/SCLY.cpp | 2 +- DataSpec/DNAMP1/SCLY.hpp | 2 +- DataSpec/DNAMP1/STRG.cpp | 2 +- DataSpec/DNAMP1/STRG.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Actor.hpp | 2 +- .../DNAMP1/ScriptObjects/ActorContraption.hpp | 2 +- .../DNAMP1/ScriptObjects/ActorKeyframe.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp | 2 +- .../DNAMP1/ScriptObjects/AreaAttributes.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Beetle.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Burrower.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Camera.hpp | 2 +- .../ScriptObjects/CameraBlurKeyframe.hpp | 2 +- .../ScriptObjects/CameraFilterKeyframe.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp | 2 +- .../ScriptObjects/CameraHintTrigger.hpp | 2 +- .../ScriptObjects/CameraPitchVolume.hpp | 2 +- .../DNAMP1/ScriptObjects/CameraShaker.hpp | 2 +- .../DNAMP1/ScriptObjects/CameraWaypoint.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp | 2 +- .../DNAMP1/ScriptObjects/ColorModulate.hpp | 2 +- .../DNAMP1/ScriptObjects/ControllerAction.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Counter.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp | 2 +- .../ScriptObjects/DamageableTrigger.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Debris.hpp | 2 +- .../DNAMP1/ScriptObjects/DebrisExtended.hpp | 2 +- .../ScriptObjects/DebugCameraWaypoint.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Dock.hpp | 2 +- .../DNAMP1/ScriptObjects/DockAreaChange.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Drone.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Effect.hpp | 2 +- .../ScriptObjects/ElectroMagneticPulse.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp | 2 +- .../ScriptObjects/EnvFxDensityController.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp | 2 +- .../ScriptObjects/FishCloudModifier.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp | 2 +- .../DNAMP1/ScriptObjects/FlaahgraTentacle.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp | 2 +- .../DNAMP1/ScriptObjects/FlyingPirate.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Geemer.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Generator.hpp | 2 +- .../DNAMP1/ScriptObjects/GrapplePoint.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp | 2 +- .../DNAMP1/ScriptObjects/IScriptObject.cpp | 2 +- .../DNAMP1/ScriptObjects/IScriptObject.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp | 2 +- .../DNAMP1/ScriptObjects/MetareeAlpha.hpp | 2 +- .../DNAMP1/ScriptObjects/MetroidAlpha.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp | 2 +- .../ScriptObjects/MetroidPrimeStage1.hpp | 2 +- .../ScriptObjects/MetroidPrimeStage2.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Midi.hpp | 2 +- .../DNAMP1/ScriptObjects/NewCameraShaker.hpp | 2 +- .../DNAMP1/ScriptObjects/NewIntroBoss.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Oculus.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Parameters.cpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Parameters.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Parasite.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp | 2 +- .../ScriptObjects/PhazonHealingNodule.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Pickup.hpp | 2 +- .../DNAMP1/ScriptObjects/PickupGenerator.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Platform.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp | 2 +- .../ScriptObjects/PlayerStateChange.hpp | 2 +- .../DNAMP1/ScriptObjects/PointOfInterest.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp | 2 +- .../DNAMP1/ScriptObjects/PuddleToadGamma.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Puffer.hpp | 2 +- .../DNAMP1/ScriptObjects/RadialDamage.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Relay.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Ridley.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Ripper.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Ripple.hpp | 2 +- .../DNAMP1/ScriptObjects/RoomAcoustics.hpp | 2 +- .../DNAMP1/ScriptObjects/RumbleEffect.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Seedling.hpp | 2 +- .../DNAMP1/ScriptObjects/ShadowProjector.hpp | 2 +- .../DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Sound.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp | 2 +- .../DNAMP1/ScriptObjects/SpecialFunction.hpp | 2 +- .../SpiderBallAttractionSurface.hpp | 2 +- .../ScriptObjects/SpiderBallWaypoint.hpp | 2 +- .../DNAMP1/ScriptObjects/SpindleCamera.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Steam.hpp | 2 +- .../DNAMP1/ScriptObjects/StreamedAudio.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Switch.hpp | 2 +- .../DNAMP1/ScriptObjects/TargetingPoint.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Thardus.hpp | 2 +- .../ScriptObjects/ThardusRockProjectile.hpp | 2 +- .../DNAMP1/ScriptObjects/ThermalHeatFader.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Timer.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Trigger.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp | 2 +- .../DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Water.hpp | 2 +- DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp | 2 +- .../DNAMP1/ScriptObjects/WorldLightFader.hpp | 2 +- .../DNAMP1/ScriptObjects/WorldTeleporter.hpp | 2 +- DataSpec/DNAMP1/Tweaks/CTweakGame.hpp | 2 +- DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp | 2 +- DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp | 2 +- .../DNAMP1/Tweaks/CTweakPlayerControl.hpp | 2 +- DataSpec/DNAMP2/AFSM.hpp | 2 +- DataSpec/DNAMP2/ANCS.cpp | 2 +- DataSpec/DNAMP2/ANCS.hpp | 2 +- DataSpec/DNAMP2/ANIM.cpp | 2 +- DataSpec/DNAMP2/ANIM.hpp | 2 +- DataSpec/DNAMP2/CINF.hpp | 2 +- DataSpec/DNAMP2/CMDL.hpp | 2 +- DataSpec/DNAMP2/CMDLMaterials.hpp | 2 +- DataSpec/DNAMP2/CSKR.hpp | 2 +- DataSpec/DNAMP2/DNAMP2.cpp | 2 +- DataSpec/DNAMP2/DNAMP2.hpp | 2 +- DataSpec/DNAMP2/DeafBabe.hpp | 2 +- DataSpec/DNAMP2/MAPA.hpp | 2 +- DataSpec/DNAMP2/MLVL.hpp | 2 +- DataSpec/DNAMP2/MREA.cpp | 2 +- DataSpec/DNAMP2/MREA.hpp | 2 +- DataSpec/DNAMP2/STRG.cpp | 2 +- DataSpec/DNAMP2/STRG.hpp | 2 +- DataSpec/DNAMP3/ANIM.cpp | 2 +- DataSpec/DNAMP3/ANIM.hpp | 2 +- DataSpec/DNAMP3/CHAR.cpp | 2 +- DataSpec/DNAMP3/CHAR.hpp | 2 +- DataSpec/DNAMP3/CINF.hpp | 2 +- DataSpec/DNAMP3/CMDL.hpp | 2 +- DataSpec/DNAMP3/CMDLMaterials.cpp | 2 +- DataSpec/DNAMP3/CMDLMaterials.hpp | 2 +- DataSpec/DNAMP3/CSKR.hpp | 2 +- DataSpec/DNAMP3/DNAMP3.cpp | 2 +- DataSpec/DNAMP3/DNAMP3.hpp | 2 +- DataSpec/DNAMP3/MAPA.hpp | 2 +- DataSpec/DNAMP3/MLVL.hpp | 2 +- DataSpec/DNAMP3/MREA.cpp | 2 +- DataSpec/DNAMP3/MREA.hpp | 2 +- DataSpec/DNAMP3/PAK.cpp | 2 +- DataSpec/DNAMP3/PAK.hpp | 2 +- DataSpec/DNAMP3/STRG.cpp | 2 +- DataSpec/DNAMP3/STRG.hpp | 2 +- DataSpec/SpecBase.cpp | 6 +- DataSpec/SpecBase.hpp | 2 +- DataSpec/SpecMP1.cpp | 2 +- DataSpec/SpecMP2.cpp | 2 +- DataSpec/SpecMP3.cpp | 2 +- Editor/main.cpp | 2 +- Runtime/Audio/CAudioStateWin.hpp | 8 +-- Runtime/Audio/CAudioSys.hpp | 8 +-- Runtime/Audio/CSfxHandle.hpp | 8 +-- Runtime/Audio/CSfxManager.hpp | 8 +-- Runtime/CActor.cpp | 2 +- Runtime/CActor.hpp | 8 +-- Runtime/CAi.cpp | 2 +- Runtime/CAi.hpp | 8 +-- Runtime/CArchitectureMessage.hpp | 8 +-- Runtime/CArchitectureQueue.hpp | 8 +-- Runtime/CAreaOctTree.hpp | 8 +-- Runtime/CBasics.hpp | 8 +-- Runtime/CBasicsPC.cpp | 2 +- Runtime/CCRC32.cpp | 2 +- Runtime/CCRC32.hpp | 2 +- Runtime/CCallStack.hpp | 8 +-- Runtime/CDvdFile.hpp | 8 +-- Runtime/CDvdRequest.hpp | 8 +-- Runtime/CEntity.cpp | 2 +- Runtime/CEntity.hpp | 8 +-- Runtime/CFactoryMgr.hpp | 8 +-- Runtime/CGameAllocator.cpp | 2 +- Runtime/CGameAllocator.hpp | 8 +-- Runtime/CGameDebug.hpp | 8 +-- Runtime/CGameOptions.cpp | 2 +- Runtime/CGameOptions.hpp | 8 +-- Runtime/CGameState.cpp | 2 +- Runtime/CGameState.hpp | 8 +-- Runtime/CGraphics.cpp | 2 +- Runtime/CGraphics.hpp | 8 +-- Runtime/CIOWin.hpp | 8 +-- Runtime/CIOWinManager.cpp | 2 +- Runtime/CIOWinManager.hpp | 8 +-- Runtime/CInGameTweakManagerBase.hpp | 8 +-- Runtime/CLight.cpp | 2 +- Runtime/CLight.hpp | 8 +-- Runtime/CMFGameBase.hpp | 8 +-- Runtime/CMainFlowBase.cpp | 2 +- Runtime/CMainFlowBase.hpp | 8 +-- Runtime/CMapWorldInfo.cpp | 2 +- Runtime/CMapWorldInfo.hpp | 8 +-- Runtime/CMemory.cpp | 58 +++++++++---------- Runtime/CMemory.hpp | 8 +-- Runtime/CMemoryCardSys.hpp | 8 +-- Runtime/CMemoryCardSysNix.cpp | 2 +- Runtime/CModel.hpp | 8 +-- Runtime/CModelBoo.cpp | 2 +- Runtime/CMoviePlayer.cpp | 2 +- Runtime/CMoviePlayer.hpp | 8 +-- Runtime/CNODDvdRequest.cpp | 2 +- Runtime/CObjectList.hpp | 8 +-- Runtime/CPakFile.hpp | 8 +-- Runtime/CPhysicsActor.hpp | 8 +-- Runtime/CPlayMovieBase.hpp | 8 +-- Runtime/CPlayerState.cpp | 2 +- Runtime/CPlayerState.hpp | 8 +-- Runtime/CRandom16.cpp | 2 +- Runtime/CRandom16.hpp | 2 +- Runtime/CResFactory.cpp | 2 +- Runtime/CResFactory.hpp | 8 +-- Runtime/CResLoader.cpp | 2 +- Runtime/CResLoader.hpp | 8 +-- Runtime/CScriptMailbox.cpp | 2 +- Runtime/CScriptMailbox.hpp | 8 +-- Runtime/CSimplePool.cpp | 2 +- Runtime/CSimplePool.hpp | 8 +-- Runtime/CStateManager.cpp | 2 +- Runtime/CStateManager.hpp | 6 +- Runtime/CStaticInterference.hpp | 8 +-- Runtime/CStringExtras.hpp | 8 +-- Runtime/CTexture.cpp | 2 +- Runtime/CTexture.hpp | 8 +-- Runtime/CTimeProvider.cpp | 2 +- Runtime/CTimeProvider.hpp | 6 +- Runtime/CToken.hpp | 8 +-- Runtime/CWorldTransManager.cpp | 2 +- Runtime/CWorldTransManager.hpp | 8 +-- Runtime/Character/CAnimData.hpp | 8 +-- Runtime/Character/CAnimationDatabase.hpp | 8 +-- Runtime/Character/CAnimationDatabaseGame.hpp | 8 +-- Runtime/Character/CAssetFactory.cpp | 2 +- Runtime/Character/CAssetFactory.hpp | 8 +-- Runtime/Character/CCharAnimTime.hpp | 8 +-- Runtime/Character/CCharacterFactory.hpp | 8 +-- Runtime/Character/CHierarchyPoseBuilder.hpp | 8 +-- Runtime/Character/CTransitionDatabase.hpp | 8 +-- Runtime/Character/CTransitionDatabaseGame.hpp | 8 +-- Runtime/Character/IMetaAnim.hpp | 8 +-- Runtime/Character/IMetaTrans.hpp | 8 +-- Runtime/GCNTypes.hpp | 6 +- Runtime/GameGlobalObjects.hpp | 17 +++--- Runtime/Graphics/CBooRenderer.hpp | 8 +-- Runtime/Graphics/CLight.hpp | 6 +- Runtime/Graphics/CMetroidModelInstance.hpp | 8 +-- Runtime/Graphics/IRenderer.hpp | 8 +-- Runtime/GuiSys/CConsoleOutputWindow.hpp | 8 +-- Runtime/GuiSys/CGuiSys.hpp | 8 +-- Runtime/GuiSys/CSplashScreen.hpp | 8 +-- Runtime/IAllocator.cpp | 2 +- Runtime/IAllocator.hpp | 8 +-- Runtime/IFactory.hpp | 8 +-- Runtime/IOStreams.cpp | 2 +- Runtime/IOStreams.hpp | 8 +-- Runtime/IObj.hpp | 8 +-- Runtime/IObjectStore.hpp | 8 +-- Runtime/IVParamObj.hpp | 8 +-- Runtime/Input/CFinalInput.cpp | 2 +- Runtime/Input/CFinalInput.hpp | 8 +-- Runtime/Input/CInputGenerator.cpp | 2 +- Runtime/Input/CInputGenerator.hpp | 8 +-- Runtime/Input/CKeyboardMouseController.hpp | 8 +-- Runtime/Input/ControlMapper.cpp | 2 +- Runtime/Input/ControlMapper.hpp | 8 +-- Runtime/Input/IController.hpp | 8 +-- Runtime/MP1/CFrontEndUI.cpp | 2 +- Runtime/MP1/CFrontEndUI.hpp | 8 +-- Runtime/MP1/CInGameTweakManager.hpp | 8 +-- Runtime/MP1/CMFGame.cpp | 2 +- Runtime/MP1/CMFGame.hpp | 8 +-- Runtime/MP1/CMain.hpp | 8 +-- Runtime/MP1/CMainFlow.cpp | 2 +- Runtime/MP1/CMainFlow.hpp | 8 +-- Runtime/MP1/CPlayMovie.cpp | 2 +- Runtime/MP1/CPlayMovie.hpp | 8 +-- Runtime/MP1/CTweaks.cpp | 8 +-- Runtime/MP1/CTweaks.hpp | 8 +-- Runtime/MP1/main.cpp | 4 +- Runtime/Particle/CColorElement.cpp | 2 +- Runtime/Particle/CColorElement.hpp | 8 +-- Runtime/Particle/CDecalDataFactory.cpp | 2 +- Runtime/Particle/CDecalDataFactory.hpp | 8 +-- Runtime/Particle/CDecalDescription.hpp | 8 +-- Runtime/Particle/CDecalManager.hpp | 8 +-- Runtime/Particle/CElectricDescription.hpp | 8 +-- Runtime/Particle/CElementGen.cpp | 2 +- Runtime/Particle/CElementGen.hpp | 8 +-- Runtime/Particle/CEmitterElement.hpp | 8 +-- Runtime/Particle/CGenDescription.hpp | 8 +-- Runtime/Particle/CIntElement.cpp | 2 +- Runtime/Particle/CIntElement.hpp | 8 +-- Runtime/Particle/CModVectorElement.cpp | 2 +- Runtime/Particle/CModVectorElement.hpp | 8 +-- Runtime/Particle/CParticleDataFactory.cpp | 2 +- Runtime/Particle/CParticleDataFactory.hpp | 8 +-- Runtime/Particle/CParticleElectric.cpp | 2 +- Runtime/Particle/CParticleElectric.hpp | 8 +-- .../Particle/CParticleElectricDataFactory.cpp | 6 +- .../Particle/CParticleElectricDataFactory.hpp | 8 +-- Runtime/Particle/CParticleGen.cpp | 2 +- Runtime/Particle/CParticleGen.hpp | 8 +-- Runtime/Particle/CParticleGlobals.cpp | 2 +- Runtime/Particle/CParticleGlobals.hpp | 8 +-- Runtime/Particle/CParticleSwoosh.cpp | 2 +- Runtime/Particle/CParticleSwoosh.hpp | 8 +-- .../Particle/CParticleSwooshDataFactory.cpp | 4 +- .../Particle/CParticleSwooshDataFactory.hpp | 8 +-- Runtime/Particle/CRealElement.cpp | 2 +- Runtime/Particle/CRealElement.hpp | 8 +-- Runtime/Particle/CSpawnSystemKeyframeData.cpp | 2 +- Runtime/Particle/CSpawnSystemKeyframeData.hpp | 8 +-- Runtime/Particle/CSwooshDescription.hpp | 8 +-- Runtime/Particle/CUVElement.cpp | 2 +- Runtime/Particle/CUVElement.hpp | 8 +-- Runtime/Particle/CVectorElement.cpp | 2 +- Runtime/Particle/CVectorElement.hpp | 8 +-- Runtime/Particle/CWarp.hpp | 8 +-- Runtime/Particle/CWeaponDescription.hpp | 6 +- Runtime/Particle/IElement.hpp | 8 +-- Runtime/RetroTypes.hpp | 12 ++-- Runtime/ScriptObjectSupport.hpp | 2 +- 404 files changed, 790 insertions(+), 787 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 949ee96be..6d4fe69b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ set(DATA_SPEC_LIBS DNACommon) set(HECL_DATASPEC_DECLS "/* RetroCommon specs */ -namespace Retro +namespace DataSpec { extern HECL::Database::DataSpecEntry SpecEntMP1; extern HECL::Database::DataSpecEntry SpecEntMP2; @@ -73,9 +73,9 @@ namespace Retro }") set(HECL_DATASPEC_PUSHES " /* RetroCommon */ - HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP1); - HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP2); - HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP3);") + HECL::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP1); + HECL::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP2); + HECL::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3);") add_subdirectory(hecl) add_subdirectory(libSpecter) set(SPECTER_INCLUDE_DIR libSpecter/include libSpecter/freetype2/include) diff --git a/DataSpec/Blender/BlenderSupport.cpp b/DataSpec/Blender/BlenderSupport.cpp index 6892e089b..9849ed3b6 100644 --- a/DataSpec/Blender/BlenderSupport.cpp +++ b/DataSpec/Blender/BlenderSupport.cpp @@ -5,7 +5,7 @@ extern "C" uint8_t RETRO_MASTER_SHADER[]; extern "C" size_t RETRO_MASTER_SHADER_SZ; -namespace Retro +namespace DataSpec { namespace Blender { diff --git a/DataSpec/Blender/BlenderSupport.hpp b/DataSpec/Blender/BlenderSupport.hpp index 43d82ee0e..f9fc1ae19 100644 --- a/DataSpec/Blender/BlenderSupport.hpp +++ b/DataSpec/Blender/BlenderSupport.hpp @@ -3,7 +3,7 @@ #include -namespace Retro +namespace DataSpec { namespace Blender { diff --git a/DataSpec/DNACommon/ANCS.hpp b/DataSpec/DNACommon/ANCS.hpp index ce630c402..81313155d 100644 --- a/DataSpec/DNACommon/ANCS.hpp +++ b/DataSpec/DNACommon/ANCS.hpp @@ -6,7 +6,7 @@ #include "BlenderConnection.hpp" #include "CMDL.hpp" -namespace Retro +namespace DataSpec { namespace DNAANCS { diff --git a/DataSpec/DNACommon/ANIM.cpp b/DataSpec/DNACommon/ANIM.cpp index 6e9a6a75d..1420bb22b 100644 --- a/DataSpec/DNACommon/ANIM.cpp +++ b/DataSpec/DNACommon/ANIM.cpp @@ -2,7 +2,7 @@ #include #include "ANIM.hpp" -namespace Retro +namespace DataSpec { namespace DNAANIM { diff --git a/DataSpec/DNACommon/ANIM.hpp b/DataSpec/DNACommon/ANIM.hpp index fb4a90e9d..14821b2c3 100644 --- a/DataSpec/DNACommon/ANIM.hpp +++ b/DataSpec/DNACommon/ANIM.hpp @@ -3,7 +3,7 @@ #include "DNACommon.hpp" -namespace Retro +namespace DataSpec { namespace DNAANIM { diff --git a/DataSpec/DNACommon/BabeDead.hpp b/DataSpec/DNACommon/BabeDead.hpp index d894eb9d4..d4ae5a0cc 100644 --- a/DataSpec/DNACommon/BabeDead.hpp +++ b/DataSpec/DNACommon/BabeDead.hpp @@ -8,7 +8,7 @@ #endif #include -namespace Retro +namespace DataSpec { template diff --git a/DataSpec/DNACommon/CMDL.cpp b/DataSpec/DNACommon/CMDL.cpp index 9e06545d3..813e24743 100644 --- a/DataSpec/DNACommon/CMDL.cpp +++ b/DataSpec/DNACommon/CMDL.cpp @@ -1,6 +1,6 @@ #include "CMDL.hpp" -namespace Retro +namespace DataSpec { namespace DNACMDL { diff --git a/DataSpec/DNACommon/CMDL.hpp b/DataSpec/DNACommon/CMDL.hpp index c8ead30e1..ea2061e3d 100644 --- a/DataSpec/DNACommon/CMDL.hpp +++ b/DataSpec/DNACommon/CMDL.hpp @@ -9,7 +9,7 @@ #include "GX.hpp" #include "TXTR.hpp" -namespace Retro +namespace DataSpec { namespace DNACMDL { diff --git a/DataSpec/DNACommon/DNACommon.cpp b/DataSpec/DNACommon/DNACommon.cpp index fb4911540..0947a64d9 100644 --- a/DataSpec/DNACommon/DNACommon.cpp +++ b/DataSpec/DNACommon/DNACommon.cpp @@ -1,6 +1,6 @@ #include "DNACommon.hpp" -namespace Retro +namespace DataSpec { LogVisor::LogModule LogDNACommon("Retro::DNACommon"); diff --git a/DataSpec/DNACommon/DNACommon.hpp b/DataSpec/DNACommon/DNACommon.hpp index 52f53d29f..bb8702a5e 100644 --- a/DataSpec/DNACommon/DNACommon.hpp +++ b/DataSpec/DNACommon/DNACommon.hpp @@ -8,7 +8,7 @@ #include "HECL/Database.hpp" #include "../SpecBase.hpp" -namespace Retro +namespace DataSpec { extern LogVisor::LogModule LogDNACommon; @@ -364,30 +364,30 @@ typedef std::function namespace std { template<> -struct hash +struct hash { - size_t operator()(const Retro::DNAFourCC& fcc) const + size_t operator()(const DataSpec::DNAFourCC& fcc) const {return fcc.toUint32();} }; template<> -struct hash +struct hash { - size_t operator()(const Retro::UniqueID32& id) const + size_t operator()(const DataSpec::UniqueID32& id) const {return id.toUint32();} }; template<> -struct hash +struct hash { - size_t operator()(const Retro::UniqueID64& id) const + size_t operator()(const DataSpec::UniqueID64& id) const {return id.toUint64();} }; template<> -struct hash +struct hash { - size_t operator()(const Retro::UniqueID128& id) const + size_t operator()(const DataSpec::UniqueID128& id) const {return id.toHighUint64() ^ id.toLowUint64();} }; } diff --git a/DataSpec/DNACommon/DeafBabe.hpp b/DataSpec/DNACommon/DeafBabe.hpp index dd1ad8ad9..c89ac0116 100644 --- a/DataSpec/DNACommon/DeafBabe.hpp +++ b/DataSpec/DNACommon/DeafBabe.hpp @@ -4,7 +4,7 @@ #include "DNACommon.hpp" #include "BlenderConnection.hpp" -namespace Retro +namespace DataSpec { template diff --git a/DataSpec/DNACommon/EGMC.hpp b/DataSpec/DNACommon/EGMC.hpp index f5ab6fab2..473e65a11 100644 --- a/DataSpec/DNACommon/EGMC.hpp +++ b/DataSpec/DNACommon/EGMC.hpp @@ -3,7 +3,7 @@ #include "DNACommon.hpp" -namespace Retro +namespace DataSpec { namespace DNACommon { diff --git a/DataSpec/DNACommon/MAPA.hpp b/DataSpec/DNACommon/MAPA.hpp index 471afa270..9e751321b 100644 --- a/DataSpec/DNACommon/MAPA.hpp +++ b/DataSpec/DNACommon/MAPA.hpp @@ -4,7 +4,7 @@ #include "DNACommon.hpp" #include "GX.hpp" -namespace Retro +namespace DataSpec { namespace DNAMAPA { diff --git a/DataSpec/DNACommon/MLVL.hpp b/DataSpec/DNACommon/MLVL.hpp index 3208692d3..42742ada9 100644 --- a/DataSpec/DNACommon/MLVL.hpp +++ b/DataSpec/DNACommon/MLVL.hpp @@ -5,7 +5,7 @@ #include "BlenderConnection.hpp" #include "CVector3f.hpp" -namespace Retro +namespace DataSpec { namespace DNAMLVL { diff --git a/DataSpec/DNACommon/PAK.hpp b/DataSpec/DNACommon/PAK.hpp index ae3adc9e6..6a4303ac9 100644 --- a/DataSpec/DNACommon/PAK.hpp +++ b/DataSpec/DNACommon/PAK.hpp @@ -3,7 +3,7 @@ #include "DNACommon.hpp" -namespace Retro +namespace DataSpec { /* PAK entry stream reader */ diff --git a/DataSpec/DNACommon/PART.hpp b/DataSpec/DNACommon/PART.hpp index 806b35c18..1f0abf3ce 100644 --- a/DataSpec/DNACommon/PART.hpp +++ b/DataSpec/DNACommon/PART.hpp @@ -5,7 +5,7 @@ #include "PAK.hpp" #include "Athena/FileWriter.hpp" -namespace Retro +namespace DataSpec { namespace DNAParticle { diff --git a/DataSpec/DNACommon/ParticleCommon.cpp b/DataSpec/DNACommon/ParticleCommon.cpp index cc8876fa6..138308fb6 100644 --- a/DataSpec/DNACommon/ParticleCommon.cpp +++ b/DataSpec/DNACommon/ParticleCommon.cpp @@ -1,6 +1,6 @@ #include "ParticleCommon.hpp" -namespace Retro +namespace DataSpec { namespace DNAParticle { diff --git a/DataSpec/DNACommon/ParticleCommon.hpp b/DataSpec/DNACommon/ParticleCommon.hpp index c7e27e0d5..ab12ee347 100644 --- a/DataSpec/DNACommon/ParticleCommon.hpp +++ b/DataSpec/DNACommon/ParticleCommon.hpp @@ -3,7 +3,7 @@ #include "DNACommon.hpp" -namespace Retro +namespace DataSpec { namespace DNAParticle { diff --git a/DataSpec/DNACommon/STRG.cpp b/DataSpec/DNACommon/STRG.cpp index cc13365a1..9f1867ecf 100644 --- a/DataSpec/DNACommon/STRG.cpp +++ b/DataSpec/DNACommon/STRG.cpp @@ -3,7 +3,7 @@ #include "../DNAMP2/STRG.hpp" #include "../DNAMP3/STRG.hpp" -namespace Retro +namespace DataSpec { std::unique_ptr LoadSTRG(Athena::io::IStreamReader& reader) diff --git a/DataSpec/DNACommon/STRG.hpp b/DataSpec/DNACommon/STRG.hpp index 211801e6e..ab41e9991 100644 --- a/DataSpec/DNACommon/STRG.hpp +++ b/DataSpec/DNACommon/STRG.hpp @@ -8,7 +8,7 @@ #include #include "DNACommon.hpp" -namespace Retro +namespace DataSpec { struct ISTRG : BigYAML { diff --git a/DataSpec/DNACommon/TXTR.cpp b/DataSpec/DNACommon/TXTR.cpp index c49993d82..dce834ebf 100644 --- a/DataSpec/DNACommon/TXTR.cpp +++ b/DataSpec/DNACommon/TXTR.cpp @@ -3,7 +3,7 @@ #include "TXTR.hpp" #include "PAK.hpp" -namespace Retro +namespace DataSpec { static LogVisor::LogModule Log("libpng"); diff --git a/DataSpec/DNACommon/TXTR.hpp b/DataSpec/DNACommon/TXTR.hpp index 758c6f04b..5d51e599b 100644 --- a/DataSpec/DNACommon/TXTR.hpp +++ b/DataSpec/DNACommon/TXTR.hpp @@ -3,7 +3,7 @@ #include "DNACommon.hpp" -namespace Retro +namespace DataSpec { class PAKEntryReadStream; diff --git a/DataSpec/DNACommon/Tweaks/ITweakGame.hpp b/DataSpec/DNACommon/Tweaks/ITweakGame.hpp index 4dd56e5a2..32d462d74 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakGame.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakGame.hpp @@ -3,7 +3,7 @@ #include "../DNACommon.hpp" -namespace Retro +namespace DataSpec { struct ITweakGame : BigYAML diff --git a/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp b/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp index 642b3f431..027ec8d48 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp @@ -3,7 +3,7 @@ #include "../DNACommon.hpp" -namespace Retro +namespace DataSpec { struct ITweakParticle : BigYAML diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp index e65c7fc11..693ffe6fe 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp @@ -3,7 +3,7 @@ #include "../DNACommon.hpp" -namespace Retro +namespace DataSpec { struct ITweakPlayer : BigYAML diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp index f09655a10..c25f1faec 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp @@ -3,7 +3,7 @@ #include "../DNACommon.hpp" -namespace Retro +namespace DataSpec { struct ITweakPlayerControl : BigYAML diff --git a/DataSpec/DNAMP1/AFSM.hpp b/DataSpec/DNAMP1/AFSM.hpp index 1a49813ea..4c3b0b3e7 100644 --- a/DataSpec/DNAMP1/AFSM.hpp +++ b/DataSpec/DNAMP1/AFSM.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/DNACommon.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ANCS.cpp b/DataSpec/DNAMP1/ANCS.cpp index f3eff9950..8f9a11d11 100644 --- a/DataSpec/DNAMP1/ANCS.cpp +++ b/DataSpec/DNAMP1/ANCS.cpp @@ -1,6 +1,6 @@ #include "ANCS.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ANCS.hpp b/DataSpec/DNAMP1/ANCS.hpp index 0f95b9e00..8a7db335e 100644 --- a/DataSpec/DNAMP1/ANCS.hpp +++ b/DataSpec/DNAMP1/ANCS.hpp @@ -11,7 +11,7 @@ #include "ANIM.hpp" #include "Athena/FileReader.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ANIM.cpp b/DataSpec/DNAMP1/ANIM.cpp index 65eff2346..3fc7cff46 100644 --- a/DataSpec/DNAMP1/ANIM.cpp +++ b/DataSpec/DNAMP1/ANIM.cpp @@ -1,6 +1,6 @@ #include "ANIM.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ANIM.hpp b/DataSpec/DNAMP1/ANIM.hpp index 248f7aa89..2155f2377 100644 --- a/DataSpec/DNAMP1/ANIM.hpp +++ b/DataSpec/DNAMP1/ANIM.hpp @@ -6,7 +6,7 @@ #include "../DNACommon/ANIM.hpp" #include "CINF.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/CINF.hpp b/DataSpec/DNAMP1/CINF.hpp index 181b44575..d7d73dadd 100644 --- a/DataSpec/DNAMP1/CINF.hpp +++ b/DataSpec/DNAMP1/CINF.hpp @@ -4,7 +4,7 @@ #include "BlenderConnection.hpp" #include "../DNACommon/DNACommon.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/CMDL.hpp b/DataSpec/DNAMP1/CMDL.hpp index 9aa4af57f..4e4e03f59 100644 --- a/DataSpec/DNAMP1/CMDL.hpp +++ b/DataSpec/DNAMP1/CMDL.hpp @@ -10,7 +10,7 @@ #include -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/CMDLMaterials.cpp b/DataSpec/DNAMP1/CMDLMaterials.cpp index 1f3716cd7..27b541a7f 100644 --- a/DataSpec/DNAMP1/CMDLMaterials.cpp +++ b/DataSpec/DNAMP1/CMDLMaterials.cpp @@ -3,7 +3,7 @@ using Stream = HECL::BlenderConnection::PyOutStream; -namespace Retro +namespace DataSpec { namespace DNAMP1 { @@ -1299,7 +1299,7 @@ MaterialSet::Material::UVAnimation::UVAnimation(const std::string& gameFunction, } } -namespace Retro +namespace DataSpec { namespace DNAMP2 { @@ -1308,7 +1308,7 @@ void MaterialSet::ConstructMaterial(Stream& out, const MaterialSet::Material& material, unsigned groupIdx, unsigned matIdx) -{Retro::DNAMP1::_ConstructMaterial(out, material, groupIdx, matIdx);} +{DataSpec::DNAMP1::_ConstructMaterial(out, material, groupIdx, matIdx);} } } diff --git a/DataSpec/DNAMP1/CMDLMaterials.hpp b/DataSpec/DNAMP1/CMDLMaterials.hpp index 11b41c059..490471d49 100644 --- a/DataSpec/DNAMP1/CMDLMaterials.hpp +++ b/DataSpec/DNAMP1/CMDLMaterials.hpp @@ -7,7 +7,7 @@ #include "../DNACommon/CMDL.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/CSKR.hpp b/DataSpec/DNAMP1/CSKR.hpp index 3c8f74ad2..de591b0a6 100644 --- a/DataSpec/DNAMP1/CSKR.hpp +++ b/DataSpec/DNAMP1/CSKR.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/DNACommon.hpp" #include "CINF.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/DNAMP1.cpp b/DataSpec/DNAMP1/DNAMP1.cpp index 381129c67..1a92eb6e4 100644 --- a/DataSpec/DNAMP1/DNAMP1.cpp +++ b/DataSpec/DNAMP1/DNAMP1.cpp @@ -14,7 +14,7 @@ #include "MAPA.hpp" #include "FRME.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/DNAMP1.hpp b/DataSpec/DNAMP1/DNAMP1.hpp index 773cdd222..383545dba 100644 --- a/DataSpec/DNAMP1/DNAMP1.hpp +++ b/DataSpec/DNAMP1/DNAMP1.hpp @@ -4,7 +4,7 @@ #include "../DNACommon/DNACommon.hpp" #include "PAK.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/DeafBabe.cpp b/DataSpec/DNAMP1/DeafBabe.cpp index 3c4c9e9ef..9ee913148 100644 --- a/DataSpec/DNAMP1/DeafBabe.cpp +++ b/DataSpec/DNAMP1/DeafBabe.cpp @@ -1,6 +1,6 @@ #include "DeafBabe.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/DeafBabe.hpp b/DataSpec/DNAMP1/DeafBabe.hpp index 58ade1a70..5b31e666c 100644 --- a/DataSpec/DNAMP1/DeafBabe.hpp +++ b/DataSpec/DNAMP1/DeafBabe.hpp @@ -3,7 +3,7 @@ #include "../DNACommon/DeafBabe.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/EVNT.cpp b/DataSpec/DNAMP1/EVNT.cpp index 92c42117c..0af53708b 100644 --- a/DataSpec/DNAMP1/EVNT.cpp +++ b/DataSpec/DNAMP1/EVNT.cpp @@ -1,6 +1,6 @@ #include "EVNT.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/EVNT.hpp b/DataSpec/DNAMP1/EVNT.hpp index ec63b091b..5283c4fec 100644 --- a/DataSpec/DNAMP1/EVNT.hpp +++ b/DataSpec/DNAMP1/EVNT.hpp @@ -4,7 +4,7 @@ #include "../DNACommon/DNACommon.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/FRME.cpp b/DataSpec/DNAMP1/FRME.cpp index 29de8666a..21bbcfcff 100644 --- a/DataSpec/DNAMP1/FRME.cpp +++ b/DataSpec/DNAMP1/FRME.cpp @@ -1,7 +1,7 @@ #include "FRME.hpp" #include "../DNACommon/TXTR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/FRME.hpp b/DataSpec/DNAMP1/FRME.hpp index 977ee69a6..337fe598c 100644 --- a/DataSpec/DNAMP1/FRME.hpp +++ b/DataSpec/DNAMP1/FRME.hpp @@ -5,7 +5,7 @@ #include "DNAMP1.hpp" #include -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/MAPA.hpp b/DataSpec/DNAMP1/MAPA.hpp index 1c3b90411..052f6edf7 100644 --- a/DataSpec/DNAMP1/MAPA.hpp +++ b/DataSpec/DNAMP1/MAPA.hpp @@ -7,7 +7,7 @@ #include "../DNACommon/MAPA.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/MLVL.hpp b/DataSpec/DNAMP1/MLVL.hpp index be4f2bdea..875250951 100644 --- a/DataSpec/DNAMP1/MLVL.hpp +++ b/DataSpec/DNAMP1/MLVL.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/MLVL.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/MREA.cpp b/DataSpec/DNAMP1/MREA.cpp index 526840d33..474345b91 100644 --- a/DataSpec/DNAMP1/MREA.cpp +++ b/DataSpec/DNAMP1/MREA.cpp @@ -8,7 +8,7 @@ #endif #include -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/MREA.hpp b/DataSpec/DNAMP1/MREA.hpp index c8211416f..0e273eb48 100644 --- a/DataSpec/DNAMP1/MREA.hpp +++ b/DataSpec/DNAMP1/MREA.hpp @@ -5,7 +5,7 @@ #include "CMDLMaterials.hpp" #include "CSKR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/PAK.cpp b/DataSpec/DNAMP1/PAK.cpp index 95998071b..e66c5605f 100644 --- a/DataSpec/DNAMP1/PAK.cpp +++ b/DataSpec/DNAMP1/PAK.cpp @@ -3,7 +3,7 @@ #include "DNAMP1.hpp" #include "PAK.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/PAK.hpp b/DataSpec/DNAMP1/PAK.hpp index 8a34f2699..6c1aa8a59 100644 --- a/DataSpec/DNAMP1/PAK.hpp +++ b/DataSpec/DNAMP1/PAK.hpp @@ -6,7 +6,7 @@ #include #include "../DNACommon/PAK.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/SCAN.hpp b/DataSpec/DNAMP1/SCAN.hpp index ca6d083a3..87e99adc0 100644 --- a/DataSpec/DNAMP1/SCAN.hpp +++ b/DataSpec/DNAMP1/SCAN.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/DNACommon.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/SCLY.cpp b/DataSpec/DNAMP1/SCLY.cpp index ce9bcf335..5c55dff79 100644 --- a/DataSpec/DNAMP1/SCLY.cpp +++ b/DataSpec/DNAMP1/SCLY.cpp @@ -1,7 +1,7 @@ #include "SCLY.hpp" #include "ScriptObjects/ScriptTypes.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/SCLY.hpp b/DataSpec/DNAMP1/SCLY.hpp index f453a140a..2ab65b602 100644 --- a/DataSpec/DNAMP1/SCLY.hpp +++ b/DataSpec/DNAMP1/SCLY.hpp @@ -5,7 +5,7 @@ #include "ScriptObjects/IScriptObject.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/STRG.cpp b/DataSpec/DNAMP1/STRG.cpp index e00873710..b3fd46abb 100644 --- a/DataSpec/DNAMP1/STRG.cpp +++ b/DataSpec/DNAMP1/STRG.cpp @@ -1,7 +1,7 @@ #include "STRG.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/STRG.hpp b/DataSpec/DNAMP1/STRG.hpp index e2155af8b..3c9d01cdd 100644 --- a/DataSpec/DNAMP1/STRG.hpp +++ b/DataSpec/DNAMP1/STRG.hpp @@ -6,7 +6,7 @@ #include "../DNACommon/STRG.hpp" #include "DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp index 58d6eb7ca..e9afd2b87 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp index 6f3dc3650..57a2d558d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp @@ -4,7 +4,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Actor.hpp b/DataSpec/DNAMP1/ScriptObjects/Actor.hpp index 447e8f06f..c51f988cc 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Actor.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Actor.hpp @@ -4,7 +4,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp b/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp index 27b43ca79..d7980e108 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp index 90dab160d..0c82a0f9d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp b/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp index 8a78b86ac..cf688a8a0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp b/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp index 80bbcc5b3..025e828b4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp b/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp index 0cfb975ec..ea145b260 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp b/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp index 5d0c377bc..ee60db4f7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp b/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp index 062dd0663..17086a8c7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp b/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp index 473194315..f8302ff08 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp b/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp index 01a9cac6b..ecaaad5e4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp b/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp index ad42ea774..844c67a57 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp b/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp index ee7bcf028..95f685e25 100644 --- a/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp b/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp index 642eca309..b8b3a3cec 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Camera.hpp b/DataSpec/DNAMP1/ScriptObjects/Camera.hpp index d5f187e8d..e1dbac0af 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Camera.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Camera.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp index 66913cc06..55fa4e9ff 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp index d2ea3ed2c..9192e5620 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp index 76b53bb3a..9fa74c410 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp index 3243ae254..809c76966 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp index 1ca984c82..598d81055 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp index c06b9d030..905d029e3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp index 3d9fac2a0..58ee087b4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp b/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp index 90efeac76..5a3f955ac 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp b/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp index a61ebcd46..c8af4c22a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp b/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp index b86d67ea6..8caf8ff90 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Counter.hpp b/DataSpec/DNAMP1/ScriptObjects/Counter.hpp index 5dbceca46..1ad3757f9 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Counter.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Counter.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp index 477084148..0563e4650 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp b/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp index 98aa353f5..297c8f183 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Debris.hpp b/DataSpec/DNAMP1/ScriptObjects/Debris.hpp index 89bb7ca45..874a52a76 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Debris.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Debris.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp b/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp index eaa01a166..6ffc7770f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp index e26d5f8aa..82ff19c93 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp b/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp index 70864d4e6..03bf5769c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Dock.hpp b/DataSpec/DNAMP1/ScriptObjects/Dock.hpp index 927c6e9c0..f4e611077 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Dock.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Dock.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp b/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp index c70dd8e5d..7c6a1318c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp b/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp index b8ebb2368..fc567d3dc 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Drone.hpp b/DataSpec/DNAMP1/ScriptObjects/Drone.hpp index e15daa730..15fd9559f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Drone.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Drone.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Effect.hpp b/DataSpec/DNAMP1/ScriptObjects/Effect.hpp index aa87c22e1..c2489587f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Effect.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Effect.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp b/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp index 76c944fc4..52bac3984 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp b/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp index cb9ccb764..221d23dd3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp b/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp index 8c47e8b4f..bb447e6f0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp b/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp index e0a9cbf67..cb6c20d18 100644 --- a/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp b/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp index 08bfa74ab..be9bee9c5 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp b/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp index 34ba10c6d..45b59460f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp b/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp index 40e395659..401f212da 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp b/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp index ee061acd7..3846fc256 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp b/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp index 7c6e34342..c921ba1ab 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp b/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp index f702b4b30..1f49733a0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp b/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp index 1c7a409bf..977b7de11 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp b/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp index 66cf1b144..b1cc593af 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp b/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp index 1a935e8a1..b5f7d66c5 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp b/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp index 9b1c39db1..4190bad14 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Generator.hpp b/DataSpec/DNAMP1/ScriptObjects/Generator.hpp index c60141d4e..15cede863 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Generator.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Generator.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp b/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp index 514d64c86..358af7289 100644 --- a/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp b/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp index 808008f33..95f0db042 100644 --- a/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp b/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp index 93c3dfe6d..b1a629fa6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.cpp b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.cpp index 2db01411b..d64d2a46d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.cpp +++ b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.cpp @@ -1,7 +1,7 @@ #include "IScriptObject.hpp" #include "ScriptTypes.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp index 47629c7e7..70d8673cc 100644 --- a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp @@ -4,7 +4,7 @@ #include "../DNAMP1.hpp" #include -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp b/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp index 671e93ba1..f290b71bb 100644 --- a/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp b/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp index 5943c53f5..9e8b48cd1 100644 --- a/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp b/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp index 10408a4e7..fec02b80a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp b/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp index ade2aa6d1..885190ba2 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp b/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp index 02a2994ac..aa4400117 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp b/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp index 3dca89514..d0bb57d45 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp b/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp index 3b6c1bbdb..6ff0c7804 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp index 005152956..0623bcde6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp index 5eb59146f..0ca382a76 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp index 50a8f20df..aeb01f72a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp index 25e0e7db5..572defcfe 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Midi.hpp b/DataSpec/DNAMP1/ScriptObjects/Midi.hpp index c03fa3c85..a13dbdfc5 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Midi.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Midi.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp b/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp index 164a36659..d0b15961e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp b/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp index f5790879a..35dfc2334 100644 --- a/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp b/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp index f10378f19..53b673caa 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp b/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp index 50b47cc94..2cd9971d8 100644 --- a/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Parameters.cpp b/DataSpec/DNAMP1/ScriptObjects/Parameters.cpp index b2815d6ef..dca860d84 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Parameters.cpp +++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.cpp @@ -1,7 +1,7 @@ #include "Parameters.hpp" #include "../ANCS.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp index fa94dede4..8f449209e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp @@ -4,7 +4,7 @@ #include "../../DNACommon/DNACommon.hpp" #include "../DNAMP1.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp b/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp index 7c61ca4d3..79484e1a1 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp b/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp index dc2e29c6a..b7c32b232 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp b/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp index 71d428aed..9040cd624 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp b/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp index e5abbe464..b9cc271dd 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp b/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp index 1af3e8717..d6bfb1ee1 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp b/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp index bce3719d1..6368dfdba 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Platform.hpp b/DataSpec/DNAMP1/ScriptObjects/Platform.hpp index 79568314a..58a1ba893 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Platform.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Platform.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp index 38267f1fa..2812d6b78 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp b/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp index c6d11883e..4b5f2ec90 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp b/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp index 3f80202ed..c10b31c0b 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp b/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp index a092bb9b8..060df7d56 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp b/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp index 1e1b1c6d7..14031a525 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp b/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp index 55e86a7c4..ead986d34 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp b/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp index d29610e7f..b6aa2f317 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp b/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp index 784985fec..9793e0ba7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp b/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp index 7fb3ee8cc..6ae8b3b10 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Relay.hpp b/DataSpec/DNAMP1/ScriptObjects/Relay.hpp index e82698c4d..3e4a51242 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Relay.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Relay.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp b/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp index 219992453..e6cee64bf 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp b/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp index 31e51fbf6..2699746f6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp b/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp index b9edbc750..811b80ef6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp b/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp index 6d76bb94e..ca7d64274 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp b/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp index 985d52b8d..097513440 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp b/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp index 572c9897a..69862b8b6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp b/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp index a0a546484..7c51dfb10 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp b/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp index d8bbbc07e..32b3857a7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp @@ -129,7 +129,7 @@ #include #include -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp b/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp index 8949ccc67..7af1db294 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp b/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp index 739c4bfeb..0bdfe2f6f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp b/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp index ed07bbefb..29f601bed 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Sound.hpp b/DataSpec/DNAMP1/ScriptObjects/Sound.hpp index 1c0c6b9f5..03cbd7f12 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Sound.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Sound.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp b/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp index 11e93db87..b7900bbdb 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp b/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp index 10ac3cc0a..8e887ae64 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp index de5cfc21a..79e8b946d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp b/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp index 8d8db9b19..1e59044b4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp b/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp index ea0e353fd..06a4cdf44 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp index 22c78e649..3384f7fba 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp b/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp index 37cd1f3f9..bf30a5f2b 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Steam.hpp b/DataSpec/DNAMP1/ScriptObjects/Steam.hpp index cd4674baa..480e8dcbe 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Steam.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Steam.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp b/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp index 72276f522..b20e459b7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Switch.hpp b/DataSpec/DNAMP1/ScriptObjects/Switch.hpp index 38b5cbcd0..02d4939cf 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Switch.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Switch.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp index ab02dd634..51b4d9f88 100644 --- a/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp b/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp index 1641ce707..2178b9996 100644 --- a/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp b/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp index 15691f5f9..97dcb005d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp b/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp index ec4dc16d2..1618a4cd1 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp b/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp index eff836d90..cc2c37fb2 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Timer.hpp b/DataSpec/DNAMP1/ScriptObjects/Timer.hpp index c635641ab..b3a810455 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Timer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Timer.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp b/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp index 31a811be2..f0f83ba6f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp b/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp index e01525a27..1e1803b33 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp b/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp index 48e28c9f6..28ad689d6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp b/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp index 208557e3b..09d35349d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp b/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp index cb65d0a58..2dac72098 100644 --- a/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp b/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp index d3aa1fafc..75627aead 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Water.hpp b/DataSpec/DNAMP1/ScriptObjects/Water.hpp index 5e17fed65..4052d9ec8 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Water.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Water.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp index 87f095167..210254530 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp b/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp index 79b662865..9e0b4e1c3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp index 67c5e93ac..9aa32f858 100644 --- a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp @@ -5,7 +5,7 @@ #include "IScriptObject.hpp" #include "Parameters.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp b/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp index 828eb4457..3b27c0f30 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp @@ -3,7 +3,7 @@ #include "../../DNACommon/Tweaks/ITweakGame.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp b/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp index 2dac790cb..e07f06ae4 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp @@ -3,7 +3,7 @@ #include "../../DNACommon/Tweaks/ITweakParticle.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp b/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp index 8a0f85446..6e7f148bf 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp @@ -3,7 +3,7 @@ #include "../../DNACommon/Tweaks/ITweakPlayer.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp b/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp index 3a8624a36..c72d71dc1 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp @@ -3,7 +3,7 @@ #include "../../DNACommon/Tweaks/ITweakPlayerControl.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP1 { diff --git a/DataSpec/DNAMP2/AFSM.hpp b/DataSpec/DNAMP2/AFSM.hpp index 8140b6e82..b13cddd28 100644 --- a/DataSpec/DNAMP2/AFSM.hpp +++ b/DataSpec/DNAMP2/AFSM.hpp @@ -3,7 +3,7 @@ #include "../DNAMP1/AFSM.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/ANCS.cpp b/DataSpec/DNAMP2/ANCS.cpp index 813c104d8..6e4b8b74f 100644 --- a/DataSpec/DNAMP2/ANCS.cpp +++ b/DataSpec/DNAMP2/ANCS.cpp @@ -1,6 +1,6 @@ #include "ANCS.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/ANCS.hpp b/DataSpec/DNAMP2/ANCS.hpp index 83dd86a7d..780be2092 100644 --- a/DataSpec/DNAMP2/ANCS.hpp +++ b/DataSpec/DNAMP2/ANCS.hpp @@ -11,7 +11,7 @@ #include "ANIM.hpp" #include "../DNAMP1/ANCS.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/ANIM.cpp b/DataSpec/DNAMP2/ANIM.cpp index ea1f0637c..b85708fae 100644 --- a/DataSpec/DNAMP2/ANIM.cpp +++ b/DataSpec/DNAMP2/ANIM.cpp @@ -1,6 +1,6 @@ #include "ANIM.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/ANIM.hpp b/DataSpec/DNAMP2/ANIM.hpp index f55f5bfd0..7dda6e677 100644 --- a/DataSpec/DNAMP2/ANIM.hpp +++ b/DataSpec/DNAMP2/ANIM.hpp @@ -6,7 +6,7 @@ #include "../DNACommon/ANIM.hpp" #include "CINF.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/CINF.hpp b/DataSpec/DNAMP2/CINF.hpp index 95bb4a30a..aeef58887 100644 --- a/DataSpec/DNAMP2/CINF.hpp +++ b/DataSpec/DNAMP2/CINF.hpp @@ -4,7 +4,7 @@ #include "BlenderConnection.hpp" #include "../DNACommon/DNACommon.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/CMDL.hpp b/DataSpec/DNAMP2/CMDL.hpp index 841e536da..2a3b9be39 100644 --- a/DataSpec/DNAMP2/CMDL.hpp +++ b/DataSpec/DNAMP2/CMDL.hpp @@ -8,7 +8,7 @@ #include "CINF.hpp" #include "CSKR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/CMDLMaterials.hpp b/DataSpec/DNAMP2/CMDLMaterials.hpp index 64814975d..59bde8fbd 100644 --- a/DataSpec/DNAMP2/CMDLMaterials.hpp +++ b/DataSpec/DNAMP2/CMDLMaterials.hpp @@ -6,7 +6,7 @@ #include "../DNAMP1/CMDLMaterials.hpp" #include "DNAMP2.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/CSKR.hpp b/DataSpec/DNAMP2/CSKR.hpp index 29eaf7b39..1f93533f7 100644 --- a/DataSpec/DNAMP2/CSKR.hpp +++ b/DataSpec/DNAMP2/CSKR.hpp @@ -6,7 +6,7 @@ #include "CINF.hpp" #include "../DNAMP1/CSKR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/DNAMP2.cpp b/DataSpec/DNAMP2/DNAMP2.cpp index 2d163b7d7..c0ea47e6b 100644 --- a/DataSpec/DNAMP2/DNAMP2.cpp +++ b/DataSpec/DNAMP2/DNAMP2.cpp @@ -9,7 +9,7 @@ #include "AFSM.hpp" #include "../DNACommon/TXTR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/DNAMP2.hpp b/DataSpec/DNAMP2/DNAMP2.hpp index 0c8c47e90..bcd818163 100644 --- a/DataSpec/DNAMP2/DNAMP2.hpp +++ b/DataSpec/DNAMP2/DNAMP2.hpp @@ -4,7 +4,7 @@ #include "../DNACommon/DNACommon.hpp" #include "../DNAMP1/PAK.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/DeafBabe.hpp b/DataSpec/DNAMP2/DeafBabe.hpp index 9d64536eb..5432a54a9 100644 --- a/DataSpec/DNAMP2/DeafBabe.hpp +++ b/DataSpec/DNAMP2/DeafBabe.hpp @@ -3,7 +3,7 @@ #include "../DNAMP1/DeafBabe.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/MAPA.hpp b/DataSpec/DNAMP2/MAPA.hpp index 022748ea3..1a8b85eaf 100644 --- a/DataSpec/DNAMP2/MAPA.hpp +++ b/DataSpec/DNAMP2/MAPA.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/MAPA.hpp" #include "DNAMP2.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/MLVL.hpp b/DataSpec/DNAMP2/MLVL.hpp index ea9c21a17..2456e64c7 100644 --- a/DataSpec/DNAMP2/MLVL.hpp +++ b/DataSpec/DNAMP2/MLVL.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/MLVL.hpp" #include "DNAMP2.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/MREA.cpp b/DataSpec/DNAMP2/MREA.cpp index 439e9b1cb..d5adb6d9d 100644 --- a/DataSpec/DNAMP2/MREA.cpp +++ b/DataSpec/DNAMP2/MREA.cpp @@ -5,7 +5,7 @@ #include "../DNACommon/EGMC.hpp" #include "DeafBabe.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/MREA.hpp b/DataSpec/DNAMP2/MREA.hpp index 678712fef..ff5811c3b 100644 --- a/DataSpec/DNAMP2/MREA.hpp +++ b/DataSpec/DNAMP2/MREA.hpp @@ -5,7 +5,7 @@ #include "CMDLMaterials.hpp" #include "CSKR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/STRG.cpp b/DataSpec/DNAMP2/STRG.cpp index 2faf82197..c46e7cb79 100644 --- a/DataSpec/DNAMP2/STRG.cpp +++ b/DataSpec/DNAMP2/STRG.cpp @@ -1,7 +1,7 @@ #include "STRG.hpp" #include "DNAMP2.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP2/STRG.hpp b/DataSpec/DNAMP2/STRG.hpp index 030c1125e..1bbdc1c45 100644 --- a/DataSpec/DNAMP2/STRG.hpp +++ b/DataSpec/DNAMP2/STRG.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/PAK.hpp" #include "../DNACommon/STRG.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP2 { diff --git a/DataSpec/DNAMP3/ANIM.cpp b/DataSpec/DNAMP3/ANIM.cpp index 50734fb39..b2b437196 100644 --- a/DataSpec/DNAMP3/ANIM.cpp +++ b/DataSpec/DNAMP3/ANIM.cpp @@ -2,7 +2,7 @@ #include #include -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/ANIM.hpp b/DataSpec/DNAMP3/ANIM.hpp index 8df2fef27..292c36f94 100644 --- a/DataSpec/DNAMP3/ANIM.hpp +++ b/DataSpec/DNAMP3/ANIM.hpp @@ -6,7 +6,7 @@ #include "../DNACommon/ANIM.hpp" #include "CINF.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/CHAR.cpp b/DataSpec/DNAMP3/CHAR.cpp index 3b5d35ce9..7395e073e 100644 --- a/DataSpec/DNAMP3/CHAR.cpp +++ b/DataSpec/DNAMP3/CHAR.cpp @@ -1,6 +1,6 @@ #include "CHAR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/CHAR.hpp b/DataSpec/DNAMP3/CHAR.hpp index 16ad9f589..97813fa27 100644 --- a/DataSpec/DNAMP3/CHAR.hpp +++ b/DataSpec/DNAMP3/CHAR.hpp @@ -11,7 +11,7 @@ #include "ANIM.hpp" #include "../DNAMP2/ANCS.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/CINF.hpp b/DataSpec/DNAMP3/CINF.hpp index 0e59880e7..2e6421d34 100644 --- a/DataSpec/DNAMP3/CINF.hpp +++ b/DataSpec/DNAMP3/CINF.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/DNACommon.hpp" #include "../DNAMP2/CINF.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/CMDL.hpp b/DataSpec/DNAMP3/CMDL.hpp index 4e8f94893..b5074fcb9 100644 --- a/DataSpec/DNAMP3/CMDL.hpp +++ b/DataSpec/DNAMP3/CMDL.hpp @@ -8,7 +8,7 @@ #include "CINF.hpp" #include "CSKR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/CMDLMaterials.cpp b/DataSpec/DNAMP3/CMDLMaterials.cpp index 50ae08789..3ac0f3bec 100644 --- a/DataSpec/DNAMP3/CMDLMaterials.cpp +++ b/DataSpec/DNAMP3/CMDLMaterials.cpp @@ -2,7 +2,7 @@ using Stream = HECL::BlenderConnection::PyOutStream; -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/CMDLMaterials.hpp b/DataSpec/DNAMP3/CMDLMaterials.hpp index df54361b6..a3851a522 100644 --- a/DataSpec/DNAMP3/CMDLMaterials.hpp +++ b/DataSpec/DNAMP3/CMDLMaterials.hpp @@ -6,7 +6,7 @@ #include "../DNAMP1/CMDLMaterials.hpp" #include "DNAMP3.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/CSKR.hpp b/DataSpec/DNAMP3/CSKR.hpp index 7333110d5..4f64fc539 100644 --- a/DataSpec/DNAMP3/CSKR.hpp +++ b/DataSpec/DNAMP3/CSKR.hpp @@ -6,7 +6,7 @@ #include "CINF.hpp" #include "../DNAMP2/CSKR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/DNAMP3.cpp b/DataSpec/DNAMP3/DNAMP3.cpp index c15788bf1..04ab66d01 100644 --- a/DataSpec/DNAMP3/DNAMP3.cpp +++ b/DataSpec/DNAMP3/DNAMP3.cpp @@ -10,7 +10,7 @@ #include "MAPA.hpp" #include "../DNACommon/TXTR.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/DNAMP3.hpp b/DataSpec/DNAMP3/DNAMP3.hpp index b0a3e57bf..106194573 100644 --- a/DataSpec/DNAMP3/DNAMP3.hpp +++ b/DataSpec/DNAMP3/DNAMP3.hpp @@ -4,7 +4,7 @@ #include "../DNACommon/DNACommon.hpp" #include "PAK.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/MAPA.hpp b/DataSpec/DNAMP3/MAPA.hpp index fef725591..958a37811 100644 --- a/DataSpec/DNAMP3/MAPA.hpp +++ b/DataSpec/DNAMP3/MAPA.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/MAPA.hpp" #include "DNAMP3.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/MLVL.hpp b/DataSpec/DNAMP3/MLVL.hpp index b0056fa73..722dcbb18 100644 --- a/DataSpec/DNAMP3/MLVL.hpp +++ b/DataSpec/DNAMP3/MLVL.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/MLVL.hpp" #include "DNAMP3.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/MREA.cpp b/DataSpec/DNAMP3/MREA.cpp index 618a17738..ca98645c5 100644 --- a/DataSpec/DNAMP3/MREA.cpp +++ b/DataSpec/DNAMP3/MREA.cpp @@ -3,7 +3,7 @@ #include "../DNAMP2/DeafBabe.hpp" #include "../DNACommon/BabeDead.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/MREA.hpp b/DataSpec/DNAMP3/MREA.hpp index 5a0b45ce0..3ea60a199 100644 --- a/DataSpec/DNAMP3/MREA.hpp +++ b/DataSpec/DNAMP3/MREA.hpp @@ -6,7 +6,7 @@ #include "CSKR.hpp" #include "../DNAMP2/MREA.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/PAK.cpp b/DataSpec/DNAMP3/PAK.cpp index abeb8b989..20ac05a29 100644 --- a/DataSpec/DNAMP3/PAK.cpp +++ b/DataSpec/DNAMP3/PAK.cpp @@ -1,7 +1,7 @@ #include "PAK.hpp" #include "DNAMP3.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/PAK.hpp b/DataSpec/DNAMP3/PAK.hpp index acf986c9c..1f2992162 100644 --- a/DataSpec/DNAMP3/PAK.hpp +++ b/DataSpec/DNAMP3/PAK.hpp @@ -7,7 +7,7 @@ #include #include "../DNACommon/PAK.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/STRG.cpp b/DataSpec/DNAMP3/STRG.cpp index a55de3216..eda6c95b7 100644 --- a/DataSpec/DNAMP3/STRG.cpp +++ b/DataSpec/DNAMP3/STRG.cpp @@ -1,7 +1,7 @@ #include "STRG.hpp" #include "DNAMP3.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/DNAMP3/STRG.hpp b/DataSpec/DNAMP3/STRG.hpp index 741262038..4317dc472 100644 --- a/DataSpec/DNAMP3/STRG.hpp +++ b/DataSpec/DNAMP3/STRG.hpp @@ -5,7 +5,7 @@ #include "../DNACommon/PAK.hpp" #include "../DNACommon/STRG.hpp" -namespace Retro +namespace DataSpec { namespace DNAMP3 { diff --git a/DataSpec/SpecBase.cpp b/DataSpec/SpecBase.cpp index b9f6c40d3..75ac313cf 100644 --- a/DataSpec/SpecBase.cpp +++ b/DataSpec/SpecBase.cpp @@ -10,7 +10,7 @@ #include -namespace Retro +namespace DataSpec { static LogVisor::LogModule Log("Retro::SpecBase"); @@ -85,7 +85,7 @@ bool SpecBase::canExtract(const ExtractPassInfo& info, std::vector #include "BlenderConnection.hpp" -namespace Retro +namespace DataSpec { struct SpecBase : HECL::Database::IDataSpec diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp index c58e7954b..3c5cec55e 100644 --- a/DataSpec/SpecMP1.cpp +++ b/DataSpec/SpecMP1.cpp @@ -10,7 +10,7 @@ #include "DNAMP1/CMDL.hpp" #include "DNAMP1/ANCS.hpp" -namespace Retro +namespace DataSpec { static LogVisor::LogModule Log("Retro::SpecMP1"); diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp index 1a91aaca0..f5a383f36 100644 --- a/DataSpec/SpecMP2.cpp +++ b/DataSpec/SpecMP2.cpp @@ -6,7 +6,7 @@ #include "DNAMP2/MLVL.hpp" #include "DNAMP2/STRG.hpp" -namespace Retro +namespace DataSpec { static LogVisor::LogModule Log("Retro::SpecMP2"); diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp index 6def085a4..1a60683e2 100644 --- a/DataSpec/SpecMP3.cpp +++ b/DataSpec/SpecMP3.cpp @@ -8,7 +8,7 @@ #include "DNAMP3/STRG.hpp" #include "DNAMP2/STRG.hpp" -namespace Retro +namespace DataSpec { static LogVisor::LogModule Log("Retro::SpecMP3"); diff --git a/Editor/main.cpp b/Editor/main.cpp index 7a12106b9..e6753b8a1 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -24,7 +24,7 @@ struct Application : boo::IApplicationCallback int appMain(boo::IApplication* app) { - Retro::CElementGen::Initialize(); + pshag::CElementGen::Initialize(); m_viewManager.init(app); while (m_running) { diff --git a/Runtime/Audio/CAudioStateWin.hpp b/Runtime/Audio/CAudioStateWin.hpp index e86db8be8..1446aba09 100644 --- a/Runtime/Audio/CAudioStateWin.hpp +++ b/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__ diff --git a/Runtime/Audio/CAudioSys.hpp b/Runtime/Audio/CAudioSys.hpp index 670d3d93d..5dde992d6 100644 --- a/Runtime/Audio/CAudioSys.hpp +++ b/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__ diff --git a/Runtime/Audio/CSfxHandle.hpp b/Runtime/Audio/CSfxHandle.hpp index 4cc87c1fe..7f7b525fd 100644 --- a/Runtime/Audio/CSfxHandle.hpp +++ b/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__ diff --git a/Runtime/Audio/CSfxManager.hpp b/Runtime/Audio/CSfxManager.hpp index 17532c1c9..2bb324561 100644 --- a/Runtime/Audio/CSfxManager.hpp +++ b/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 #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__ diff --git a/Runtime/CActor.cpp b/Runtime/CActor.cpp index 12965b034..240371f5a 100644 --- a/Runtime/CActor.cpp +++ b/Runtime/CActor.cpp @@ -1,5 +1,5 @@ #include "CActor.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/CActor.hpp b/Runtime/CActor.hpp index 0e931e520..46a6d6281 100644 --- a/Runtime/CActor.hpp +++ b/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 -namespace Retro +namespace pshag { enum class ECollisionResponseType @@ -80,4 +80,4 @@ public: } -#endif // __RETRO_CACTOR_HPP__ +#endif // __PSHAG_CACTOR_HPP__ diff --git a/Runtime/CAi.cpp b/Runtime/CAi.cpp index 2edb792df..3e030470e 100644 --- a/Runtime/CAi.cpp +++ b/Runtime/CAi.cpp @@ -1,6 +1,6 @@ #include "CAi.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/CAi.hpp b/Runtime/CAi.hpp index 328b94870..695a0a94f 100644 --- a/Runtime/CAi.hpp +++ b/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 -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__ diff --git a/Runtime/CArchitectureMessage.hpp b/Runtime/CArchitectureMessage.hpp index e9f9a335d..5c23f8047 100644 --- a/Runtime/CArchitectureMessage.hpp +++ b/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__ diff --git a/Runtime/CArchitectureQueue.hpp b/Runtime/CArchitectureQueue.hpp index 0d53833cf..e716b0e78 100644 --- a/Runtime/CArchitectureQueue.hpp +++ b/Runtime/CArchitectureQueue.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CARCHITECTUREQUEUE_HPP__ -#define __RETRO_CARCHITECTUREQUEUE_HPP__ +#ifndef __PSHAG_CARCHITECTUREQUEUE_HPP__ +#define __PSHAG_CARCHITECTUREQUEUE_HPP__ #include #include "CArchitectureMessage.hpp" -namespace Retro +namespace pshag { class CArchitectureQueue @@ -27,4 +27,4 @@ public: } -#endif // __RETRO_CARCHITECTUREQUEUE_HPP__ +#endif // __PSHAG_CARCHITECTUREQUEUE_HPP__ diff --git a/Runtime/CAreaOctTree.hpp b/Runtime/CAreaOctTree.hpp index b06f0d772..b11c58b4b 100644 --- a/Runtime/CAreaOctTree.hpp +++ b/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__ diff --git a/Runtime/CBasics.hpp b/Runtime/CBasics.hpp index 461e010f6..0fb858c0c 100644 --- a/Runtime/CBasics.hpp +++ b/Runtime/CBasics.hpp @@ -1,12 +1,12 @@ -#ifndef __RETRO_CBASICS_HPP__ -#define __RETRO_CBASICS_HPP__ +#ifndef __PSHAG_CBASICS_HPP__ +#define __PSHAG_CBASICS_HPP__ #include #include #include "RetroTypes.hpp" -namespace Retro +namespace pshag { class CBasics @@ -18,4 +18,4 @@ public: } -#endif // __RETRO_CBASICS_HPP__ +#endif // __PSHAG_CBASICS_HPP__ diff --git a/Runtime/CBasicsPC.cpp b/Runtime/CBasicsPC.cpp index 3343d6fe6..b60cc2fd7 100644 --- a/Runtime/CBasicsPC.cpp +++ b/Runtime/CBasicsPC.cpp @@ -3,7 +3,7 @@ #include "CBasics.hpp" -namespace Retro +namespace pshag { void CBasics::Init() diff --git a/Runtime/CCRC32.cpp b/Runtime/CCRC32.cpp index fdcf3aff4..66ede7ae3 100644 --- a/Runtime/CCRC32.cpp +++ b/Runtime/CCRC32.cpp @@ -1,6 +1,6 @@ #include "CCRC32.hpp" -namespace Retro +namespace pshag { const uint32_t CCRC32::crc32Table[256] = diff --git a/Runtime/CCRC32.hpp b/Runtime/CCRC32.hpp index 066365d4a..a93898289 100644 --- a/Runtime/CCRC32.hpp +++ b/Runtime/CCRC32.hpp @@ -2,7 +2,7 @@ #define RETRO_CRC32_HPP #include -namespace Retro +namespace pshag { class CCRC32 diff --git a/Runtime/CCallStack.hpp b/Runtime/CCallStack.hpp index daa28ac49..52745d9e1 100644 --- a/Runtime/CCallStack.hpp +++ b/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__ diff --git a/Runtime/CDvdFile.hpp b/Runtime/CDvdFile.hpp index 9a222bf2f..35d3dcc47 100644 --- a/Runtime/CDvdFile.hpp +++ b/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__ diff --git a/Runtime/CDvdRequest.hpp b/Runtime/CDvdRequest.hpp index d1d04ed89..c5a61d42d 100644 --- a/Runtime/CDvdRequest.hpp +++ b/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__ diff --git a/Runtime/CEntity.cpp b/Runtime/CEntity.cpp index 47726349f..1e6d6cfcc 100644 --- a/Runtime/CEntity.cpp +++ b/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) diff --git a/Runtime/CEntity.hpp b/Runtime/CEntity.hpp index cd4de1846..cb993cef6 100644 --- a/Runtime/CEntity.hpp +++ b/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__ diff --git a/Runtime/CFactoryMgr.hpp b/Runtime/CFactoryMgr.hpp index eace220bc..329ef6514 100644 --- a/Runtime/CFactoryMgr.hpp +++ b/Runtime/CFactoryMgr.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CFACTORYMGR_HPP__ -#define __RETRO_CFACTORYMGR_HPP__ +#ifndef __PSHAG_CFACTORYMGR_HPP__ +#define __PSHAG_CFACTORYMGR_HPP__ #include #include "RetroTypes.hpp" -namespace Retro +namespace pshag { class SObjectTag; class CVParamTransfer; @@ -25,4 +25,4 @@ public: } -#endif // __RETRO_CFACTORYMGR_HPP__ +#endif // __PSHAG_CFACTORYMGR_HPP__ diff --git a/Runtime/CGameAllocator.cpp b/Runtime/CGameAllocator.cpp index 4f04aa1e9..72ee5609e 100644 --- a/Runtime/CGameAllocator.cpp +++ b/Runtime/CGameAllocator.cpp @@ -1,6 +1,6 @@ #include "CGameAllocator.hpp" -namespace Retro +namespace pshag { LogVisor::LogModule AllocLog("CGameAllocator"); diff --git a/Runtime/CGameAllocator.hpp b/Runtime/CGameAllocator.hpp index 1410f0fcd..7b34f7b40 100644 --- a/Runtime/CGameAllocator.hpp +++ b/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__ diff --git a/Runtime/CGameDebug.hpp b/Runtime/CGameDebug.hpp index 6f6857b89..ddd1291ca 100644 --- a/Runtime/CGameDebug.hpp +++ b/Runtime/CGameDebug.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CGAMEDEBUG_HPP__ -#define __RETRO_CGAMEDEBUG_HPP__ +#ifndef __PSHAG_CGAMEDEBUG_HPP__ +#define __PSHAG_CGAMEDEBUG_HPP__ #include -namespace Retro +namespace pshag { class CFinalInput; @@ -53,4 +53,4 @@ public: } -#endif // __RETRO_CGAMEDEBUG_HPP__ +#endif // __PSHAG_CGAMEDEBUG_HPP__ diff --git a/Runtime/CGameOptions.cpp b/Runtime/CGameOptions.cpp index 670c53b15..53b9f896e 100644 --- a/Runtime/CGameOptions.cpp +++ b/Runtime/CGameOptions.cpp @@ -1,6 +1,6 @@ #include "CGameOptions.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/CGameOptions.hpp b/Runtime/CGameOptions.hpp index 4b45af75c..ac4ecb0a3 100644 --- a/Runtime/CGameOptions.hpp +++ b/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__ diff --git a/Runtime/CGameState.cpp b/Runtime/CGameState.cpp index 330a6c664..0a439d995 100644 --- a/Runtime/CGameState.cpp +++ b/Runtime/CGameState.cpp @@ -1,7 +1,7 @@ #include "CGameState.hpp" #include "IOStreams.hpp" -namespace Retro +namespace pshag { CGameState::CGameState(CInputStream& stream) diff --git a/Runtime/CGameState.hpp b/Runtime/CGameState.hpp index f1cf71a63..fbda569d2 100644 --- a/Runtime/CGameState.hpp +++ b/Runtime/CGameState.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CGAMESTATE_HPP__ -#define __RETRO_CGAMESTATE_HPP__ +#ifndef __PSHAG_CGAMESTATE_HPP__ +#define __PSHAG_CGAMESTATE_HPP__ #include #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__ diff --git a/Runtime/CGraphics.cpp b/Runtime/CGraphics.cpp index d617eba33..d7b8b2843 100644 --- a/Runtime/CGraphics.cpp +++ b/Runtime/CGraphics.cpp @@ -1,7 +1,7 @@ #include "CGraphics.hpp" #include -namespace Retro +namespace pshag { u32 CGraphics::g_NumLightsActive = 0; diff --git a/Runtime/CGraphics.hpp b/Runtime/CGraphics.hpp index e15448607..d7cdd0ffd 100644 --- a/Runtime/CGraphics.hpp +++ b/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__ diff --git a/Runtime/CIOWin.hpp b/Runtime/CIOWin.hpp index 8c99165f9..daa18b1b0 100644 --- a/Runtime/CIOWin.hpp +++ b/Runtime/CIOWin.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CIOWIN_HPP__ -#define __RETRO_CIOWIN_HPP__ +#ifndef __PSHAG_CIOWIN_HPP__ +#define __PSHAG_CIOWIN_HPP__ #include #include -namespace Retro +namespace pshag { class CArchitectureMessage; class CArchitectureQueue; @@ -38,4 +38,4 @@ static bool operator==(std::shared_ptr a, std::shared_ptr b) } -#endif // __RETRO_CIOWIN_HPP__ +#endif // __PSHAG_CIOWIN_HPP__ diff --git a/Runtime/CIOWinManager.cpp b/Runtime/CIOWinManager.cpp index 676b26033..6dd443558 100644 --- a/Runtime/CIOWinManager.cpp +++ b/Runtime/CIOWinManager.cpp @@ -2,7 +2,7 @@ #include "CArchitectureMessage.hpp" #include "CIOWin.hpp" -namespace Retro +namespace pshag { bool CIOWinManager::OnIOWinMessage(const CArchitectureMessage& msg) diff --git a/Runtime/CIOWinManager.hpp b/Runtime/CIOWinManager.hpp index 95a2ac05b..f91508b9e 100644 --- a/Runtime/CIOWinManager.hpp +++ b/Runtime/CIOWinManager.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CIOWINMANAGER_HPP__ -#define __RETRO_CIOWINMANAGER_HPP__ +#ifndef __PSHAG_CIOWINMANAGER_HPP__ +#define __PSHAG_CIOWINMANAGER_HPP__ #include #include @@ -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__ diff --git a/Runtime/CInGameTweakManagerBase.hpp b/Runtime/CInGameTweakManagerBase.hpp index c5c225186..0fbbdd1a8 100644 --- a/Runtime/CInGameTweakManagerBase.hpp +++ b/Runtime/CInGameTweakManagerBase.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CINGAMETWEAKMANAGERBASE_HPP__ -#define __RETRO_CINGAMETWEAKMANAGERBASE_HPP__ +#ifndef __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__ +#define __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__ #include -namespace Retro +namespace pshag { class CInGameTweakManagerBase @@ -17,4 +17,4 @@ public: } -#endif // __RETRO_CINGAMETWEAKMANAGERBASE_HPP__ +#endif // __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__ diff --git a/Runtime/CLight.cpp b/Runtime/CLight.cpp index 7e64f9f9b..754e5ea5a 100644 --- a/Runtime/CLight.cpp +++ b/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) diff --git a/Runtime/CLight.hpp b/Runtime/CLight.hpp index c6422bb9e..21fa3ae4c 100644 --- a/Runtime/CLight.hpp +++ b/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__ diff --git a/Runtime/CMFGameBase.hpp b/Runtime/CMFGameBase.hpp index 4da1871e4..df80c7236 100644 --- a/Runtime/CMFGameBase.hpp +++ b/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__ diff --git a/Runtime/CMainFlowBase.cpp b/Runtime/CMainFlowBase.cpp index e62545dc2..70e46cf18 100644 --- a/Runtime/CMainFlowBase.cpp +++ b/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) diff --git a/Runtime/CMainFlowBase.hpp b/Runtime/CMainFlowBase.hpp index 18a8f8aa4..33dd1b365 100644 --- a/Runtime/CMainFlowBase.hpp +++ b/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__ diff --git a/Runtime/CMapWorldInfo.cpp b/Runtime/CMapWorldInfo.cpp index e32711379..287017d42 100644 --- a/Runtime/CMapWorldInfo.cpp +++ b/Runtime/CMapWorldInfo.cpp @@ -1,6 +1,6 @@ #include "CMapWorldInfo.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/CMapWorldInfo.hpp b/Runtime/CMapWorldInfo.hpp index 47b114841..ef1f28fc4 100644 --- a/Runtime/CMapWorldInfo.hpp +++ b/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__ diff --git a/Runtime/CMemory.cpp b/Runtime/CMemory.cpp index cda74750c..5119f6362 100644 --- a/Runtime/CMemory.cpp +++ b/Runtime/CMemory.cpp @@ -3,7 +3,7 @@ #include "CCallStack.hpp" #include -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); } diff --git a/Runtime/CMemory.hpp b/Runtime/CMemory.hpp index 9ec951c0d..dfa7b0ebb 100644 --- a/Runtime/CMemory.hpp +++ b/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__ diff --git a/Runtime/CMemoryCardSys.hpp b/Runtime/CMemoryCardSys.hpp index 1c184ee90..573bad273 100644 --- a/Runtime/CMemoryCardSys.hpp +++ b/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__ diff --git a/Runtime/CMemoryCardSysNix.cpp b/Runtime/CMemoryCardSysNix.cpp index af1b17df2..55236aa6a 100644 --- a/Runtime/CMemoryCardSysNix.cpp +++ b/Runtime/CMemoryCardSysNix.cpp @@ -1,6 +1,6 @@ #include "CMemoryCardSys.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/CModel.hpp b/Runtime/CModel.hpp index 0d1d5fe0b..839a72c60 100644 --- a/Runtime/CModel.hpp +++ b/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__ diff --git a/Runtime/CModelBoo.cpp b/Runtime/CModelBoo.cpp index 9c0a9ea1a..16f87e2d7 100644 --- a/Runtime/CModelBoo.cpp +++ b/Runtime/CModelBoo.cpp @@ -1,6 +1,6 @@ #include "CModel.hpp" -namespace Retro +namespace pshag { void CModel::Draw(const CModelFlags& flags) const diff --git a/Runtime/CMoviePlayer.cpp b/Runtime/CMoviePlayer.cpp index ce1ce135c..10ba6cebd 100644 --- a/Runtime/CMoviePlayer.cpp +++ b/Runtime/CMoviePlayer.cpp @@ -1,6 +1,6 @@ #include "CMoviePlayer.hpp" -namespace Retro +namespace pshag { CMoviePlayer::CMoviePlayer(const char* path, float startTime, bool flag) diff --git a/Runtime/CMoviePlayer.hpp b/Runtime/CMoviePlayer.hpp index a6d916cde..81c52211b 100644 --- a/Runtime/CMoviePlayer.hpp +++ b/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__ diff --git a/Runtime/CNODDvdRequest.cpp b/Runtime/CNODDvdRequest.cpp index 2c5f67a08..0bc6e20b0 100644 --- a/Runtime/CNODDvdRequest.cpp +++ b/Runtime/CNODDvdRequest.cpp @@ -1,6 +1,6 @@ #include "CDvdRequest.hpp" -namespace Retro +namespace pshag { void CNODDvdRequest::WaitUntilComplete() diff --git a/Runtime/CObjectList.hpp b/Runtime/CObjectList.hpp index a29274d80..1ae178b22 100644 --- a/Runtime/CObjectList.hpp +++ b/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__ diff --git a/Runtime/CPakFile.hpp b/Runtime/CPakFile.hpp index 042599fac..3c06a5334 100644 --- a/Runtime/CPakFile.hpp +++ b/Runtime/CPakFile.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CPAKFILE_HPP__ -#define __RETRO_CPAKFILE_HPP__ +#ifndef __PSHAG_CPAKFILE_HPP__ +#define __PSHAG_CPAKFILE_HPP__ #include #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__ diff --git a/Runtime/CPhysicsActor.hpp b/Runtime/CPhysicsActor.hpp index 1a556bbb8..b3e240796 100644 --- a/Runtime/CPhysicsActor.hpp +++ b/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__ diff --git a/Runtime/CPlayMovieBase.hpp b/Runtime/CPlayMovieBase.hpp index b7c264f59..492f29c78 100644 --- a/Runtime/CPlayMovieBase.hpp +++ b/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__ diff --git a/Runtime/CPlayerState.cpp b/Runtime/CPlayerState.cpp index 74e7afe11..12a01321f 100644 --- a/Runtime/CPlayerState.cpp +++ b/Runtime/CPlayerState.cpp @@ -1,6 +1,6 @@ #include "CPlayerState.hpp" -namespace Retro +namespace pshag { CPlayerState::CPlayerState(CInputStream& stream) diff --git a/Runtime/CPlayerState.hpp b/Runtime/CPlayerState.hpp index a8b911b32..63d4d8ed9 100644 --- a/Runtime/CPlayerState.hpp +++ b/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__ diff --git a/Runtime/CRandom16.cpp b/Runtime/CRandom16.cpp index 5f61e848e..4df415592 100644 --- a/Runtime/CRandom16.cpp +++ b/Runtime/CRandom16.cpp @@ -1,6 +1,6 @@ #include "CRandom16.hpp" -namespace Retro +namespace pshag { CRandom16* CRandom16::g_randomNumber = nullptr; diff --git a/Runtime/CRandom16.hpp b/Runtime/CRandom16.hpp index 74a137ced..0b4497ebb 100644 --- a/Runtime/CRandom16.hpp +++ b/Runtime/CRandom16.hpp @@ -3,7 +3,7 @@ #include "GCNTypes.hpp" -namespace Retro +namespace pshag { diff --git a/Runtime/CResFactory.cpp b/Runtime/CResFactory.cpp index 9d74e5408..f385cfc70 100644 --- a/Runtime/CResFactory.cpp +++ b/Runtime/CResFactory.cpp @@ -1,7 +1,7 @@ #include "CResFactory.hpp" #include "IObj.hpp" -namespace Retro +namespace pshag { std::unique_ptr CResFactory::Build(const SObjectTag&, const CVParamTransfer&) diff --git a/Runtime/CResFactory.hpp b/Runtime/CResFactory.hpp index ce11e1b26..95bcaefb0 100644 --- a/Runtime/CResFactory.hpp +++ b/Runtime/CResFactory.hpp @@ -1,12 +1,12 @@ -#ifndef __RETRO_CRESFACTORY_HPP__ -#define __RETRO_CRESFACTORY_HPP__ +#ifndef __PSHAG_CRESFACTORY_HPP__ +#define __PSHAG_CRESFACTORY_HPP__ #include #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__ diff --git a/Runtime/CResLoader.cpp b/Runtime/CResLoader.cpp index 16c69bd40..3001f876d 100644 --- a/Runtime/CResLoader.cpp +++ b/Runtime/CResLoader.cpp @@ -3,7 +3,7 @@ #include "CMemory.hpp" #include "CCallStack.hpp" -namespace Retro +namespace pshag { const std::vector* CResLoader::GetTagListForFile(const std::string& name) const diff --git a/Runtime/CResLoader.hpp b/Runtime/CResLoader.hpp index 2d8169234..33f1cce97 100644 --- a/Runtime/CResLoader.hpp +++ b/Runtime/CResLoader.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CRESLOADER_HPP__ -#define __RETRO_CRESLOADER_HPP__ +#ifndef __PSHAG_CRESLOADER_HPP__ +#define __PSHAG_CRESLOADER_HPP__ #include #include @@ -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__ diff --git a/Runtime/CScriptMailbox.cpp b/Runtime/CScriptMailbox.cpp index cf85137bb..15e78d82c 100644 --- a/Runtime/CScriptMailbox.cpp +++ b/Runtime/CScriptMailbox.cpp @@ -1,6 +1,6 @@ #include "CScriptMailbox.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/CScriptMailbox.hpp b/Runtime/CScriptMailbox.hpp index 0ff730b54..2e172c65b 100644 --- a/Runtime/CScriptMailbox.hpp +++ b/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__ diff --git a/Runtime/CSimplePool.cpp b/Runtime/CSimplePool.cpp index 0d25736e1..9409a9dba 100644 --- a/Runtime/CSimplePool.cpp +++ b/Runtime/CSimplePool.cpp @@ -2,7 +2,7 @@ #include "IVParamObj.hpp" #include "CToken.hpp" -namespace Retro +namespace pshag { CSimplePool::CSimplePool(IFactory& factory) diff --git a/Runtime/CSimplePool.hpp b/Runtime/CSimplePool.hpp index 7a8ac3293..f69c99eca 100644 --- a/Runtime/CSimplePool.hpp +++ b/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 -namespace Retro +namespace pshag { class IFactory; class CObjectReference; @@ -32,4 +32,4 @@ public: } -#endif // __RETRO_CSIMPLEPOOL_HPP__ +#endif // __PSHAG_CSIMPLEPOOL_HPP__ diff --git a/Runtime/CStateManager.cpp b/Runtime/CStateManager.cpp index 31efef2bc..7d18440ae 100644 --- a/Runtime/CStateManager.cpp +++ b/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) diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp index a268c57bf..bb76e4295 100644 --- a/Runtime/CStateManager.hpp +++ b/Runtime/CStateManager.hpp @@ -1,11 +1,11 @@ -#ifndef __RETRO_CSTATEMANAGER_HPP__ -#define __RETRO_CSTATEMANAGER_HPP__ +#ifndef __PSHAG_CSTATEMANAGER_HPP__ +#define __PSHAG_CSTATEMANAGER_HPP__ #include #include "CBasics.hpp" #include "ScriptObjectSupport.hpp" -namespace Retro +namespace pshag { class CScriptMailbox; class CMapWorldInfo; diff --git a/Runtime/CStaticInterference.hpp b/Runtime/CStaticInterference.hpp index ff6455a9a..3d3ff54d5 100644 --- a/Runtime/CStaticInterference.hpp +++ b/Runtime/CStaticInterference.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CSTATICINTERFERENCE_HPP__ -#define __RETRO_CSTATICINTERFERENCE_HPP__ +#ifndef __PSHAG_CSTATICINTERFERENCE_HPP__ +#define __PSHAG_CSTATICINTERFERENCE_HPP__ #include #include "RetroTypes.hpp" -namespace Retro +namespace pshag { class CStateManager; @@ -72,4 +72,4 @@ public: } -#endif // __RETRO_CSTATICINTERFERENCE_HPP__ +#endif // __PSHAG_CSTATICINTERFERENCE_HPP__ diff --git a/Runtime/CStringExtras.hpp b/Runtime/CStringExtras.hpp index cf14a9e0b..814dc0676 100644 --- a/Runtime/CStringExtras.hpp +++ b/Runtime/CStringExtras.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CSTRINGEXTRAS_HPP__ -#define __RETRO_CSTRINGEXTRAS_HPP__ +#ifndef __PSHAG_CSTRINGEXTRAS_HPP__ +#define __PSHAG_CSTRINGEXTRAS_HPP__ #include #include -namespace Retro +namespace pshag { class CStringExtras @@ -26,4 +26,4 @@ public: } -#endif // __RETRO_CSTRINGEXTRAS_HPP__ +#endif // __PSHAG_CSTRINGEXTRAS_HPP__ diff --git a/Runtime/CTexture.cpp b/Runtime/CTexture.cpp index fa98d8458..fca85c639 100644 --- a/Runtime/CTexture.cpp +++ b/Runtime/CTexture.cpp @@ -1,6 +1,6 @@ #include "CTexture.hpp" -namespace Retro +namespace pshag { void CTexture::Load(int slot, EClampMode clamp) diff --git a/Runtime/CTexture.hpp b/Runtime/CTexture.hpp index 83fc736a0..896e8f855 100644 --- a/Runtime/CTexture.hpp +++ b/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__ diff --git a/Runtime/CTimeProvider.cpp b/Runtime/CTimeProvider.cpp index 77e469eb0..7642c91b8 100644 --- a/Runtime/CTimeProvider.cpp +++ b/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) diff --git a/Runtime/CTimeProvider.hpp b/Runtime/CTimeProvider.hpp index f1f2d9349..b72e8d7e0 100644 --- a/Runtime/CTimeProvider.hpp +++ b/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 diff --git a/Runtime/CToken.hpp b/Runtime/CToken.hpp index ddf06c4ad..06d7ca8ff 100644 --- a/Runtime/CToken.hpp +++ b/Runtime/CToken.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CTOKEN_HPP__ -#define __RETRO_CTOKEN_HPP__ +#ifndef __PSHAG_CTOKEN_HPP__ +#define __PSHAG_CTOKEN_HPP__ #include #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__ diff --git a/Runtime/CWorldTransManager.cpp b/Runtime/CWorldTransManager.cpp index 730a4aa46..2826e0f10 100644 --- a/Runtime/CWorldTransManager.cpp +++ b/Runtime/CWorldTransManager.cpp @@ -1,6 +1,6 @@ #include "CWorldTransManager.hpp" -namespace Retro +namespace pshag { void CWorldTransManager::DrawEnabled() const diff --git a/Runtime/CWorldTransManager.hpp b/Runtime/CWorldTransManager.hpp index 1c84b3b86..ffd09c207 100644 --- a/Runtime/CWorldTransManager.hpp +++ b/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__ diff --git a/Runtime/Character/CAnimData.hpp b/Runtime/Character/CAnimData.hpp index 843959698..7a9362b30 100644 --- a/Runtime/Character/CAnimData.hpp +++ b/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__ diff --git a/Runtime/Character/CAnimationDatabase.hpp b/Runtime/Character/CAnimationDatabase.hpp index c2206d203..e84f0fcd9 100644 --- a/Runtime/Character/CAnimationDatabase.hpp +++ b/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 #include #include -namespace Retro +namespace pshag { class IMetaAnim; class CPrimitive; @@ -23,4 +23,4 @@ public: } -#endif // __RETRO_CANIMATIONDATABASE_HPP__ +#endif // __PSHAG_CANIMATIONDATABASE_HPP__ diff --git a/Runtime/Character/CAnimationDatabaseGame.hpp b/Runtime/Character/CAnimationDatabaseGame.hpp index daa4c7283..acd3f77b6 100644 --- a/Runtime/Character/CAnimationDatabaseGame.hpp +++ b/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__ diff --git a/Runtime/Character/CAssetFactory.cpp b/Runtime/Character/CAssetFactory.cpp index 168008f31..2674d8da7 100644 --- a/Runtime/Character/CAssetFactory.cpp +++ b/Runtime/Character/CAssetFactory.cpp @@ -1,6 +1,6 @@ #include "CAssetFactory.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/Character/CAssetFactory.hpp b/Runtime/Character/CAssetFactory.hpp index 45abe89d3..77d80bc84 100644 --- a/Runtime/Character/CAssetFactory.hpp +++ b/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__ diff --git a/Runtime/Character/CCharAnimTime.hpp b/Runtime/Character/CCharAnimTime.hpp index 25cbe108e..83cb0b5f9 100644 --- a/Runtime/Character/CCharAnimTime.hpp +++ b/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__ diff --git a/Runtime/Character/CCharacterFactory.hpp b/Runtime/Character/CCharacterFactory.hpp index bb41255b4..484446da6 100644 --- a/Runtime/Character/CCharacterFactory.hpp +++ b/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__ diff --git a/Runtime/Character/CHierarchyPoseBuilder.hpp b/Runtime/Character/CHierarchyPoseBuilder.hpp index b16bd0bba..87706ca25 100644 --- a/Runtime/Character/CHierarchyPoseBuilder.hpp +++ b/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__ diff --git a/Runtime/Character/CTransitionDatabase.hpp b/Runtime/Character/CTransitionDatabase.hpp index bcea98430..5b54a912f 100644 --- a/Runtime/Character/CTransitionDatabase.hpp +++ b/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__ diff --git a/Runtime/Character/CTransitionDatabaseGame.hpp b/Runtime/Character/CTransitionDatabaseGame.hpp index dddae3218..468e594f8 100644 --- a/Runtime/Character/CTransitionDatabaseGame.hpp +++ b/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__ diff --git a/Runtime/Character/IMetaAnim.hpp b/Runtime/Character/IMetaAnim.hpp index 66778d723..e902e6456 100644 --- a/Runtime/Character/IMetaAnim.hpp +++ b/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__ diff --git a/Runtime/Character/IMetaTrans.hpp b/Runtime/Character/IMetaTrans.hpp index 810d4b147..05e1ec40d 100644 --- a/Runtime/Character/IMetaTrans.hpp +++ b/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__ diff --git a/Runtime/GCNTypes.hpp b/Runtime/GCNTypes.hpp index d8b7493dd..0e7fdfca0 100644 --- a/Runtime/GCNTypes.hpp +++ b/Runtime/GCNTypes.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_GCTYPES_HPP__ -#define __RETRO_GCTYPES_HPP__ +#ifndef __PSHAG_GCTYPES_HPP__ +#define __PSHAG_GCTYPES_HPP__ #include #include @@ -13,4 +13,4 @@ using u32 = uint32_t; using s64 = int64_t; using u64 = uint64_t; -#endif // __RETRO_GCTYPES_HPP__ +#endif // __PSHAG_GCTYPES_HPP__ diff --git a/Runtime/GameGlobalObjects.hpp b/Runtime/GameGlobalObjects.hpp index 3f02b08f5..cd009ccef 100644 --- a/Runtime/GameGlobalObjects.hpp +++ b/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__ diff --git a/Runtime/Graphics/CBooRenderer.hpp b/Runtime/Graphics/CBooRenderer.hpp index f71c2ba48..b9426b13e 100644 --- a/Runtime/Graphics/CBooRenderer.hpp +++ b/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__ diff --git a/Runtime/Graphics/CLight.hpp b/Runtime/Graphics/CLight.hpp index 2f81762fb..9ed5edac1 100644 --- a/Runtime/Graphics/CLight.hpp +++ b/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__ diff --git a/Runtime/Graphics/CMetroidModelInstance.hpp b/Runtime/Graphics/CMetroidModelInstance.hpp index 337803ee0..7906a7d3e 100644 --- a/Runtime/Graphics/CMetroidModelInstance.hpp +++ b/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__ diff --git a/Runtime/Graphics/IRenderer.hpp b/Runtime/Graphics/IRenderer.hpp index eb95bffdb..421b43078 100644 --- a/Runtime/Graphics/IRenderer.hpp +++ b/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 #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__ diff --git a/Runtime/GuiSys/CConsoleOutputWindow.hpp b/Runtime/GuiSys/CConsoleOutputWindow.hpp index 864fa9caf..53591bbbf 100644 --- a/Runtime/GuiSys/CConsoleOutputWindow.hpp +++ b/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__ diff --git a/Runtime/GuiSys/CGuiSys.hpp b/Runtime/GuiSys/CGuiSys.hpp index b00ddd383..fa36c97c9 100644 --- a/Runtime/GuiSys/CGuiSys.hpp +++ b/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__ diff --git a/Runtime/GuiSys/CSplashScreen.hpp b/Runtime/GuiSys/CSplashScreen.hpp index d33ccbd03..50994e114 100644 --- a/Runtime/GuiSys/CSplashScreen.hpp +++ b/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__ diff --git a/Runtime/IAllocator.cpp b/Runtime/IAllocator.cpp index 8d2b2d293..daa46b2a0 100644 --- a/Runtime/IAllocator.cpp +++ b/Runtime/IAllocator.cpp @@ -1,6 +1,6 @@ #include "IAllocator.hpp" -namespace Retro +namespace pshag { } diff --git a/Runtime/IAllocator.hpp b/Runtime/IAllocator.hpp index cd73962f4..a018b075b 100644 --- a/Runtime/IAllocator.hpp +++ b/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__ diff --git a/Runtime/IFactory.hpp b/Runtime/IFactory.hpp index f544e52d2..28c8a0364 100644 --- a/Runtime/IFactory.hpp +++ b/Runtime/IFactory.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_IFACTORY_HPP__ -#define __RETRO_IFACTORY_HPP__ +#ifndef __PSHAG_IFACTORY_HPP__ +#define __PSHAG_IFACTORY_HPP__ #include #include "RetroTypes.hpp" -namespace Retro +namespace pshag { class CVParamTransfer; class IObj; @@ -22,4 +22,4 @@ public: } -#endif // __RETRO_IFACTORY_HPP__ +#endif // __PSHAG_IFACTORY_HPP__ diff --git a/Runtime/IOStreams.cpp b/Runtime/IOStreams.cpp index 7cb895dea..d10bb427f 100644 --- a/Runtime/IOStreams.cpp +++ b/Runtime/IOStreams.cpp @@ -1,7 +1,7 @@ #include "IOStreams.hpp" #include "CMemory.hpp" -namespace Retro +namespace pshag { class CZipSupport diff --git a/Runtime/IOStreams.hpp b/Runtime/IOStreams.hpp index d58b8fd65..72b50af32 100644 --- a/Runtime/IOStreams.hpp +++ b/Runtime/IOStreams.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_IOSTREAMS_HPP__ -#define __RETRO_IOSTREAMS_HPP__ +#ifndef __PSHAG_IOSTREAMS_HPP__ +#define __PSHAG_IOSTREAMS_HPP__ #include "RetroTypes.hpp" #include @@ -7,7 +7,7 @@ #include #include -namespace Retro +namespace pshag { using CInputStream = Athena::io::IStreamReader; @@ -31,4 +31,4 @@ public: } -#endif // __RETRO_IOSTREAMS_HPP__ +#endif // __PSHAG_IOSTREAMS_HPP__ diff --git a/Runtime/IObj.hpp b/Runtime/IObj.hpp index 90fd7129b..76f831ea8 100644 --- a/Runtime/IObj.hpp +++ b/Runtime/IObj.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_IOBJ_HPP__ -#define __RETRO_IOBJ_HPP__ +#ifndef __PSHAG_IOBJ_HPP__ +#define __PSHAG_IOBJ_HPP__ #include "RetroTypes.hpp" -namespace Retro +namespace pshag { class IObj @@ -35,4 +35,4 @@ public: } -#endif // __RETRO_IOBJ_HPP__ +#endif // __PSHAG_IOBJ_HPP__ diff --git a/Runtime/IObjectStore.hpp b/Runtime/IObjectStore.hpp index eeff0d706..d9dc3f138 100644 --- a/Runtime/IObjectStore.hpp +++ b/Runtime/IObjectStore.hpp @@ -1,7 +1,7 @@ -#ifndef __RETRO_IOBJECTSTORE_HPP__ -#define __RETRO_IOBJECTSTORE_HPP__ +#ifndef __PSHAG_IOBJECTSTORE_HPP__ +#define __PSHAG_IOBJECTSTORE_HPP__ -namespace Retro +namespace pshag { struct SObjectTag; class CVParamTransfer; @@ -24,4 +24,4 @@ public: } -#endif // __RETRO_IOBJECTSTORE_HPP__ +#endif // __PSHAG_IOBJECTSTORE_HPP__ diff --git a/Runtime/IVParamObj.hpp b/Runtime/IVParamObj.hpp index b673e93d7..325dfe7e1 100644 --- a/Runtime/IVParamObj.hpp +++ b/Runtime/IVParamObj.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_IVPARAMOBJ_HPP__ -#define __RETRO_IVPARAMOBJ_HPP__ +#ifndef __PSHAG_IVPARAMOBJ_HPP__ +#define __PSHAG_IVPARAMOBJ_HPP__ #include #include "IObj.hpp" -namespace Retro +namespace pshag { class IVParamObj : public IObj @@ -39,4 +39,4 @@ public: } -#endif // __RETRO_IVPARAMOBJ_HPP__ +#endif // __PSHAG_IVPARAMOBJ_HPP__ diff --git a/Runtime/Input/CFinalInput.cpp b/Runtime/Input/CFinalInput.cpp index 6bb3175cc..a36bae0fa 100644 --- a/Runtime/Input/CFinalInput.cpp +++ b/Runtime/Input/CFinalInput.cpp @@ -1,7 +1,7 @@ #include #include "CFinalInput.hpp" -namespace Retro +namespace pshag { CFinalInput::CFinalInput() diff --git a/Runtime/Input/CFinalInput.hpp b/Runtime/Input/CFinalInput.hpp index 2b4adb13d..ca882fa7c 100644 --- a/Runtime/Input/CFinalInput.hpp +++ b/Runtime/Input/CFinalInput.hpp @@ -1,11 +1,11 @@ -#ifndef __RETRO_CFINALINPUT_HPP__ -#define __RETRO_CFINALINPUT_HPP__ +#ifndef __PSHAG_CFINALINPUT_HPP__ +#define __PSHAG_CFINALINPUT_HPP__ #include "../RetroTypes.hpp" #include "CKeyboardMouseController.hpp" #include -namespace Retro +namespace pshag { class CFinalInput @@ -143,4 +143,4 @@ public: } -#endif // __RETRO_CFINALINPUT_HPP__ +#endif // __PSHAG_CFINALINPUT_HPP__ diff --git a/Runtime/Input/CInputGenerator.cpp b/Runtime/Input/CInputGenerator.cpp index 8ee7dec71..cd1abd8c7 100644 --- a/Runtime/Input/CInputGenerator.cpp +++ b/Runtime/Input/CInputGenerator.cpp @@ -2,7 +2,7 @@ #include "../CArchitectureMessage.hpp" #include "../CArchitectureQueue.hpp" -namespace Retro +namespace pshag { void CInputGenerator::Update(float dt, CArchitectureQueue& queue) diff --git a/Runtime/Input/CInputGenerator.hpp b/Runtime/Input/CInputGenerator.hpp index 914c23c39..3dc3bdeb4 100644 --- a/Runtime/Input/CInputGenerator.hpp +++ b/Runtime/Input/CInputGenerator.hpp @@ -1,12 +1,12 @@ -#ifndef __RETRO_CINPUTGENERATOR_HPP__ -#define __RETRO_CINPUTGENERATOR_HPP__ +#ifndef __PSHAG_CINPUTGENERATOR_HPP__ +#define __PSHAG_CINPUTGENERATOR_HPP__ #include #include #include "CFinalInput.hpp" #include "CKeyboardMouseController.hpp" -namespace Retro +namespace pshag { class CArchitectureQueue; @@ -181,4 +181,4 @@ public: } -#endif // __RETRO_CINPUTGENERATOR_HPP__ +#endif // __PSHAG_CINPUTGENERATOR_HPP__ diff --git a/Runtime/Input/CKeyboardMouseController.hpp b/Runtime/Input/CKeyboardMouseController.hpp index 670225ce6..01711f440 100644 --- a/Runtime/Input/CKeyboardMouseController.hpp +++ b/Runtime/Input/CKeyboardMouseController.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CKEYBOARDMOUSECONTROLLER_HPP__ -#define __RETRO_CKEYBOARDMOUSECONTROLLER_HPP__ +#ifndef __PSHAG_CKEYBOARDMOUSECONTROLLER_HPP__ +#define __PSHAG_CKEYBOARDMOUSECONTROLLER_HPP__ #include -namespace Retro +namespace pshag { struct CKeyboardMouseControllerData @@ -18,4 +18,4 @@ struct CKeyboardMouseControllerData } -#endif // __RETRO_CKEYBOARDMOUSECONTROLLER_HPP__ +#endif // __PSHAG_CKEYBOARDMOUSECONTROLLER_HPP__ diff --git a/Runtime/Input/ControlMapper.cpp b/Runtime/Input/ControlMapper.cpp index 1c96d88bd..d749b843a 100644 --- a/Runtime/Input/ControlMapper.cpp +++ b/Runtime/Input/ControlMapper.cpp @@ -4,7 +4,7 @@ #include "DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp" #include "../GameGlobalObjects.hpp" -namespace Retro +namespace pshag { static const char* skCommandDescs[] = diff --git a/Runtime/Input/ControlMapper.hpp b/Runtime/Input/ControlMapper.hpp index 63a30db86..473f64215 100644 --- a/Runtime/Input/ControlMapper.hpp +++ b/Runtime/Input/ControlMapper.hpp @@ -1,7 +1,7 @@ -#ifndef __RETRO_CCONTROLMAPPER_HPP__ -#define __RETRO_CCONTROLMAPPER_HPP__ +#ifndef __PSHAG_CCONTROLMAPPER_HPP__ +#define __PSHAG_CCONTROLMAPPER_HPP__ -namespace Retro +namespace pshag { class CFinalInput; @@ -112,4 +112,4 @@ public: } -#endif // __RETRO_CCONTROLMAPPER_HPP__ +#endif // __PSHAG_CCONTROLMAPPER_HPP__ diff --git a/Runtime/Input/IController.hpp b/Runtime/Input/IController.hpp index dd7274af8..b56cc4baa 100644 --- a/Runtime/Input/IController.hpp +++ b/Runtime/Input/IController.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_ICONTROLLER_HPP__ -#define __RETRO_ICONTROLLER_HPP__ +#ifndef __PSHAG_ICONTROLLER_HPP__ +#define __PSHAG_ICONTROLLER_HPP__ #include "../RetroTypes.hpp" -namespace Retro +namespace pshag { class IController @@ -21,4 +21,4 @@ public: } -#endif // __RETRO_ICONTROLLER_HPP__ +#endif // __PSHAG_ICONTROLLER_HPP__ diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp index fe8e1fd35..6325c1f8b 100644 --- a/Runtime/MP1/CFrontEndUI.cpp +++ b/Runtime/MP1/CFrontEndUI.cpp @@ -1,6 +1,6 @@ #include "CFrontEndUI.hpp" -namespace Retro +namespace pshag { namespace MP1 { diff --git a/Runtime/MP1/CFrontEndUI.hpp b/Runtime/MP1/CFrontEndUI.hpp index 30d3c6f52..84f08065b 100644 --- a/Runtime/MP1/CFrontEndUI.hpp +++ b/Runtime/MP1/CFrontEndUI.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CFRONTENDUI_HPP__ -#define __RETRO_CFRONTENDUI_HPP__ +#ifndef __PSHAG_CFRONTENDUI_HPP__ +#define __PSHAG_CFRONTENDUI_HPP__ #include "CIOWin.hpp" #include "CGameDebug.hpp" -namespace Retro +namespace pshag { class CGuiSliderGroup; class CGuiTableGroup; @@ -56,4 +56,4 @@ public: } } -#endif // __RETRO_CFRONTENDUI_HPP__ +#endif // __PSHAG_CFRONTENDUI_HPP__ diff --git a/Runtime/MP1/CInGameTweakManager.hpp b/Runtime/MP1/CInGameTweakManager.hpp index 6be467118..c66e50bcb 100644 --- a/Runtime/MP1/CInGameTweakManager.hpp +++ b/Runtime/MP1/CInGameTweakManager.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CINGAMETWEAKMANAGER_HPP__ -#define __RETRO_CINGAMETWEAKMANAGER_HPP__ +#ifndef __PSHAG_CINGAMETWEAKMANAGER_HPP__ +#define __PSHAG_CINGAMETWEAKMANAGER_HPP__ #include "CInGameTweakManagerBase.hpp" -namespace Retro +namespace pshag { namespace MP1 { @@ -17,4 +17,4 @@ public: } } -#endif // __RETRO_CINGAMETWEAKMANAGER_HPP__ +#endif // __PSHAG_CINGAMETWEAKMANAGER_HPP__ diff --git a/Runtime/MP1/CMFGame.cpp b/Runtime/MP1/CMFGame.cpp index d8439a4d2..3d0a78f74 100644 --- a/Runtime/MP1/CMFGame.cpp +++ b/Runtime/MP1/CMFGame.cpp @@ -3,7 +3,7 @@ #include "GameGlobalObjects.hpp" #include "CGameState.hpp" -namespace Retro +namespace pshag { namespace MP1 { diff --git a/Runtime/MP1/CMFGame.hpp b/Runtime/MP1/CMFGame.hpp index 548c0e388..4dee0c197 100644 --- a/Runtime/MP1/CMFGame.hpp +++ b/Runtime/MP1/CMFGame.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CMFGAME_HPP__ -#define __RETRO_CMFGAME_HPP__ +#ifndef __PSHAG_CMFGAME_HPP__ +#define __PSHAG_CMFGAME_HPP__ #include "CMFGameBase.hpp" -namespace Retro +namespace pshag { namespace MP1 { @@ -27,4 +27,4 @@ public: } } -#endif // __RETRO_CMFGAME_HPP__ +#endif // __PSHAG_CMFGAME_HPP__ diff --git a/Runtime/MP1/CMain.hpp b/Runtime/MP1/CMain.hpp index ec3d928c4..e77009869 100644 --- a/Runtime/MP1/CMain.hpp +++ b/Runtime/MP1/CMain.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CMAIN_HPP__ -#define __RETRO_CMAIN_HPP__ +#ifndef __PSHAG_CMAIN_HPP__ +#define __PSHAG_CMAIN_HPP__ #include #include "CMemory.hpp" @@ -7,7 +7,7 @@ #include "CPlayMovie.hpp" #include "IOStreams.hpp" -namespace Retro +namespace pshag { class CStopwatch; @@ -69,4 +69,4 @@ extern CMain* g_main; } } -#endif // __RETRO_CMAIN_HPP__ +#endif // __PSHAG_CMAIN_HPP__ diff --git a/Runtime/MP1/CMainFlow.cpp b/Runtime/MP1/CMainFlow.cpp index c49d189c3..9ae1b3a9b 100644 --- a/Runtime/MP1/CMainFlow.cpp +++ b/Runtime/MP1/CMainFlow.cpp @@ -7,7 +7,7 @@ #include "CFrontEndUI.hpp" #include "GameGlobalObjects.hpp" -namespace Retro +namespace pshag { namespace MP1 { diff --git a/Runtime/MP1/CMainFlow.hpp b/Runtime/MP1/CMainFlow.hpp index 85ea27834..86759f5cd 100644 --- a/Runtime/MP1/CMainFlow.hpp +++ b/Runtime/MP1/CMainFlow.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CMAINFLOW_HPP__ -#define __RETRO_CMAINFLOW_HPP__ +#ifndef __PSHAG_CMAINFLOW_HPP__ +#define __PSHAG_CMAINFLOW_HPP__ #include "CMainFlowBase.hpp" -namespace Retro +namespace pshag { class CArchitectureMessage; class CArchitectureQueue; @@ -25,4 +25,4 @@ public: } -#endif // __RETRO_CMAINFLOW_HPP__ +#endif // __PSHAG_CMAINFLOW_HPP__ diff --git a/Runtime/MP1/CPlayMovie.cpp b/Runtime/MP1/CPlayMovie.cpp index f9c977211..5444b2db2 100644 --- a/Runtime/MP1/CPlayMovie.cpp +++ b/Runtime/MP1/CPlayMovie.cpp @@ -1,4 +1,4 @@ -namespace Retro +namespace pshag { namespace MP1 { diff --git a/Runtime/MP1/CPlayMovie.hpp b/Runtime/MP1/CPlayMovie.hpp index 9006e52b8..c788f7078 100644 --- a/Runtime/MP1/CPlayMovie.hpp +++ b/Runtime/MP1/CPlayMovie.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CPLAYMOVIE_HPP__ -#define __RETRO_CPLAYMOVIE_HPP__ +#ifndef __PSHAG_CPLAYMOVIE_HPP__ +#define __PSHAG_CPLAYMOVIE_HPP__ #include "CPlayMovieBase.hpp" -namespace Retro +namespace pshag { namespace MP1 { @@ -27,4 +27,4 @@ public: } } -#endif // __RETRO_CPLAYMOVIE_HPP__ +#endif // __PSHAG_CPLAYMOVIE_HPP__ diff --git a/Runtime/MP1/CTweaks.cpp b/Runtime/MP1/CTweaks.cpp index af078a1c0..801bf1d61 100644 --- a/Runtime/MP1/CTweaks.cpp +++ b/Runtime/MP1/CTweaks.cpp @@ -7,11 +7,11 @@ #include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp" -namespace Retro +namespace pshag { -ITweakGame* g_tweakGame = nullptr; -ITweakPlayer* g_tweakPlayer = nullptr; -ITweakPlayerControl* g_tweakPlayerControl = nullptr; +DataSpec::ITweakGame* g_tweakGame = nullptr; +DataSpec::ITweakPlayer* g_tweakPlayer = nullptr; +DataSpec::ITweakPlayerControl* g_tweakPlayerControl = nullptr; namespace MP1 { diff --git a/Runtime/MP1/CTweaks.hpp b/Runtime/MP1/CTweaks.hpp index b2bc3bd63..fb8f31581 100644 --- a/Runtime/MP1/CTweaks.hpp +++ b/Runtime/MP1/CTweaks.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CTWEAKS_HPP__ -#define __RETRO_CTWEAKS_HPP__ +#ifndef __PSHAG_CTWEAKS_HPP__ +#define __PSHAG_CTWEAKS_HPP__ #include "RetroTypes.hpp" -namespace Retro +namespace pshag { namespace MP1 @@ -19,4 +19,4 @@ public: } } -#endif // __RETRO_CTWEAKS_HPP__ +#endif // __PSHAG_CTWEAKS_HPP__ diff --git a/Runtime/MP1/main.cpp b/Runtime/MP1/main.cpp index 397ad9163..a018d3faf 100644 --- a/Runtime/MP1/main.cpp +++ b/Runtime/MP1/main.cpp @@ -37,7 +37,7 @@ #include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakGame.hpp" -namespace Retro +namespace pshag { CMemoryCardSys* g_MemoryCardSys = nullptr; CResFactory* g_ResFactory = nullptr; @@ -216,7 +216,7 @@ int main(int argc, const char* argv[]) #endif LogVisor::RegisterConsoleLogger(); - Retro::TOneStatic main; + pshag::TOneStatic main; int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto, *main, _S("mp1"), _S("MP1"), argc, argv); return ret; diff --git a/Runtime/Particle/CColorElement.cpp b/Runtime/Particle/CColorElement.cpp index 1ff594bc1..38ba8317d 100644 --- a/Runtime/Particle/CColorElement.cpp +++ b/Runtime/Particle/CColorElement.cpp @@ -3,7 +3,7 @@ #include "CRandom16.hpp" #include -namespace Retro +namespace pshag { CCEKeyframeEmitter::CCEKeyframeEmitter(CInputStream& in) diff --git a/Runtime/Particle/CColorElement.hpp b/Runtime/Particle/CColorElement.hpp index acc6ab502..dab30050e 100644 --- a/Runtime/Particle/CColorElement.hpp +++ b/Runtime/Particle/CColorElement.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CCOLORELEMENT_HPP__ -#define __RETRO_CCOLORELEMENT_HPP__ +#ifndef __PSHAG_CCOLORELEMENT_HPP__ +#define __PSHAG_CCOLORELEMENT_HPP__ #include "IElement.hpp" -namespace Retro +namespace pshag { class CCEKeyframeEmitter : public CColorElement @@ -94,4 +94,4 @@ public: }; } -#endif // __RETRO_CCOLORELEMENT_HPP__ +#endif // __PSHAG_CCOLORELEMENT_HPP__ diff --git a/Runtime/Particle/CDecalDataFactory.cpp b/Runtime/Particle/CDecalDataFactory.cpp index 06a205fb4..33d01bb1f 100644 --- a/Runtime/Particle/CDecalDataFactory.cpp +++ b/Runtime/Particle/CDecalDataFactory.cpp @@ -2,7 +2,7 @@ #include "CDecalDescription.hpp" #include "CSimplePool.hpp" -namespace Retro +namespace pshag { std::unique_ptr FDealDataFactory(const SObjectTag &tag, CInputStream &in, const CVParamTransfer &vparms) { diff --git a/Runtime/Particle/CDecalDataFactory.hpp b/Runtime/Particle/CDecalDataFactory.hpp index b406b5b68..7d3426f2f 100644 --- a/Runtime/Particle/CDecalDataFactory.hpp +++ b/Runtime/Particle/CDecalDataFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CDECALDATAFACTORY_HPP__ -#define __RETRO_CDECALDATAFACTORY_HPP__ +#ifndef __PSHAG_CDECALDATAFACTORY_HPP__ +#define __PSHAG_CDECALDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "IObj.hpp" @@ -7,7 +7,7 @@ #include "IOStreams.hpp" -namespace Retro +namespace pshag { class CDecalDescription; class CSimplePool; @@ -22,4 +22,4 @@ public: std::unique_ptr FDealDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __RETRO_CDECALDATAFACTORY_HPP__ +#endif // __PSHAG_CDECALDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CDecalDescription.hpp b/Runtime/Particle/CDecalDescription.hpp index b862552bc..8c0fc81ca 100644 --- a/Runtime/Particle/CDecalDescription.hpp +++ b/Runtime/Particle/CDecalDescription.hpp @@ -1,11 +1,11 @@ -#ifndef __RETRO_CDECALDESCRIPTION_HPP__ -#define __RETRO_CDECALDESCRIPTION_HPP__ +#ifndef __PSHAG_CDECALDESCRIPTION_HPP__ +#define __PSHAG_CDECALDESCRIPTION_HPP__ -namespace Retro +namespace pshag { class CDecalDescription { }; } -#endif // __RETRO_CDECALDESCRIPTION_HPP__ +#endif // __PSHAG_CDECALDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CDecalManager.hpp b/Runtime/Particle/CDecalManager.hpp index a74e86962..ec75f6a72 100644 --- a/Runtime/Particle/CDecalManager.hpp +++ b/Runtime/Particle/CDecalManager.hpp @@ -1,7 +1,7 @@ -#ifndef __RETRO_CDECALMANAGER_HPP__ -#define __RETRO_CDECALMANAGER_HPP__ +#ifndef __PSHAG_CDECALMANAGER_HPP__ +#define __PSHAG_CDECALMANAGER_HPP__ -namespace Retro +namespace pshag { class CDecalManager @@ -14,4 +14,4 @@ public: } -#endif // __RETRO_CDECALMANAGER_HPP__ +#endif // __PSHAG_CDECALMANAGER_HPP__ diff --git a/Runtime/Particle/CElectricDescription.hpp b/Runtime/Particle/CElectricDescription.hpp index 19e3d6d71..27fc0fbac 100644 --- a/Runtime/Particle/CElectricDescription.hpp +++ b/Runtime/Particle/CElectricDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CELECTRICDESCRIPTION_HPP__ -#define __RETRO_CELECTRICDESCRIPTION_HPP__ +#ifndef __PSHAG_CELECTRICDESCRIPTION_HPP__ +#define __PSHAG_CELECTRICDESCRIPTION_HPP__ #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -9,7 +9,7 @@ #include "CColorElement.hpp" #include "CUVElement.hpp" -namespace Retro +namespace pshag { class CElectricDescription { @@ -37,4 +37,4 @@ public: }; } -#endif // __RETRO_CELECTRICDESCRIPTION_HPP__ +#endif // __PSHAG_CELECTRICDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CElementGen.cpp b/Runtime/Particle/CElementGen.cpp index 996c8db2d..aa97f188f 100644 --- a/Runtime/Particle/CElementGen.cpp +++ b/Runtime/Particle/CElementGen.cpp @@ -5,7 +5,7 @@ #include "CParticleElectric.hpp" #include "CModel.hpp" -namespace Retro +namespace pshag { static LogVisor::LogModule Log("Retro::CElementGen"); diff --git a/Runtime/Particle/CElementGen.hpp b/Runtime/Particle/CElementGen.hpp index 1999d8553..5bc0fa50f 100644 --- a/Runtime/Particle/CElementGen.hpp +++ b/Runtime/Particle/CElementGen.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CELEMENTGEN_HPP__ -#define __RETRO_CELEMENTGEN_HPP__ +#ifndef __PSHAG_CELEMENTGEN_HPP__ +#define __PSHAG_CELEMENTGEN_HPP__ #include "RetroTypes.hpp" #include "CTransform.hpp" @@ -12,7 +12,7 @@ #include "CRandom16.hpp" #include "CParticleGen.hpp" -namespace Retro +namespace pshag { class CWarp; class CLight; @@ -221,4 +221,4 @@ ENABLE_BITWISE_ENUM(CElementGen::EOptionalSystemFlags) } -#endif // __RETRO_CELEMENTGEN_HPP__ +#endif // __PSHAG_CELEMENTGEN_HPP__ diff --git a/Runtime/Particle/CEmitterElement.hpp b/Runtime/Particle/CEmitterElement.hpp index 175af5a55..3651ecccc 100644 --- a/Runtime/Particle/CEmitterElement.hpp +++ b/Runtime/Particle/CEmitterElement.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CEMITTERELEMENT_HPP__ -#define __RETRO_CEMITTERELEMENT_HPP__ +#ifndef __PSHAG_CEMITTERELEMENT_HPP__ +#define __PSHAG_CEMITTERELEMENT_HPP__ #include "IElement.hpp" -namespace Retro +namespace pshag { class CEESimpleEmitter : public CEmitterElement @@ -45,4 +45,4 @@ public: } -#endif // __RETRO_CEMITTERELEMENT_HPP__ +#endif // __PSHAG_CEMITTERELEMENT_HPP__ diff --git a/Runtime/Particle/CGenDescription.hpp b/Runtime/Particle/CGenDescription.hpp index cb7ab1931..dc66f41a8 100644 --- a/Runtime/Particle/CGenDescription.hpp +++ b/Runtime/Particle/CGenDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CGENDESCRIPTION_HPP__ -#define __RETRO_CGENDESCRIPTION_HPP__ +#ifndef __PSHAG_CGENDESCRIPTION_HPP__ +#define __PSHAG_CGENDESCRIPTION_HPP__ #include #include "CRealElement.hpp" @@ -12,7 +12,7 @@ #include "CSpawnSystemKeyframeData.hpp" #include "CParticleDataFactory.hpp" -namespace Retro +namespace pshag { class CGenDescription @@ -112,4 +112,4 @@ public: } -#endif // __RETRO_CGENDESCRIPTION_HPP__ +#endif // __PSHAG_CGENDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CIntElement.cpp b/Runtime/Particle/CIntElement.cpp index cd11e8583..d4fc84141 100644 --- a/Runtime/Particle/CIntElement.cpp +++ b/Runtime/Particle/CIntElement.cpp @@ -2,7 +2,7 @@ #include "CParticleGlobals.hpp" #include "CRandom16.hpp" -namespace Retro +namespace pshag { CIEKeyframeEmitter::CIEKeyframeEmitter(CInputStream& in) diff --git a/Runtime/Particle/CIntElement.hpp b/Runtime/Particle/CIntElement.hpp index d29fac435..487de50ef 100644 --- a/Runtime/Particle/CIntElement.hpp +++ b/Runtime/Particle/CIntElement.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CINTELEMENT_HPP__ -#define __RETRO_CINTELEMENT_HPP__ +#ifndef __PSHAG_CINTELEMENT_HPP__ +#define __PSHAG_CINTELEMENT_HPP__ #include "IElement.hpp" -namespace Retro +namespace pshag { class CIEKeyframeEmitter : public CIntElement @@ -192,4 +192,4 @@ public: } -#endif // __RETRO_CINTELEMENT_HPP__ +#endif // __PSHAG_CINTELEMENT_HPP__ diff --git a/Runtime/Particle/CModVectorElement.cpp b/Runtime/Particle/CModVectorElement.cpp index 193e19967..8c9d4fa06 100644 --- a/Runtime/Particle/CModVectorElement.cpp +++ b/Runtime/Particle/CModVectorElement.cpp @@ -3,7 +3,7 @@ #include "CRandom16.hpp" #include -namespace Retro +namespace pshag { bool CMVEImplosion::GetValue(int frame, Zeus::CVector3f& pVel, Zeus::CVector3f& pPos) const diff --git a/Runtime/Particle/CModVectorElement.hpp b/Runtime/Particle/CModVectorElement.hpp index eaef9297f..dc95eb490 100644 --- a/Runtime/Particle/CModVectorElement.hpp +++ b/Runtime/Particle/CModVectorElement.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CMODVECTORELEMENT_HPP__ -#define __RETRO_CMODVECTORELEMENT_HPP__ +#ifndef __PSHAG_CMODVECTORELEMENT_HPP__ +#define __PSHAG_CMODVECTORELEMENT_HPP__ #include "IElement.hpp" -namespace Retro +namespace pshag { class CMVEImplosion : public CModVectorElement @@ -155,4 +155,4 @@ public: } -#endif // __RETRO_CMODVECTORELEMENT_HPP__ +#endif // __PSHAG_CMODVECTORELEMENT_HPP__ diff --git a/Runtime/Particle/CParticleDataFactory.cpp b/Runtime/Particle/CParticleDataFactory.cpp index 283238c03..e81df539c 100644 --- a/Runtime/Particle/CParticleDataFactory.cpp +++ b/Runtime/Particle/CParticleDataFactory.cpp @@ -3,7 +3,7 @@ #include "CSimplePool.hpp" #include "CGenDescription.hpp" -namespace Retro +namespace pshag { static LogVisor::LogModule Log("Retro::CParticleDataFactory"); diff --git a/Runtime/Particle/CParticleDataFactory.hpp b/Runtime/Particle/CParticleDataFactory.hpp index 45d06f618..e42420bae 100644 --- a/Runtime/Particle/CParticleDataFactory.hpp +++ b/Runtime/Particle/CParticleDataFactory.hpp @@ -1,12 +1,12 @@ -#ifndef __RETRO_CPARTICLEDATAFACTORY_HPP__ -#define __RETRO_CPARTICLEDATAFACTORY_HPP__ +#ifndef __PSHAG_CPARTICLEDATAFACTORY_HPP__ +#define __PSHAG_CPARTICLEDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "IObj.hpp" #include "CToken.hpp" #include "IOStreams.hpp" -namespace Retro +namespace pshag { class CGenDescription; class CSwooshDescription; @@ -82,4 +82,4 @@ std::unique_ptr FParticleFactory(const SObjectTag& tag, CInputStream& in, } -#endif // __RETRO_CPARTICLEDATAFACTORY_HPP__ +#endif // __PSHAG_CPARTICLEDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CParticleElectric.cpp b/Runtime/Particle/CParticleElectric.cpp index b8de346dc..71d953a69 100644 --- a/Runtime/Particle/CParticleElectric.cpp +++ b/Runtime/Particle/CParticleElectric.cpp @@ -1,6 +1,6 @@ #include "CParticleElectric.hpp" -namespace Retro +namespace pshag { CParticleElectric::CParticleElectric(const TToken& desc) diff --git a/Runtime/Particle/CParticleElectric.hpp b/Runtime/Particle/CParticleElectric.hpp index 6fb9682ef..caa14525d 100644 --- a/Runtime/Particle/CParticleElectric.hpp +++ b/Runtime/Particle/CParticleElectric.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CPARTICLEELECTRIC_HPP__ -#define __RETRO_CPARTICLEELECTRIC_HPP__ +#ifndef __PSHAG_CPARTICLEELECTRIC_HPP__ +#define __PSHAG_CPARTICLEELECTRIC_HPP__ #include "CParticleGen.hpp" #include "CToken.hpp" -namespace Retro +namespace pshag { class CElectricDescription; @@ -40,4 +40,4 @@ public: } -#endif // __RETRO_CPARTICLEELECTRIC_HPP__ +#endif // __PSHAG_CPARTICLEELECTRIC_HPP__ diff --git a/Runtime/Particle/CParticleElectricDataFactory.cpp b/Runtime/Particle/CParticleElectricDataFactory.cpp index 04c56eef6..ee5539535 100644 --- a/Runtime/Particle/CParticleElectricDataFactory.cpp +++ b/Runtime/Particle/CParticleElectricDataFactory.cpp @@ -4,7 +4,7 @@ #include "CSimplePool.hpp" #include "CRandom16.hpp" -namespace Retro +namespace pshag { static LogVisor::LogModule Log("Retro::CParticleElectricDataFactory"); @@ -88,7 +88,7 @@ bool CParticleElectricDataFactory::CreateELSM(CElectricDescription *desc, CInput break; case SBIG('SSWH'): desc->x40_SSWH = CPF::GetSwooshGeneratorDesc(in, resPool); - break; + break; case SBIG('GPSM'): { std::vector tracker; @@ -118,7 +118,7 @@ bool CParticleElectricDataFactory::CreateELSM(CElectricDescription *desc, CInput return true; } -std::unique_ptr FParticleElecrticFactory(const Retro::SObjectTag &tag, Retro::CInputStream &in, const Retro::CVParamTransfer &vparms) +std::unique_ptr FParticleElecrticFactory(const pshag::SObjectTag &tag, pshag::CInputStream &in, const pshag::CVParamTransfer &vparms) { CSimplePool* sp = static_cast(static_cast*>(vparms.GetObj())->GetParam()); return TToken::GetIObjObjectFor(std::unique_ptr(CParticleElectricDataFactory::GetGeneratorDesc(in, sp))); diff --git a/Runtime/Particle/CParticleElectricDataFactory.hpp b/Runtime/Particle/CParticleElectricDataFactory.hpp index 432c10562..46d9bb20f 100644 --- a/Runtime/Particle/CParticleElectricDataFactory.hpp +++ b/Runtime/Particle/CParticleElectricDataFactory.hpp @@ -1,12 +1,12 @@ -#ifndef __RETRO_CPARTICLEELECTRICDATAFACTORY_HPP__ -#define __RETRO_CPARTICLEELECTRICDATAFACTORY_HPP__ +#ifndef __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__ +#define __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "IObj.hpp" #include "CToken.hpp" #include "IOStreams.hpp" -namespace Retro +namespace pshag { class CElectricDescription; class CSimplePool; @@ -22,4 +22,4 @@ public: std::unique_ptr FParticleElectricDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __RETRO_CPARTICLEELECTRICDATAFACTORY_HPP__ +#endif // __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CParticleGen.cpp b/Runtime/Particle/CParticleGen.cpp index acc73f482..a4005427f 100644 --- a/Runtime/Particle/CParticleGen.cpp +++ b/Runtime/Particle/CParticleGen.cpp @@ -1,6 +1,6 @@ #include "CParticleGen.hpp" -namespace Retro +namespace pshag { void CParticleGen::AddModifier(CWarp* mod) diff --git a/Runtime/Particle/CParticleGen.hpp b/Runtime/Particle/CParticleGen.hpp index faae0f073..46a884ba9 100644 --- a/Runtime/Particle/CParticleGen.hpp +++ b/Runtime/Particle/CParticleGen.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CPARTICLEGEN_HPP__ -#define __RETRO_CPARTICLEGEN_HPP__ +#ifndef __PSHAG_CPARTICLEGEN_HPP__ +#define __PSHAG_CPARTICLEGEN_HPP__ #include "RetroTypes.hpp" #include "CLight.hpp" @@ -10,7 +10,7 @@ #include "CAABox.hpp" #include -namespace Retro +namespace pshag { class CParticleGen @@ -48,4 +48,4 @@ public: } -#endif // __RETRO_CPARTICLEGEN_HPP__ +#endif // __PSHAG_CPARTICLEGEN_HPP__ diff --git a/Runtime/Particle/CParticleGlobals.cpp b/Runtime/Particle/CParticleGlobals.cpp index 46acd01ca..7b5ea74bb 100644 --- a/Runtime/Particle/CParticleGlobals.cpp +++ b/Runtime/Particle/CParticleGlobals.cpp @@ -1,6 +1,6 @@ #include "CParticleGlobals.hpp" -namespace Retro +namespace pshag { int CParticleGlobals::g_EmitterTime = 0; diff --git a/Runtime/Particle/CParticleGlobals.hpp b/Runtime/Particle/CParticleGlobals.hpp index e78ef9e26..2afe9ea90 100644 --- a/Runtime/Particle/CParticleGlobals.hpp +++ b/Runtime/Particle/CParticleGlobals.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CPARTICLEGLOBALS_HPP__ -#define __RETRO_CPARTICLEGLOBALS_HPP__ +#ifndef __PSHAG_CPARTICLEGLOBALS_HPP__ +#define __PSHAG_CPARTICLEGLOBALS_HPP__ #include "CVector3f.hpp" -namespace Retro +namespace pshag { class CParticleGlobals @@ -51,4 +51,4 @@ public: } -#endif // __RETRO_CPARTICLEGLOBALS_HPP__ +#endif // __PSHAG_CPARTICLEGLOBALS_HPP__ diff --git a/Runtime/Particle/CParticleSwoosh.cpp b/Runtime/Particle/CParticleSwoosh.cpp index d7666dd04..c828ba079 100644 --- a/Runtime/Particle/CParticleSwoosh.cpp +++ b/Runtime/Particle/CParticleSwoosh.cpp @@ -1,6 +1,6 @@ #include "CParticleSwoosh.hpp" -namespace Retro +namespace pshag { CParticleSwoosh::CParticleSwoosh(const TToken& desc, int) diff --git a/Runtime/Particle/CParticleSwoosh.hpp b/Runtime/Particle/CParticleSwoosh.hpp index 469d92dd9..27e9621be 100644 --- a/Runtime/Particle/CParticleSwoosh.hpp +++ b/Runtime/Particle/CParticleSwoosh.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CPARTICLESWOOSH_HPP__ -#define __RETRO_CPARTICLESWOOSH_HPP__ +#ifndef __PSHAG_CPARTICLESWOOSH_HPP__ +#define __PSHAG_CPARTICLESWOOSH_HPP__ #include "CParticleGen.hpp" #include "CToken.hpp" -namespace Retro +namespace pshag { class CSwooshDescription; @@ -40,4 +40,4 @@ public: } -#endif // __RETRO_CPARTICLESWOOSH_HPP__ +#endif // __PSHAG_CPARTICLESWOOSH_HPP__ diff --git a/Runtime/Particle/CParticleSwooshDataFactory.cpp b/Runtime/Particle/CParticleSwooshDataFactory.cpp index 0c0b56046..2185b68a5 100644 --- a/Runtime/Particle/CParticleSwooshDataFactory.cpp +++ b/Runtime/Particle/CParticleSwooshDataFactory.cpp @@ -3,7 +3,7 @@ #include "CRandom16.hpp" #include "CSimplePool.hpp" -namespace Retro +namespace pshag { static LogVisor::LogModule Log("Retro::CParticleSwooshDataFactory"); @@ -132,7 +132,7 @@ bool CParticleSwooshDataFactory::CreateWPSM(CSwooshDescription* desc, CInputStre return true; } -std::unique_ptr FParticleSwooshDataFactory(const SObjectTag &tag, CInputStream &in, const CVParamTransfer &vparms) +std::unique_ptr FParticleSwooshDataFactory(const SObjectTag &tag, CInputStream &in, const CVParamTransfer &vparms) { CSimplePool* sp = static_cast(static_cast*>(vparms.GetObj())->GetParam()); return TToken::GetIObjObjectFor(std::unique_ptr(CParticleSwooshDataFactory::GetGeneratorDesc(in, sp))); diff --git a/Runtime/Particle/CParticleSwooshDataFactory.hpp b/Runtime/Particle/CParticleSwooshDataFactory.hpp index d632a3ebf..151a2ad66 100644 --- a/Runtime/Particle/CParticleSwooshDataFactory.hpp +++ b/Runtime/Particle/CParticleSwooshDataFactory.hpp @@ -1,12 +1,12 @@ -#ifndef __RETRO_CPARTICLESWOOSHDATAFACTORY_HPP__ -#define __RETRO_CPARTICLESWOOSHDATAFACTORY_HPP__ +#ifndef __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__ +#define __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "IObj.hpp" #include "CToken.hpp" #include "IOStreams.hpp" -namespace Retro +namespace pshag { class CSwooshDescription; class CSimplePool; @@ -21,4 +21,4 @@ public: std::unique_ptr FParticleSwooshDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __RETRO_CPARTICLESWOOSHDATAFACTORY_HPP__ +#endif // __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CRealElement.cpp b/Runtime/Particle/CRealElement.cpp index 85761b947..171a25772 100644 --- a/Runtime/Particle/CRealElement.cpp +++ b/Runtime/Particle/CRealElement.cpp @@ -3,7 +3,7 @@ #include "CRandom16.hpp" #include -namespace Retro +namespace pshag { CREKeyframeEmitter::CREKeyframeEmitter(CInputStream& in) diff --git a/Runtime/Particle/CRealElement.hpp b/Runtime/Particle/CRealElement.hpp index 3c5e28c21..1d88be972 100644 --- a/Runtime/Particle/CRealElement.hpp +++ b/Runtime/Particle/CRealElement.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CREALELEMENT_HPP__ -#define __RETRO_CREALELEMENT_HPP__ +#ifndef __PSHAG_CREALELEMENT_HPP__ +#define __PSHAG_CREALELEMENT_HPP__ #include "IElement.hpp" -namespace Retro +namespace pshag { class CREKeyframeEmitter : public CRealElement @@ -367,4 +367,4 @@ public: }; } -#endif // __RETRO_CREALELEMENT_HPP__ +#endif // __PSHAG_CREALELEMENT_HPP__ diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.cpp b/Runtime/Particle/CSpawnSystemKeyframeData.cpp index f75ceb818..a2b96e90e 100644 --- a/Runtime/Particle/CSpawnSystemKeyframeData.cpp +++ b/Runtime/Particle/CSpawnSystemKeyframeData.cpp @@ -1,7 +1,7 @@ #include "CSpawnSystemKeyframeData.hpp" #include "CSimplePool.hpp" -namespace Retro +namespace pshag { CSpawnSystemKeyframeData::CSpawnSystemKeyframeData(CInputStream& in) diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.hpp b/Runtime/Particle/CSpawnSystemKeyframeData.hpp index 8b68c1f42..6ec8957a5 100644 --- a/Runtime/Particle/CSpawnSystemKeyframeData.hpp +++ b/Runtime/Particle/CSpawnSystemKeyframeData.hpp @@ -1,10 +1,10 @@ -#ifndef __RETRO_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ -#define __RETRO_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ +#ifndef __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ +#define __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ #include "IOStreams.hpp" #include "CToken.hpp" -namespace Retro +namespace pshag { class CSimplePool; class CGenDescription; @@ -40,4 +40,4 @@ public: } -#endif // __RETRO_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ +#endif // __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ diff --git a/Runtime/Particle/CSwooshDescription.hpp b/Runtime/Particle/CSwooshDescription.hpp index b23a10f61..32b2ff930 100644 --- a/Runtime/Particle/CSwooshDescription.hpp +++ b/Runtime/Particle/CSwooshDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_CSWOOSHDESCRIPTION_HPP__ -#define __RETRO_CSWOOSHDESCRIPTION_HPP__ +#ifndef __PSHAG_CSWOOSHDESCRIPTION_HPP__ +#define __PSHAG_CSWOOSHDESCRIPTION_HPP__ #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -9,7 +9,7 @@ #include "CColorElement.hpp" #include "CUVElement.hpp" -namespace Retro +namespace pshag { class CSwooshDescription { @@ -44,4 +44,4 @@ public: }; } -#endif // __RETRO_CSWOOSHDESCRIPTION_HPP__ +#endif // __PSHAG_CSWOOSHDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CUVElement.cpp b/Runtime/Particle/CUVElement.cpp index accc194ee..fa31b4811 100644 --- a/Runtime/Particle/CUVElement.cpp +++ b/Runtime/Particle/CUVElement.cpp @@ -1,6 +1,6 @@ #include "CUVElement.hpp" -namespace Retro +namespace pshag { CUVEAnimTexture::CUVEAnimTexture(TToken&& tex, CIntElement* a, CIntElement* b, diff --git a/Runtime/Particle/CUVElement.hpp b/Runtime/Particle/CUVElement.hpp index 097721f82..8c0214ce8 100644 --- a/Runtime/Particle/CUVElement.hpp +++ b/Runtime/Particle/CUVElement.hpp @@ -1,11 +1,11 @@ -#ifndef __RETRO_CUVELEMENT_HPP__ -#define __RETRO_CUVELEMENT_HPP__ +#ifndef __PSHAG_CUVELEMENT_HPP__ +#define __PSHAG_CUVELEMENT_HPP__ #include "IElement.hpp" #include "CToken.hpp" #include "CTexture.hpp" -namespace Retro +namespace pshag { class CToken; @@ -63,4 +63,4 @@ public: } -#endif // __RETRO_CUVELEMENT_HPP__ +#endif // __PSHAG_CUVELEMENT_HPP__ diff --git a/Runtime/Particle/CVectorElement.cpp b/Runtime/Particle/CVectorElement.cpp index 8418bf9ab..f41517368 100644 --- a/Runtime/Particle/CVectorElement.cpp +++ b/Runtime/Particle/CVectorElement.cpp @@ -3,7 +3,7 @@ #include "CRandom16.hpp" #include -namespace Retro +namespace pshag { CVEKeyframeEmitter::CVEKeyframeEmitter(CInputStream& in) diff --git a/Runtime/Particle/CVectorElement.hpp b/Runtime/Particle/CVectorElement.hpp index 2112d5ce0..9b3d2f768 100644 --- a/Runtime/Particle/CVectorElement.hpp +++ b/Runtime/Particle/CVectorElement.hpp @@ -1,9 +1,9 @@ -#ifndef __RETRO_CVECTORELEMENT_HPP__ -#define __RETRO_CVECTORELEMENT_HPP__ +#ifndef __PSHAG_CVECTORELEMENT_HPP__ +#define __PSHAG_CVECTORELEMENT_HPP__ #include "IElement.hpp" -namespace Retro +namespace pshag { class CVEKeyframeEmitter : public CVectorElement @@ -205,4 +205,4 @@ public: } -#endif // __RETRO_CVECTORELEMENT_HPP__ +#endif // __PSHAG_CVECTORELEMENT_HPP__ diff --git a/Runtime/Particle/CWarp.hpp b/Runtime/Particle/CWarp.hpp index f8684b747..b616972db 100644 --- a/Runtime/Particle/CWarp.hpp +++ b/Runtime/Particle/CWarp.hpp @@ -1,7 +1,7 @@ -#ifndef __RETRO_CWARP_HPP__ -#define __RETRO_CWARP_HPP__ +#ifndef __PSHAG_CWARP_HPP__ +#define __PSHAG_CWARP_HPP__ -namespace Retro +namespace pshag { class CWarp @@ -10,4 +10,4 @@ class CWarp } -#endif // __RETRO_CWARP_HPP__ +#endif // __PSHAG_CWARP_HPP__ diff --git a/Runtime/Particle/CWeaponDescription.hpp b/Runtime/Particle/CWeaponDescription.hpp index c7412eea9..1ea7447a0 100644 --- a/Runtime/Particle/CWeaponDescription.hpp +++ b/Runtime/Particle/CWeaponDescription.hpp @@ -1,4 +1,4 @@ -#ifndef __RETRO_CWEAPONDESCRIPTION_HPP__ -#define __RETRO_CWEAPONDESCRIPTION_HPP__ +#ifndef __PSHAG_CWEAPONDESCRIPTION_HPP__ +#define __PSHAG_CWEAPONDESCRIPTION_HPP__ -#endif // __RETRO_CWEAPONDESCRIPTION_HPP__ +#endif // __PSHAG_CWEAPONDESCRIPTION_HPP__ diff --git a/Runtime/Particle/IElement.hpp b/Runtime/Particle/IElement.hpp index 8614f93fe..4f7bdd329 100644 --- a/Runtime/Particle/IElement.hpp +++ b/Runtime/Particle/IElement.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_IELEMENT_HPP__ -#define __RETRO_IELEMENT_HPP__ +#ifndef __PSHAG_IELEMENT_HPP__ +#define __PSHAG_IELEMENT_HPP__ #include #include "GCNTypes.hpp" @@ -7,7 +7,7 @@ #include "CColor.hpp" #include "IOStreams.hpp" -namespace Retro +namespace pshag { class IElement @@ -56,4 +56,4 @@ public: } -#endif // __RETRO_IELEMENT_HPP__ +#endif // __PSHAG_IELEMENT_HPP__ diff --git a/Runtime/RetroTypes.hpp b/Runtime/RetroTypes.hpp index e5cc77c55..e85c8f3c3 100644 --- a/Runtime/RetroTypes.hpp +++ b/Runtime/RetroTypes.hpp @@ -1,5 +1,5 @@ -#ifndef __RETRO_TYPES_HPP__ -#define __RETRO_TYPES_HPP__ +#ifndef __PSHAG_TYPES_HPP__ +#define __PSHAG_TYPES_HPP__ #include #include @@ -8,7 +8,7 @@ #include "rstl.hpp" #include "DataSpec/DNACommon/DNACommon.hpp" -namespace Retro +namespace pshag { using FourCC = HECL::FourCC; @@ -70,11 +70,11 @@ using TAreaId = u32; namespace std { template<> -struct hash +struct hash { - inline size_t operator()(const Retro::SObjectTag& tag) const + inline size_t operator()(const pshag::SObjectTag& tag) const {return tag.id;} }; } -#endif // __RETRO_TYPES_HPP__ +#endif // __PSHAG_TYPES_HPP__ diff --git a/Runtime/ScriptObjectSupport.hpp b/Runtime/ScriptObjectSupport.hpp index b6d364016..2d79826c6 100644 --- a/Runtime/ScriptObjectSupport.hpp +++ b/Runtime/ScriptObjectSupport.hpp @@ -1,7 +1,7 @@ #ifndef __SCRIPT_OBJECT_SUPPORT_HPP__ #define __SCRIPT_OBJECT_SUPPORT_HPP__ -namespace Retro +namespace pshag { enum class EScriptObjectState