From c91e5df98648530469cfb68824af67c27b1ee037 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 6 Oct 2018 17:42:33 -1000 Subject: [PATCH] Convert to pragma once --- DataSpec/AssetNameMap.hpp | 4 +- DataSpec/Blender/BlenderSupport.hpp | 4 +- DataSpec/DNACommon/ANCS.hpp | 4 +- DataSpec/DNACommon/ANIM.hpp | 4 +- DataSpec/DNACommon/AROTBuilder.hpp | 4 +- DataSpec/DNACommon/ATBL.hpp | 4 +- DataSpec/DNACommon/BabeDead.hpp | 4 +- DataSpec/DNACommon/CMDL.hpp | 4 +- DataSpec/DNACommon/CRSC.hpp | 4 +- DataSpec/DNACommon/DGRP.hpp | 4 +- DataSpec/DNACommon/DNACommon.hpp | 4 +- DataSpec/DNACommon/DPSC.hpp | 4 +- DataSpec/DNACommon/DeafBabe.hpp | 4 +- DataSpec/DNACommon/EGMC.hpp | 4 +- DataSpec/DNACommon/ELSC.hpp | 4 +- DataSpec/DNACommon/FONT.hpp | 4 +- DataSpec/DNACommon/FSM2.hpp | 4 +- DataSpec/DNACommon/GX.hpp | 4 +- DataSpec/DNACommon/MAPA.hpp | 4 +- DataSpec/DNACommon/MAPU.hpp | 4 +- DataSpec/DNACommon/MLVL.hpp | 4 +- DataSpec/DNACommon/OBBTreeBuilder.hpp | 4 +- DataSpec/DNACommon/PAK.hpp | 4 +- DataSpec/DNACommon/PART.hpp | 4 +- DataSpec/DNACommon/ParticleCommon.hpp | 4 +- DataSpec/DNACommon/RigInverter.hpp | 4 +- DataSpec/DNACommon/SAVWCommon.hpp | 4 +- DataSpec/DNACommon/STRG.hpp | 4 +- DataSpec/DNACommon/SWHC.hpp | 4 +- DataSpec/DNACommon/TXTR.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweak.hpp | 4 +- .../DNACommon/Tweaks/ITweakAutoMapper.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakBall.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakGame.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakGui.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakParticle.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp | 4 +- .../DNACommon/Tweaks/ITweakPlayerControl.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakSlideShow.hpp | 4 +- DataSpec/DNACommon/Tweaks/ITweakTargeting.hpp | 4 +- DataSpec/DNACommon/Tweaks/TweakWriter.hpp | 4 +- DataSpec/DNACommon/WPSC.hpp | 4 +- DataSpec/DNAMP1/AFSM.hpp | 4 +- DataSpec/DNAMP1/AGSC.hpp | 4 +- DataSpec/DNAMP1/ANCS.hpp | 4 +- DataSpec/DNAMP1/ANIM.hpp | 4 +- DataSpec/DNAMP1/CINF.hpp | 4 +- DataSpec/DNAMP1/CMDL.hpp | 4 +- DataSpec/DNAMP1/CMDLMaterials.hpp | 4 +- DataSpec/DNAMP1/CSKR.hpp | 4 +- DataSpec/DNAMP1/CSNG.hpp | 4 +- DataSpec/DNAMP1/DCLN.hpp | 4 +- DataSpec/DNAMP1/DNAMP1.hpp | 4 +- DataSpec/DNAMP1/DeafBabe.hpp | 4 +- DataSpec/DNAMP1/EVNT.hpp | 4 +- DataSpec/DNAMP1/FRME.hpp | 4 +- DataSpec/DNAMP1/HINT.hpp | 4 +- DataSpec/DNAMP1/MAPA.hpp | 4 +- DataSpec/DNAMP1/MAPU.hpp | 4 +- DataSpec/DNAMP1/MLVL.hpp | 4 +- DataSpec/DNAMP1/MREA.hpp | 4 +- DataSpec/DNAMP1/MazeSeeds.hpp | 4 +- DataSpec/DNAMP1/PAK.hpp | 4 +- DataSpec/DNAMP1/PATH.hpp | 4 +- DataSpec/DNAMP1/SAVW.hpp | 4 +- DataSpec/DNAMP1/SCAN.hpp | 4 +- DataSpec/DNAMP1/SCLY.hpp | 4 +- DataSpec/DNAMP1/STRG.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Actor.hpp | 4 +- .../DNAMP1/ScriptObjects/ActorContraption.hpp | 4 +- .../DNAMP1/ScriptObjects/ActorKeyframe.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp | 4 +- .../DNAMP1/ScriptObjects/AreaAttributes.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Beetle.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Burrower.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Camera.hpp | 4 +- .../ScriptObjects/CameraBlurKeyframe.hpp | 4 +- .../ScriptObjects/CameraFilterKeyframe.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp | 4 +- .../ScriptObjects/CameraHintTrigger.hpp | 4 +- .../ScriptObjects/CameraPitchVolume.hpp | 4 +- .../DNAMP1/ScriptObjects/CameraShaker.hpp | 4 +- .../DNAMP1/ScriptObjects/CameraWaypoint.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp | 4 +- .../DNAMP1/ScriptObjects/ColorModulate.hpp | 4 +- .../DNAMP1/ScriptObjects/ControllerAction.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Counter.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp | 4 +- .../ScriptObjects/DamageableTrigger.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Debris.hpp | 4 +- .../DNAMP1/ScriptObjects/DebrisExtended.hpp | 4 +- .../ScriptObjects/DebugCameraWaypoint.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Dock.hpp | 4 +- .../DNAMP1/ScriptObjects/DockAreaChange.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Drone.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Effect.hpp | 4 +- .../ScriptObjects/ElectroMagneticPulse.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp | 4 +- .../ScriptObjects/EnvFxDensityController.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp | 4 +- .../ScriptObjects/FishCloudModifier.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp | 4 +- .../DNAMP1/ScriptObjects/FlaahgraTentacle.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp | 4 +- .../DNAMP1/ScriptObjects/FlyingPirate.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Geemer.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Generator.hpp | 4 +- .../DNAMP1/ScriptObjects/GrapplePoint.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp | 4 +- .../DNAMP1/ScriptObjects/IScriptObject.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp | 4 +- .../DNAMP1/ScriptObjects/MetareeAlpha.hpp | 4 +- .../DNAMP1/ScriptObjects/MetroidAlpha.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp | 4 +- .../ScriptObjects/MetroidPrimeStage1.hpp | 4 +- .../ScriptObjects/MetroidPrimeStage2.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Midi.hpp | 4 +- .../DNAMP1/ScriptObjects/NewCameraShaker.hpp | 4 +- .../DNAMP1/ScriptObjects/NewIntroBoss.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Oculus.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Parameters.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Parasite.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp | 4 +- .../ScriptObjects/PhazonHealingNodule.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Pickup.hpp | 4 +- .../DNAMP1/ScriptObjects/PickupGenerator.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Platform.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp | 4 +- .../ScriptObjects/PlayerStateChange.hpp | 4 +- .../DNAMP1/ScriptObjects/PointOfInterest.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp | 4 +- .../DNAMP1/ScriptObjects/PuddleToadGamma.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Puffer.hpp | 4 +- .../DNAMP1/ScriptObjects/RadialDamage.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Relay.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Ridley.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Ripper.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Ripple.hpp | 4 +- .../DNAMP1/ScriptObjects/RoomAcoustics.hpp | 4 +- .../DNAMP1/ScriptObjects/RumbleEffect.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Seedling.hpp | 4 +- .../DNAMP1/ScriptObjects/ShadowProjector.hpp | 4 +- .../DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Sound.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp | 4 +- .../DNAMP1/ScriptObjects/SpecialFunction.hpp | 4 +- .../SpiderBallAttractionSurface.hpp | 4 +- .../ScriptObjects/SpiderBallWaypoint.hpp | 4 +- .../DNAMP1/ScriptObjects/SpindleCamera.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Steam.hpp | 4 +- .../DNAMP1/ScriptObjects/StreamedAudio.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Switch.hpp | 4 +- .../DNAMP1/ScriptObjects/TargetingPoint.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Thardus.hpp | 4 +- .../ScriptObjects/ThardusRockProjectile.hpp | 4 +- .../DNAMP1/ScriptObjects/ThermalHeatFader.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Timer.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Trigger.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp | 4 +- .../DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Water.hpp | 4 +- DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp | 4 +- .../DNAMP1/ScriptObjects/WorldLightFader.hpp | 4 +- .../DNAMP1/ScriptObjects/WorldTeleporter.hpp | 4 +- DataSpec/DNAMP1/SnowForces.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakAutoMapper.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakBall.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakCameraBob.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakGame.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakGui.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakGuiColors.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp | 4 +- .../DNAMP1/Tweaks/CTweakPlayerControl.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakPlayerGun.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp | 4 +- DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp | 4 +- DataSpec/DNAMP2/AFSM.hpp | 4 +- DataSpec/DNAMP2/AGSC.hpp | 4 +- DataSpec/DNAMP2/ANCS.hpp | 4 +- DataSpec/DNAMP2/ANIM.hpp | 4 +- DataSpec/DNAMP2/CINF.hpp | 4 +- DataSpec/DNAMP2/CMDL.hpp | 4 +- DataSpec/DNAMP2/CMDLMaterials.hpp | 4 +- DataSpec/DNAMP2/CSKR.hpp | 4 +- DataSpec/DNAMP2/DNAMP2.hpp | 4 +- DataSpec/DNAMP2/DeafBabe.hpp | 4 +- DataSpec/DNAMP2/MAPA.hpp | 4 +- DataSpec/DNAMP2/MAPU.hpp | 4 +- DataSpec/DNAMP2/MLVL.hpp | 4 +- DataSpec/DNAMP2/MREA.hpp | 4 +- DataSpec/DNAMP2/PAK.hpp | 4 +- DataSpec/DNAMP2/PTLA.hpp | 4 +- DataSpec/DNAMP2/SAVW.hpp | 4 +- DataSpec/DNAMP2/STRG.hpp | 4 +- DataSpec/DNAMP3/ANIM.hpp | 4 +- DataSpec/DNAMP3/CAUD.hpp | 4 +- DataSpec/DNAMP3/CHAR.hpp | 4 +- DataSpec/DNAMP3/CINF.hpp | 4 +- DataSpec/DNAMP3/CMDL.hpp | 4 +- DataSpec/DNAMP3/CMDLMaterials.hpp | 4 +- DataSpec/DNAMP3/CSKR.hpp | 4 +- DataSpec/DNAMP3/DNAMP3.hpp | 4 +- DataSpec/DNAMP3/HINT.hpp | 4 +- DataSpec/DNAMP3/MAPA.hpp | 4 +- DataSpec/DNAMP3/MLVL.hpp | 4 +- DataSpec/DNAMP3/MREA.hpp | 4 +- DataSpec/DNAMP3/PAK.hpp | 4 +- DataSpec/DNAMP3/SAVW.hpp | 4 +- DataSpec/DNAMP3/STRG.hpp | 4 +- DataSpec/SpecBase.hpp | 4 +- Editor/Camera.hpp | 4 +- Editor/GameMode.hpp | 4 +- Editor/InformationCenter.hpp | 4 +- Editor/ModelViewer.hpp | 4 +- Editor/ParticleEditor.hpp | 4 +- Editor/ProjectManager.hpp | 4 +- Editor/ProjectResourceFactoryBase.hpp | 4 +- Editor/ProjectResourceFactoryMP1.hpp | 4 +- Editor/Resource.hpp | 4 +- Editor/ResourceBrowser.hpp | 4 +- Editor/Space.hpp | 4 +- Editor/SplashScreen.hpp | 4 +- Editor/ViewManager.hpp | 4 +- Editor/badging/Badging.hpp | 4 +- Editor/icons/icons.hpp | 4 +- Editor/locale | 2 +- NESEmulator/CNESEmulator.hpp | 4 +- NESEmulator/CNESShader.hpp | 4 +- Runtime/Audio/CAudioGroupSet.hpp | 4 +- Runtime/Audio/CAudioSys.hpp | 4 +- Runtime/Audio/CMidiManager.hpp | 4 +- Runtime/Audio/CSfxManager.hpp | 4 +- Runtime/Audio/CStaticAudioPlayer.hpp | 4 +- Runtime/Audio/CStreamAudioManager.hpp | 4 +- Runtime/AutoMapper/CAutoMapper.hpp | 4 +- Runtime/AutoMapper/CMapArea.hpp | 4 +- Runtime/AutoMapper/CMapUniverse.hpp | 4 +- Runtime/AutoMapper/CMapWorld.hpp | 4 +- Runtime/AutoMapper/CMapWorldInfo.hpp | 4 +- Runtime/AutoMapper/CMappableObject.hpp | 4 +- Runtime/CArchitectureMessage.hpp | 4 +- Runtime/CArchitectureQueue.hpp | 4 +- Runtime/CBasics.hpp | 4 +- Runtime/CCRC32.hpp | 4 +- Runtime/CDependencyGroup.hpp | 4 +- Runtime/CDvdFile.hpp | 4 +- Runtime/CDvdRequest.hpp | 4 +- Runtime/CFactoryMgr.hpp | 4 +- Runtime/CGameAllocator.hpp | 4 +- Runtime/CGameDebug.hpp | 4 +- Runtime/CGameHintInfo.hpp | 4 +- Runtime/CGameOptions.hpp | 4 +- Runtime/CGameOptionsTouchBar.hpp | 4 +- Runtime/CGameState.hpp | 4 +- Runtime/CIOWin.hpp | 4 +- Runtime/CIOWinManager.hpp | 4 +- Runtime/CInGameTweakManagerBase.hpp | 4 +- Runtime/CMFGameBase.hpp | 4 +- Runtime/CMainFlowBase.hpp | 4 +- Runtime/CMemoryCardSys.hpp | 4 +- Runtime/CObjectList.hpp | 4 +- Runtime/CPakFile.hpp | 4 +- Runtime/CPlayMovieBase.hpp | 4 +- Runtime/CPlayerState.hpp | 4 +- Runtime/CRandom16.hpp | 4 +- Runtime/CRelayTracker.hpp | 4 +- Runtime/CResFactory.hpp | 4 +- Runtime/CResLoader.hpp | 4 +- Runtime/CSaveWorld.hpp | 4 +- Runtime/CScannableObjectInfo.hpp | 4 +- Runtime/CSimplePool.hpp | 4 +- Runtime/CSortedLists.hpp | 4 +- Runtime/CStateManager.hpp | 4 +- Runtime/CStaticInterference.hpp | 4 +- Runtime/CStopwatch.hpp | 4 +- Runtime/CStringExtras.hpp | 4 +- Runtime/CTimeProvider.hpp | 4 +- Runtime/CToken.hpp | 4 +- Runtime/Camera/CBallCamera.hpp | 4 +- Runtime/Camera/CCameraFilter.hpp | 4 +- Runtime/Camera/CCameraManager.hpp | 4 +- Runtime/Camera/CCameraShakeData.hpp | 4 +- Runtime/Camera/CCameraSpline.hpp | 4 +- Runtime/Camera/CCinematicCamera.hpp | 4 +- Runtime/Camera/CFirstPersonCamera.hpp | 4 +- Runtime/Camera/CGameCamera.hpp | 4 +- Runtime/Camera/CInterpolationCamera.hpp | 4 +- Runtime/Camera/CPathCamera.hpp | 4 +- Runtime/Character/CActorLights.hpp | 4 +- Runtime/Character/CAdditiveAnimPlayback.hpp | 4 +- Runtime/Character/CAdditiveBodyState.hpp | 4 +- Runtime/Character/CAllFormatsAnimSource.hpp | 4 +- Runtime/Character/CAnimCharacterSet.hpp | 4 +- Runtime/Character/CAnimData.hpp | 4 +- Runtime/Character/CAnimPOIData.hpp | 4 +- Runtime/Character/CAnimPerSegmentData.hpp | 4 +- Runtime/Character/CAnimPlaybackParms.hpp | 4 +- Runtime/Character/CAnimSource.hpp | 4 +- Runtime/Character/CAnimSourceReader.hpp | 4 +- Runtime/Character/CAnimSysContext.hpp | 4 +- .../CAnimTreeAnimReaderContainer.hpp | 4 +- Runtime/Character/CAnimTreeBlend.hpp | 4 +- Runtime/Character/CAnimTreeDoubleChild.hpp | 4 +- Runtime/Character/CAnimTreeLoopIn.hpp | 4 +- Runtime/Character/CAnimTreeNode.hpp | 4 +- Runtime/Character/CAnimTreeSequence.hpp | 4 +- Runtime/Character/CAnimTreeSingleChild.hpp | 4 +- Runtime/Character/CAnimTreeTimeScale.hpp | 4 +- Runtime/Character/CAnimTreeTransition.hpp | 4 +- Runtime/Character/CAnimTreeTweenBase.hpp | 4 +- Runtime/Character/CAnimation.hpp | 4 +- Runtime/Character/CAnimationDatabase.hpp | 4 +- Runtime/Character/CAnimationDatabaseGame.hpp | 4 +- Runtime/Character/CAnimationManager.hpp | 4 +- Runtime/Character/CAnimationSet.hpp | 4 +- Runtime/Character/CAssetFactory.hpp | 4 +- Runtime/Character/CBodyController.hpp | 4 +- Runtime/Character/CBodyState.hpp | 4 +- Runtime/Character/CBodyStateCmdMgr.hpp | 4 +- Runtime/Character/CBodyStateInfo.hpp | 4 +- Runtime/Character/CBoolPOINode.hpp | 4 +- Runtime/Character/CCharAnimTime.hpp | 4 +- Runtime/Character/CCharLayoutInfo.hpp | 4 +- Runtime/Character/CCharacterFactory.hpp | 4 +- Runtime/Character/CCharacterInfo.hpp | 4 +- Runtime/Character/CCharacterSet.hpp | 4 +- Runtime/Character/CEffectComponent.hpp | 4 +- Runtime/Character/CFBStreamedAnimReader.hpp | 4 +- Runtime/Character/CFBStreamedCompression.hpp | 4 +- Runtime/Character/CGroundMovement.hpp | 4 +- Runtime/Character/CHalfTransition.hpp | 4 +- Runtime/Character/CHierarchyPoseBuilder.hpp | 4 +- Runtime/Character/CIkChain.hpp | 4 +- Runtime/Character/CInt32POINode.hpp | 4 +- Runtime/Character/CLayoutDescription.hpp | 4 +- Runtime/Character/CMetaAnimBlend.hpp | 4 +- Runtime/Character/CMetaAnimFactory.hpp | 4 +- Runtime/Character/CMetaAnimPhaseBlend.hpp | 4 +- Runtime/Character/CMetaAnimPlay.hpp | 4 +- Runtime/Character/CMetaAnimRandom.hpp | 4 +- Runtime/Character/CMetaAnimSequence.hpp | 4 +- Runtime/Character/CMetaTransFactory.hpp | 4 +- Runtime/Character/CMetaTransMetaAnim.hpp | 4 +- Runtime/Character/CMetaTransPhaseTrans.hpp | 4 +- Runtime/Character/CMetaTransSnap.hpp | 4 +- Runtime/Character/CMetaTransTrans.hpp | 4 +- Runtime/Character/CModelData.hpp | 4 +- Runtime/Character/CPASAnimInfo.hpp | 4 +- Runtime/Character/CPASAnimParm.hpp | 4 +- Runtime/Character/CPASAnimParmData.hpp | 4 +- Runtime/Character/CPASAnimState.hpp | 4 +- Runtime/Character/CPASDatabase.hpp | 4 +- Runtime/Character/CPASParmInfo.hpp | 4 +- Runtime/Character/CPOINode.hpp | 4 +- Runtime/Character/CParticleData.hpp | 4 +- Runtime/Character/CParticleDatabase.hpp | 4 +- Runtime/Character/CParticleGenInfo.hpp | 4 +- Runtime/Character/CParticlePOINode.hpp | 4 +- Runtime/Character/CPoseAsTransforms.hpp | 4 +- Runtime/Character/CPrimitive.hpp | 4 +- Runtime/Character/CSegId.hpp | 4 +- Runtime/Character/CSegIdList.hpp | 4 +- Runtime/Character/CSegStatementSet.hpp | 4 +- Runtime/Character/CSequenceHelper.hpp | 4 +- Runtime/Character/CSkinBank.hpp | 4 +- Runtime/Character/CSkinRules.hpp | 4 +- Runtime/Character/CSoundPOINode.hpp | 4 +- Runtime/Character/CSteeringBehaviors.hpp | 4 +- Runtime/Character/CTimeScaleFunctions.hpp | 4 +- Runtime/Character/CTransition.hpp | 4 +- Runtime/Character/CTransitionDatabase.hpp | 4 +- Runtime/Character/CTransitionDatabaseGame.hpp | 4 +- Runtime/Character/CTransitionManager.hpp | 4 +- Runtime/Character/CTreeUtils.hpp | 4 +- Runtime/Character/CharacterCommon.hpp | 4 +- Runtime/Character/IAnimReader.hpp | 4 +- Runtime/Character/IMetaAnim.hpp | 4 +- Runtime/Character/IMetaTrans.hpp | 4 +- .../Character/IVaryingAnimationTimeScale.hpp | 4 +- Runtime/Character/TSegIdMap.hpp | 4 +- Runtime/Collision/CAABoxFilter.hpp | 4 +- Runtime/Collision/CAreaOctTree.hpp | 4 +- Runtime/Collision/CBallFilter.hpp | 4 +- Runtime/Collision/CCollidableAABox.hpp | 4 +- .../Collision/CCollidableCollisionSurface.hpp | 4 +- Runtime/Collision/CCollidableOBBTree.hpp | 4 +- Runtime/Collision/CCollidableOBBTreeGroup.hpp | 4 +- Runtime/Collision/CCollidableSphere.hpp | 4 +- Runtime/Collision/CCollisionActor.hpp | 4 +- Runtime/Collision/CCollisionActorManager.hpp | 4 +- Runtime/Collision/CCollisionEdge.hpp | 4 +- Runtime/Collision/CCollisionInfo.hpp | 4 +- Runtime/Collision/CCollisionInfoList.hpp | 4 +- Runtime/Collision/CCollisionPrimitive.hpp | 4 +- Runtime/Collision/CCollisionResponseData.hpp | 4 +- Runtime/Collision/CCollisionSurface.hpp | 4 +- Runtime/Collision/CGameCollision.hpp | 4 +- .../Collision/CInternalRayCastStructure.hpp | 4 +- .../Collision/CJointCollisionDescription.hpp | 4 +- Runtime/Collision/CMaterialFilter.hpp | 4 +- Runtime/Collision/CMaterialList.hpp | 4 +- Runtime/Collision/CMetroidAreaCollider.hpp | 4 +- Runtime/Collision/COBBTree.hpp | 4 +- Runtime/Collision/CRayCastResult.hpp | 4 +- Runtime/Collision/CollisionUtil.hpp | 4 +- Runtime/Collision/ICollisionFilter.hpp | 4 +- Runtime/Collision/InternalColliders.hpp | 4 +- Runtime/GCNTypes.hpp | 4 +- Runtime/GameGlobalObjects.hpp | 4 +- Runtime/GameObjectLists.hpp | 4 +- Runtime/Graphics/CBooRenderer.hpp | 4 +- Runtime/Graphics/CDrawable.hpp | 4 +- Runtime/Graphics/CDrawablePlaneObject.hpp | 4 +- Runtime/Graphics/CGraphics.hpp | 4 +- Runtime/Graphics/CGraphicsPalette.hpp | 4 +- Runtime/Graphics/CLight.hpp | 4 +- Runtime/Graphics/CLineRenderer.hpp | 4 +- Runtime/Graphics/CMetroidModelInstance.hpp | 4 +- Runtime/Graphics/CModel.hpp | 4 +- Runtime/Graphics/CMoviePlayer.hpp | 4 +- Runtime/Graphics/CPVSAreaSet.hpp | 4 +- Runtime/Graphics/CPVSVisOctree.hpp | 4 +- Runtime/Graphics/CPVSVisSet.hpp | 4 +- Runtime/Graphics/CRainSplashGenerator.hpp | 4 +- Runtime/Graphics/CSimpleShadow.hpp | 4 +- Runtime/Graphics/CSkinnedModel.hpp | 4 +- Runtime/Graphics/CTexture.hpp | 4 +- Runtime/Graphics/CVertexMorphEffect.hpp | 4 +- Runtime/Graphics/IRenderer.hpp | 4 +- Runtime/Graphics/IWeaponRenderer.hpp | 4 +- Runtime/Graphics/Shaders/CAABoxShader.hpp | 4 +- .../Graphics/Shaders/CCameraBlurFilter.hpp | 4 +- .../Graphics/Shaders/CColoredQuadFilter.hpp | 4 +- Runtime/Graphics/Shaders/CDecalShaders.hpp | 4 +- .../Graphics/Shaders/CElementGenShaders.hpp | 4 +- Runtime/Graphics/Shaders/CEnergyBarShader.hpp | 4 +- .../Graphics/Shaders/CFluidPlaneShader.hpp | 4 +- .../Shaders/CFluidPlaneShaderGLSL.cpp | 958 ------------------ .../Shaders/CFluidPlaneShaderHLSL.cpp | 791 --------------- .../Shaders/CFluidPlaneShaderMetal.cpp | 799 --------------- Runtime/Graphics/Shaders/CFogVolumeFilter.hpp | 4 +- .../Shaders/CFogVolumePlaneShader.hpp | 4 +- .../Graphics/Shaders/CLineRendererShaders.hpp | 4 +- .../Graphics/Shaders/CMapSurfaceShader.hpp | 4 +- Runtime/Graphics/Shaders/CModelShaders.hpp | 4 +- .../Shaders/CParticleSwooshShaders.hpp | 4 +- .../Graphics/Shaders/CPhazonSuitFilter.hpp | 4 +- .../Graphics/Shaders/CRadarPaintShader.hpp | 4 +- .../Graphics/Shaders/CRandomStaticFilter.hpp | 4 +- Runtime/Graphics/Shaders/CScanLinesFilter.hpp | 4 +- Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp | 4 +- .../Graphics/Shaders/CTextSupportShader.hpp | 4 +- .../Graphics/Shaders/CTexturedQuadFilter.hpp | 4 +- .../Graphics/Shaders/CThermalColdFilter.hpp | 4 +- .../Graphics/Shaders/CThermalHotFilter.hpp | 4 +- .../Graphics/Shaders/CWorldShadowShader.hpp | 4 +- Runtime/Graphics/Shaders/CXRayBlurFilter.hpp | 4 +- Runtime/GuiSys/CAuiEnergyBarT01.hpp | 4 +- Runtime/GuiSys/CAuiImagePane.hpp | 4 +- Runtime/GuiSys/CAuiMeter.hpp | 4 +- Runtime/GuiSys/CCompoundTargetReticle.hpp | 4 +- Runtime/GuiSys/CConsoleOutputWindow.hpp | 4 +- Runtime/GuiSys/CDrawStringOptions.hpp | 4 +- Runtime/GuiSys/CErrorOutputWindow.hpp | 4 +- Runtime/GuiSys/CFontImageDef.hpp | 4 +- Runtime/GuiSys/CFontRenderState.hpp | 4 +- Runtime/GuiSys/CGuiCamera.hpp | 4 +- Runtime/GuiSys/CGuiCompoundWidget.hpp | 4 +- Runtime/GuiSys/CGuiFrame.hpp | 4 +- Runtime/GuiSys/CGuiGroup.hpp | 4 +- Runtime/GuiSys/CGuiHeadWidget.hpp | 4 +- Runtime/GuiSys/CGuiLight.hpp | 4 +- Runtime/GuiSys/CGuiModel.hpp | 4 +- Runtime/GuiSys/CGuiObject.hpp | 4 +- Runtime/GuiSys/CGuiPane.hpp | 4 +- Runtime/GuiSys/CGuiSliderGroup.hpp | 4 +- Runtime/GuiSys/CGuiSys.hpp | 4 +- Runtime/GuiSys/CGuiTableGroup.hpp | 4 +- Runtime/GuiSys/CGuiTextPane.hpp | 4 +- Runtime/GuiSys/CGuiTextSupport.hpp | 4 +- Runtime/GuiSys/CGuiWidget.hpp | 4 +- Runtime/GuiSys/CGuiWidgetDrawParms.hpp | 4 +- Runtime/GuiSys/CGuiWidgetIdDB.hpp | 4 +- Runtime/GuiSys/CHudBallInterface.hpp | 4 +- Runtime/GuiSys/CHudBossEnergyInterface.hpp | 4 +- Runtime/GuiSys/CHudDecoInterface.hpp | 4 +- Runtime/GuiSys/CHudEnergyInterface.hpp | 4 +- Runtime/GuiSys/CHudFreeLookInterface.hpp | 4 +- Runtime/GuiSys/CHudHelmetInterface.hpp | 4 +- Runtime/GuiSys/CHudInterface.hpp | 4 +- Runtime/GuiSys/CHudMissileInterface.hpp | 4 +- Runtime/GuiSys/CHudRadarInterface.hpp | 4 +- Runtime/GuiSys/CHudThreatInterface.hpp | 4 +- Runtime/GuiSys/CHudVisorBeamMenu.hpp | 4 +- Runtime/GuiSys/CInstruction.hpp | 4 +- Runtime/GuiSys/COrbitPointMarker.hpp | 4 +- Runtime/GuiSys/CRasterFont.hpp | 4 +- Runtime/GuiSys/CSaveableState.hpp | 4 +- Runtime/GuiSys/CScanDisplay.hpp | 4 +- Runtime/GuiSys/CSplashScreen.hpp | 4 +- Runtime/GuiSys/CStringTable.hpp | 4 +- Runtime/GuiSys/CTargetingManager.hpp | 4 +- Runtime/GuiSys/CTextExecuteBuffer.hpp | 4 +- Runtime/GuiSys/CTextParser.hpp | 4 +- Runtime/GuiSys/CTextRenderBuffer.hpp | 4 +- Runtime/GuiSys/CWordBreakTables.hpp | 4 +- Runtime/IFactory.hpp | 4 +- Runtime/IMain.hpp | 4 +- Runtime/IOStreams.hpp | 4 +- Runtime/IObj.hpp | 4 +- Runtime/IObjFactory.hpp | 4 +- Runtime/IObjectStore.hpp | 4 +- Runtime/IRuntimeMain.hpp | 4 +- Runtime/ITweak.hpp | 4 +- Runtime/IVParamObj.hpp | 4 +- Runtime/Input/CFinalInput.hpp | 4 +- Runtime/Input/CInputGenerator.hpp | 4 +- Runtime/Input/CKeyboardMouseController.hpp | 4 +- Runtime/Input/CRumbleGenerator.hpp | 4 +- Runtime/Input/CRumbleManager.hpp | 4 +- Runtime/Input/CRumbleVoice.hpp | 4 +- Runtime/Input/ControlMapper.hpp | 4 +- Runtime/Input/IController.hpp | 4 +- Runtime/Input/RumbleFxTable.hpp | 4 +- Runtime/MP1/CArtifactDoll.hpp | 4 +- Runtime/MP1/CAudioStateWin.hpp | 4 +- Runtime/MP1/CAutoSave.hpp | 4 +- Runtime/MP1/CCredits.hpp | 4 +- Runtime/MP1/CFaceplateDecoration.hpp | 4 +- Runtime/MP1/CFrontEndUI.hpp | 4 +- Runtime/MP1/CFrontEndUITouchBar.hpp | 4 +- Runtime/MP1/CGBASupport.hpp | 4 +- Runtime/MP1/CGameCubeDoll.hpp | 4 +- Runtime/MP1/CInGameGuiManager.hpp | 4 +- Runtime/MP1/CInGameGuiManagerCommon.hpp | 4 +- Runtime/MP1/CInGameTweakManager.hpp | 4 +- Runtime/MP1/CInventoryScreen.hpp | 4 +- Runtime/MP1/CLogBookScreen.hpp | 4 +- Runtime/MP1/CMFGame.hpp | 4 +- Runtime/MP1/CMainFlow.hpp | 4 +- Runtime/MP1/CMemoryCardDriver.hpp | 4 +- Runtime/MP1/CMessageScreen.hpp | 4 +- Runtime/MP1/COptionsScreen.hpp | 4 +- Runtime/MP1/CPauseScreen.hpp | 4 +- Runtime/MP1/CPauseScreenBase.hpp | 4 +- Runtime/MP1/CPauseScreenBlur.hpp | 4 +- Runtime/MP1/CPlayMovie.hpp | 4 +- Runtime/MP1/CPlayerVisor.hpp | 4 +- Runtime/MP1/CPreFrontEnd.hpp | 4 +- Runtime/MP1/CQuitGameScreen.hpp | 4 +- Runtime/MP1/CSamusDoll.hpp | 4 +- Runtime/MP1/CSamusFaceReflection.hpp | 4 +- Runtime/MP1/CSamusHud.hpp | 4 +- Runtime/MP1/CSaveGameScreen.hpp | 4 +- Runtime/MP1/CSaveGameScreenTouchBar.hpp | 4 +- Runtime/MP1/CSlideShow.hpp | 4 +- Runtime/MP1/CSplashScreen.hpp | 4 +- Runtime/MP1/CStateSetterFlow.hpp | 4 +- Runtime/MP1/CTweaks.hpp | 4 +- Runtime/MP1/MP1.hpp | 4 +- Runtime/MP1/MP1OriginalIDs.hpp | 4 +- Runtime/MP1/World/CActorContraption.hpp | 4 +- Runtime/MP1/World/CBabygoth.hpp | 4 +- Runtime/MP1/World/CBeetle.hpp | 4 +- Runtime/MP1/World/CFlaahgraProjectile.hpp | 4 +- Runtime/MP1/World/CMetaree.hpp | 4 +- Runtime/MP1/World/CMetroid.hpp | 4 +- Runtime/MP1/World/CMetroidBeta.hpp | 4 +- Runtime/MP1/World/CMetroidPrimeExo.hpp | 4 +- Runtime/MP1/World/CMetroidPrimeProjectile.hpp | 4 +- Runtime/MP1/World/CMetroidPrimeRelay.hpp | 4 +- Runtime/MP1/World/CNewIntroBoss.hpp | 4 +- Runtime/MP1/World/CParasite.hpp | 4 +- Runtime/MP1/World/CPuddleToadGamma.hpp | 4 +- Runtime/MP1/World/CRidley.hpp | 4 +- Runtime/MP1/World/CSeedling.hpp | 4 +- Runtime/MP1/World/CSpacePirate.hpp | 4 +- Runtime/MP1/World/CThardusRockProjectile.hpp | 4 +- Runtime/MP1/World/CWarWasp.hpp | 4 +- Runtime/MkCastTo.py | 5 +- Runtime/Particle/CColorElement.hpp | 4 +- Runtime/Particle/CDecal.hpp | 4 +- Runtime/Particle/CDecalDataFactory.hpp | 4 +- Runtime/Particle/CDecalDescription.hpp | 4 +- Runtime/Particle/CDecalManager.hpp | 4 +- Runtime/Particle/CElectricDescription.hpp | 4 +- Runtime/Particle/CElementGen.hpp | 4 +- Runtime/Particle/CEmitterElement.hpp | 4 +- Runtime/Particle/CFlameWarp.hpp | 4 +- Runtime/Particle/CGenDescription.hpp | 4 +- Runtime/Particle/CIntElement.hpp | 4 +- Runtime/Particle/CModVectorElement.hpp | 4 +- Runtime/Particle/CParticleDataFactory.hpp | 4 +- Runtime/Particle/CParticleElectric.hpp | 4 +- .../Particle/CParticleElectricDataFactory.hpp | 4 +- Runtime/Particle/CParticleGen.hpp | 4 +- Runtime/Particle/CParticleGlobals.hpp | 4 +- Runtime/Particle/CParticleSwoosh.hpp | 4 +- .../Particle/CParticleSwooshDataFactory.hpp | 4 +- .../Particle/CProjectileWeaponDataFactory.hpp | 4 +- Runtime/Particle/CRealElement.hpp | 4 +- Runtime/Particle/CSpawnSystemKeyframeData.hpp | 4 +- Runtime/Particle/CSwooshDescription.hpp | 4 +- Runtime/Particle/CUVElement.hpp | 4 +- Runtime/Particle/CVectorElement.hpp | 4 +- Runtime/Particle/CWarp.hpp | 4 +- Runtime/Particle/CWeaponDescription.hpp | 4 +- Runtime/Particle/IElement.hpp | 4 +- Runtime/RetroTypes.hpp | 4 +- Runtime/Weapon/CAuxWeapon.hpp | 4 +- Runtime/Weapon/CBeamInfo.hpp | 4 +- Runtime/Weapon/CBeamProjectile.hpp | 4 +- Runtime/Weapon/CBomb.hpp | 4 +- Runtime/Weapon/CBurstFire.hpp | 4 +- Runtime/Weapon/CEnergyProjectile.hpp | 4 +- Runtime/Weapon/CFidget.hpp | 4 +- Runtime/Weapon/CFlameInfo.hpp | 4 +- Runtime/Weapon/CFlameThrower.hpp | 4 +- Runtime/Weapon/CGSComboFire.hpp | 4 +- Runtime/Weapon/CGSFidget.hpp | 4 +- Runtime/Weapon/CGSFreeLook.hpp | 4 +- Runtime/Weapon/CGameProjectile.hpp | 4 +- Runtime/Weapon/CGrappleArm.hpp | 4 +- Runtime/Weapon/CGunController.hpp | 4 +- Runtime/Weapon/CGunMotion.hpp | 4 +- Runtime/Weapon/CGunWeapon.hpp | 4 +- Runtime/Weapon/CIceBeam.hpp | 4 +- Runtime/Weapon/CNewFlameThrower.hpp | 4 +- Runtime/Weapon/CPhazonBeam.hpp | 4 +- Runtime/Weapon/CPlasmaBeam.hpp | 4 +- Runtime/Weapon/CPlasmaProjectile.hpp | 4 +- Runtime/Weapon/CPlayerGun.hpp | 4 +- Runtime/Weapon/CPowerBeam.hpp | 4 +- Runtime/Weapon/CPowerBomb.hpp | 4 +- Runtime/Weapon/CProjectileInfo.hpp | 4 +- Runtime/Weapon/CProjectileWeapon.hpp | 4 +- Runtime/Weapon/CTargetableProjectile.hpp | 4 +- Runtime/Weapon/CWaveBeam.hpp | 4 +- Runtime/Weapon/CWaveBuster.hpp | 4 +- Runtime/Weapon/CWeapon.hpp | 4 +- Runtime/Weapon/CWeaponMgr.hpp | 4 +- Runtime/Weapon/CWeaponMode.hpp | 4 +- Runtime/Weapon/WeaponCommon.hpp | 4 +- Runtime/World/CActor.hpp | 4 +- Runtime/World/CActorModelParticles.hpp | 4 +- Runtime/World/CActorParameters.hpp | 4 +- Runtime/World/CAi.hpp | 4 +- Runtime/World/CAiFuncMap.hpp | 4 +- Runtime/World/CAmbientAI.hpp | 4 +- Runtime/World/CAnimationParameters.hpp | 4 +- Runtime/World/CDamageInfo.hpp | 4 +- Runtime/World/CDamageVulnerability.hpp | 4 +- Runtime/World/CDestroyableRock.hpp | 4 +- Runtime/World/CEffect.hpp | 4 +- Runtime/World/CEnergyDrainSource.hpp | 4 +- Runtime/World/CEntity.hpp | 4 +- Runtime/World/CEntityInfo.hpp | 4 +- Runtime/World/CEnvFxManager.hpp | 4 +- Runtime/World/CExplosion.hpp | 4 +- Runtime/World/CFishCloud.hpp | 4 +- Runtime/World/CFishCloudModifier.hpp | 4 +- Runtime/World/CFluidPlane.hpp | 4 +- Runtime/World/CFluidPlaneCPU.hpp | 4 +- Runtime/World/CFluidPlaneDoor.hpp | 4 +- Runtime/World/CFluidPlaneGPU.hpp | 4 +- Runtime/World/CFluidPlaneManager.hpp | 4 +- Runtime/World/CFluidUVMotion.hpp | 4 +- Runtime/World/CGameArea.hpp | 4 +- Runtime/World/CGameLight.hpp | 4 +- Runtime/World/CGrappleParameters.hpp | 4 +- Runtime/World/CHUDBillboardEffect.hpp | 4 +- Runtime/World/CHUDMemoParms.hpp | 4 +- Runtime/World/CHealthInfo.hpp | 4 +- Runtime/World/CIceImpact.hpp | 4 +- Runtime/World/CLightParameters.hpp | 4 +- Runtime/World/CMorphBall.hpp | 4 +- Runtime/World/CMorphBallShadow.hpp | 4 +- Runtime/World/CPathFindArea.hpp | 4 +- Runtime/World/CPathFindRegion.hpp | 4 +- Runtime/World/CPathFindSearch.hpp | 4 +- Runtime/World/CPatterned.hpp | 4 +- Runtime/World/CPatternedInfo.hpp | 4 +- Runtime/World/CPhysicsActor.hpp | 4 +- Runtime/World/CPlayer.hpp | 4 +- Runtime/World/CPlayerCameraBob.hpp | 4 +- Runtime/World/CPlayerEnergyDrain.hpp | 4 +- Runtime/World/CProjectedShadow.hpp | 4 +- Runtime/World/CRepulsor.hpp | 4 +- Runtime/World/CRipple.hpp | 4 +- Runtime/World/CRippleManager.hpp | 4 +- Runtime/World/CScannableParameters.hpp | 4 +- Runtime/World/CScriptActor.hpp | 4 +- Runtime/World/CScriptActorKeyframe.hpp | 4 +- Runtime/World/CScriptActorRotate.hpp | 4 +- Runtime/World/CScriptAiJumpPoint.hpp | 4 +- Runtime/World/CScriptAreaAttributes.hpp | 4 +- Runtime/World/CScriptBallTrigger.hpp | 4 +- Runtime/World/CScriptBeam.hpp | 4 +- Runtime/World/CScriptCameraBlurKeyframe.hpp | 4 +- Runtime/World/CScriptCameraFilterKeyframe.hpp | 4 +- Runtime/World/CScriptCameraHint.hpp | 4 +- Runtime/World/CScriptCameraHintTrigger.hpp | 4 +- Runtime/World/CScriptCameraPitchVolume.hpp | 4 +- Runtime/World/CScriptCameraShaker.hpp | 4 +- Runtime/World/CScriptCameraWaypoint.hpp | 4 +- Runtime/World/CScriptColorModulate.hpp | 4 +- Runtime/World/CScriptControllerAction.hpp | 4 +- Runtime/World/CScriptCounter.hpp | 4 +- Runtime/World/CScriptCoverPoint.hpp | 4 +- Runtime/World/CScriptDamageableTrigger.hpp | 4 +- Runtime/World/CScriptDebris.hpp | 4 +- Runtime/World/CScriptDebugCameraWaypoint.hpp | 4 +- Runtime/World/CScriptDistanceFog.hpp | 4 +- Runtime/World/CScriptDock.hpp | 4 +- Runtime/World/CScriptDockAreaChange.hpp | 4 +- Runtime/World/CScriptDoor.hpp | 4 +- Runtime/World/CScriptEffect.hpp | 4 +- Runtime/World/CScriptGenerator.hpp | 4 +- Runtime/World/CScriptGrapplePoint.hpp | 4 +- Runtime/World/CScriptGunTurret.hpp | 4 +- Runtime/World/CScriptHUDMemo.hpp | 4 +- Runtime/World/CScriptMazeNode.hpp | 4 +- Runtime/World/CScriptMemoryRelay.hpp | 4 +- Runtime/World/CScriptMidi.hpp | 4 +- Runtime/World/CScriptPickup.hpp | 4 +- Runtime/World/CScriptPickupGenerator.hpp | 4 +- Runtime/World/CScriptPlatform.hpp | 4 +- Runtime/World/CScriptPlayerActor.hpp | 4 +- Runtime/World/CScriptPlayerHint.hpp | 4 +- Runtime/World/CScriptPlayerStateChange.hpp | 4 +- Runtime/World/CScriptPointOfInterest.hpp | 4 +- Runtime/World/CScriptRandomRelay.hpp | 4 +- Runtime/World/CScriptRelay.hpp | 4 +- Runtime/World/CScriptRipple.hpp | 4 +- Runtime/World/CScriptRoomAcoustics.hpp | 4 +- Runtime/World/CScriptShadowProjector.hpp | 4 +- Runtime/World/CScriptSound.hpp | 4 +- Runtime/World/CScriptSpawnPoint.hpp | 4 +- Runtime/World/CScriptSpecialFunction.hpp | 4 +- .../CScriptSpiderBallAttractionSurface.hpp | 4 +- Runtime/World/CScriptSpiderBallWaypoint.hpp | 4 +- Runtime/World/CScriptSpindleCamera.hpp | 4 +- Runtime/World/CScriptSteam.hpp | 4 +- Runtime/World/CScriptStreamedMusic.hpp | 4 +- Runtime/World/CScriptSwitch.hpp | 4 +- Runtime/World/CScriptTargetingPoint.hpp | 4 +- Runtime/World/CScriptTimer.hpp | 4 +- Runtime/World/CScriptTrigger.hpp | 4 +- Runtime/World/CScriptVisorFlare.hpp | 4 +- Runtime/World/CScriptVisorGoo.hpp | 4 +- Runtime/World/CScriptWater.hpp | 4 +- Runtime/World/CScriptWaypoint.hpp | 4 +- Runtime/World/CScriptWorldTeleporter.hpp | 4 +- Runtime/World/CSnakeWeedSwarm.hpp | 4 +- Runtime/World/CStateMachine.hpp | 4 +- Runtime/World/CTeamAiMgr.hpp | 4 +- Runtime/World/CTeamAiTypes.hpp | 4 +- Runtime/World/CVisorFlare.hpp | 4 +- Runtime/World/CVisorParameters.hpp | 4 +- Runtime/World/CWallCrawlerSwarm.hpp | 4 +- Runtime/World/CWallWalker.hpp | 4 +- Runtime/World/CWorld.hpp | 4 +- Runtime/World/CWorldLight.hpp | 4 +- Runtime/World/CWorldShadow.hpp | 4 +- Runtime/World/CWorldTransManager.hpp | 4 +- Runtime/World/IGameArea.hpp | 4 +- Runtime/World/ScriptLoader.hpp | 4 +- Runtime/World/ScriptObjectSupport.hpp | 4 +- Runtime/rstl.hpp | 4 +- amuse | 2 +- hecl | 2 +- hecl-gui | 2 +- jbus | 2 +- kabufuda | 2 +- nod | 2 +- specter | 2 +- visigen/VISIBuilder.hpp | 4 +- visigen/VISIRenderer.hpp | 4 +- 818 files changed, 815 insertions(+), 4978 deletions(-) delete mode 100644 Runtime/Graphics/Shaders/CFluidPlaneShaderGLSL.cpp delete mode 100644 Runtime/Graphics/Shaders/CFluidPlaneShaderHLSL.cpp delete mode 100644 Runtime/Graphics/Shaders/CFluidPlaneShaderMetal.cpp diff --git a/DataSpec/AssetNameMap.hpp b/DataSpec/AssetNameMap.hpp index ea15f07a4..e73bcdc46 100644 --- a/DataSpec/AssetNameMap.hpp +++ b/DataSpec/AssetNameMap.hpp @@ -1,5 +1,4 @@ -#ifndef _DATASPEC_ASSETNAMEMAP_HPP_ -#define _DATASPEC_ASSETNAMEMAP_HPP_ +#pragma once #include #include @@ -11,4 +10,3 @@ void InitAssetNameMap(); const std::string* TranslateIdToName(const UniqueID32&); const std::string* TranslateIdToName(const UniqueID64&); } -#endif // _DATASPEC_ASSETNAMEMAP_HPP_ diff --git a/DataSpec/Blender/BlenderSupport.hpp b/DataSpec/Blender/BlenderSupport.hpp index 7c1a86962..8a52bc0e4 100644 --- a/DataSpec/Blender/BlenderSupport.hpp +++ b/DataSpec/Blender/BlenderSupport.hpp @@ -1,5 +1,4 @@ -#ifndef _RETRO_BLENDER_SUPPORT_HPP_ -#define _RETRO_BLENDER_SUPPORT_HPP_ +#pragma once #include @@ -10,4 +9,3 @@ bool BuildMasterShader(const hecl::ProjectPath& path); } -#endif // _RETRO_BLENDER_SUPPORT_HPP_ diff --git a/DataSpec/DNACommon/ANCS.hpp b/DataSpec/DNACommon/ANCS.hpp index 4147d3c6b..380f175a5 100644 --- a/DataSpec/DNACommon/ANCS.hpp +++ b/DataSpec/DNACommon/ANCS.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_ANCS_HPP_ -#define _DNACOMMON_ANCS_HPP_ +#pragma once #include #include "DNACommon.hpp" @@ -44,4 +43,3 @@ bool ReadANCSToBlender(hecl::blender::Connection& conn, } -#endif // _DNACOMMON_ANCS_HPP_ diff --git a/DataSpec/DNACommon/ANIM.hpp b/DataSpec/DNACommon/ANIM.hpp index a81941b63..444d5a024 100644 --- a/DataSpec/DNACommon/ANIM.hpp +++ b/DataSpec/DNACommon/ANIM.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_ANIMBITSTREAM_HPP_ -#define _DNACOMMON_ANIMBITSTREAM_HPP_ +#pragma once #include "DNACommon.hpp" #include @@ -99,4 +98,3 @@ public: } -#endif // _DNACOMMON_ANIMBITSTREAM_HPP_ diff --git a/DataSpec/DNACommon/AROTBuilder.hpp b/DataSpec/DNACommon/AROTBuilder.hpp index e81592c07..da8bac3e5 100644 --- a/DataSpec/DNACommon/AROTBuilder.hpp +++ b/DataSpec/DNACommon/AROTBuilder.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_AROTBUILDER_HPP_ -#define _DNACOMMON_AROTBUILDER_HPP_ +#pragma once #include "DNACommon.hpp" #include "DeafBabe.hpp" @@ -59,4 +58,3 @@ struct AROTBuilder } -#endif // _DNACOMMON_AROTBUILDER_HPP_ diff --git a/DataSpec/DNACommon/ATBL.hpp b/DataSpec/DNACommon/ATBL.hpp index 165a5fb0d..42bdf1863 100644 --- a/DataSpec/DNACommon/ATBL.hpp +++ b/DataSpec/DNACommon/ATBL.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_ATBL_HPP_ -#define _DNACOMMON_ATBL_HPP_ +#pragma once #include "DNACommon.hpp" #include "PAK.hpp" @@ -16,4 +15,3 @@ public: } -#endif // _DNACOMMON_ATBL_HPP_ diff --git a/DataSpec/DNACommon/BabeDead.hpp b/DataSpec/DNACommon/BabeDead.hpp index eeabce0b2..49e00ffa1 100644 --- a/DataSpec/DNACommon/BabeDead.hpp +++ b/DataSpec/DNACommon/BabeDead.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_BABEDEAD_HPP_ -#define _DNACOMMON_BABEDEAD_HPP_ +#pragma once #include "zeus/Math.hpp" #include "hecl/hecl.hpp" @@ -17,4 +16,3 @@ void WriteBabeDeadLightFromBlender(BabeDeadLight& lightOut, const hecl::blender: } -#endif // _DNACOMMON_BABEDEAD_HPP_ diff --git a/DataSpec/DNACommon/CMDL.hpp b/DataSpec/DNACommon/CMDL.hpp index 768a2278d..fa5a43af7 100644 --- a/DataSpec/DNACommon/CMDL.hpp +++ b/DataSpec/DNACommon/CMDL.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_CMDL_HPP_ -#define _DNACOMMON_CMDL_HPP_ +#pragma once #include "athena/FileWriter.hpp" #include "hecl/Frontend.hpp" @@ -179,4 +178,3 @@ bool WriteHMDLMREASecs(std::vector>& secsOut, const hecl::P } -#endif // _DNACOMMON_CMDL_HPP_ diff --git a/DataSpec/DNACommon/CRSC.hpp b/DataSpec/DNACommon/CRSC.hpp index d3d899861..6c0c7223f 100644 --- a/DataSpec/DNACommon/CRSC.hpp +++ b/DataSpec/DNACommon/CRSC.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_CRSC_HPP__ -#define __COMMON_CRSC_HPP__ +#pragma once #include "ParticleCommon.hpp" #include "PAK.hpp" @@ -29,4 +28,3 @@ bool ExtractCRSM(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath); template bool WriteCRSM(const CRSM& crsm, const hecl::ProjectPath& outPath); } -#endif // __COMMON_CRSC_HPP__ diff --git a/DataSpec/DNACommon/DGRP.hpp b/DataSpec/DNACommon/DGRP.hpp index 28c7de8fb..5c3ee9074 100644 --- a/DataSpec/DNACommon/DGRP.hpp +++ b/DataSpec/DNACommon/DGRP.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_DGRP_HPP__ -#define __COMMON_DGRP_HPP__ +#pragma once #include "DNACommon.hpp" #include "PAK.hpp" @@ -48,4 +47,3 @@ bool WriteDGRP(const DGRP& dgrp, const hecl::ProjectPath& outPath); } -#endif // __COMMON_DGRP_HPP__ diff --git a/DataSpec/DNACommon/DNACommon.hpp b/DataSpec/DNACommon/DNACommon.hpp index b431f2431..805d8880b 100644 --- a/DataSpec/DNACommon/DNACommon.hpp +++ b/DataSpec/DNACommon/DNACommon.hpp @@ -1,5 +1,4 @@ -#ifndef __DNA_COMMON_HPP__ -#define __DNA_COMMON_HPP__ +#pragma once #include #include "logvisor/logvisor.hpp" @@ -462,4 +461,3 @@ struct hash }; } -#endif // __DNA_COMMON_HPP__ diff --git a/DataSpec/DNACommon/DPSC.hpp b/DataSpec/DNACommon/DPSC.hpp index ea4542c72..2bb59763d 100644 --- a/DataSpec/DNACommon/DPSC.hpp +++ b/DataSpec/DNACommon/DPSC.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_DPSC_HPP__ -#define __COMMON_DPSC_HPP__ +#pragma once #include "ParticleCommon.hpp" #include "PAK.hpp" @@ -55,4 +54,3 @@ bool WriteDPSM(const DPSM& dpsm, const hecl::ProjectPath& outPath); } -#endif // __COMMON_DPSC_HPP__ diff --git a/DataSpec/DNACommon/DeafBabe.hpp b/DataSpec/DNACommon/DeafBabe.hpp index b81ecb2df..bd802bf53 100644 --- a/DataSpec/DNACommon/DeafBabe.hpp +++ b/DataSpec/DNACommon/DeafBabe.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_DEAFBABE_HPP_ -#define _DNACOMMON_DEAFBABE_HPP_ +#pragma once #include "DNACommon.hpp" @@ -21,4 +20,3 @@ void DeafBabeBuildFromBlender(DEAFBABE& db, const hecl::blender::ColMesh& colMes } -#endif // _DNACOMMON_DEAFBABE_HPP_ diff --git a/DataSpec/DNACommon/EGMC.hpp b/DataSpec/DNACommon/EGMC.hpp index 0a02ebb88..d0bba8134 100644 --- a/DataSpec/DNACommon/EGMC.hpp +++ b/DataSpec/DNACommon/EGMC.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_EGMC_HPP_ -#define _DNACOMMON_EGMC_HPP_ +#pragma once #include "DNACommon.hpp" @@ -20,4 +19,3 @@ struct EGMC : public BigDNA Vector objects; }; } -#endif // _DNACOMMON_EGMC_HPP_ diff --git a/DataSpec/DNACommon/ELSC.hpp b/DataSpec/DNACommon/ELSC.hpp index c8a85e086..8eee8563a 100644 --- a/DataSpec/DNACommon/ELSC.hpp +++ b/DataSpec/DNACommon/ELSC.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_ELSC_HPP__ -#define __COMMON_ELSC_HPP__ +#pragma once #include "ParticleCommon.hpp" #include "PAK.hpp" @@ -43,4 +42,3 @@ template bool WriteELSM(const ELSM& elsm, const hecl::ProjectPath& outPath); } -#endif // __COMMON_ELSC_HPP__ diff --git a/DataSpec/DNACommon/FONT.hpp b/DataSpec/DNACommon/FONT.hpp index 5bad8ed66..d011907e1 100644 --- a/DataSpec/DNACommon/FONT.hpp +++ b/DataSpec/DNACommon/FONT.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_FONT_HPP__ -#define __COMMON_FONT_HPP__ +#pragma once #include "PAK.hpp" #include "athena/FileWriter.hpp" @@ -125,4 +124,3 @@ bool WriteFONT(const FONT& font, const hecl::ProjectPath& outPath); } -#endif // __COMMON_FONT_HPP__ diff --git a/DataSpec/DNACommon/FSM2.hpp b/DataSpec/DNACommon/FSM2.hpp index 50e772158..244a6ff5b 100644 --- a/DataSpec/DNACommon/FSM2.hpp +++ b/DataSpec/DNACommon/FSM2.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_FSM2_HPP__ -#define __COMMON_FSM2_HPP__ +#pragma once #include "PAK.hpp" #include "DNACommon.hpp" @@ -153,4 +152,3 @@ template bool WriteFSM2(const FSM2& fsm2, const hecl::ProjectPath& outPath); } -#endif // __COMMON_FSM2_HPP__ diff --git a/DataSpec/DNACommon/GX.hpp b/DataSpec/DNACommon/GX.hpp index c546a217e..688578993 100644 --- a/DataSpec/DNACommon/GX.hpp +++ b/DataSpec/DNACommon/GX.hpp @@ -1,7 +1,5 @@ -#ifndef _DNACOMMON_GX_HPP_ -#define _DNACOMMON_GX_HPP_ +#pragma once #include "hecl/Backend/GX.hpp" using GX = hecl::Backend::GX; -#endif // _DNACOMMON_GX_HPP_ diff --git a/DataSpec/DNACommon/MAPA.hpp b/DataSpec/DNACommon/MAPA.hpp index 1ce1fb039..e5dcf3871 100644 --- a/DataSpec/DNACommon/MAPA.hpp +++ b/DataSpec/DNACommon/MAPA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_MAPA_HPP__ -#define __DNACOMMON_MAPA_HPP__ +#pragma once #include "DNACommon.hpp" #include "GX.hpp" @@ -191,4 +190,3 @@ bool Cook(const hecl::blender::MapArea& mapa, const hecl::ProjectPath& out); } -#endif // __DNACOMMON_MAPA_HPP__ diff --git a/DataSpec/DNACommon/MAPU.hpp b/DataSpec/DNACommon/MAPU.hpp index a9b4442b1..2ef725712 100644 --- a/DataSpec/DNACommon/MAPU.hpp +++ b/DataSpec/DNACommon/MAPU.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_MAPU_HPP__ -#define __DNACOMMON_MAPU_HPP__ +#pragma once #include "DNACommon.hpp" @@ -42,4 +41,3 @@ bool ReadMAPUToBlender(hecl::blender::Connection& conn, } -#endif // __DNACOMMON_MAPU_HPP__ diff --git a/DataSpec/DNACommon/MLVL.hpp b/DataSpec/DNACommon/MLVL.hpp index 76c30400c..5fce304e1 100644 --- a/DataSpec/DNACommon/MLVL.hpp +++ b/DataSpec/DNACommon/MLVL.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_MLVL_HPP__ -#define __DNACOMMON_MLVL_HPP__ +#pragma once #include "DNACommon.hpp" #include "zeus/CVector3f.hpp" @@ -18,4 +17,3 @@ bool ReadMLVLToBlender(hecl::blender::Connection& conn, } -#endif // __DNACOMMON_MLVL_HPP__ diff --git a/DataSpec/DNACommon/OBBTreeBuilder.hpp b/DataSpec/DNACommon/OBBTreeBuilder.hpp index 4c0c159cd..b33c6d869 100644 --- a/DataSpec/DNACommon/OBBTreeBuilder.hpp +++ b/DataSpec/DNACommon/OBBTreeBuilder.hpp @@ -1,5 +1,4 @@ -#ifndef DNACOMMON_OBBTREEBUILDER_HPP -#define DNACOMMON_OBBTREEBUILDER_HPP +#pragma once #include "DNACommon.hpp" @@ -15,4 +14,3 @@ struct OBBTreeBuilder } -#endif // DNACOMMON_OBBTREEBUILDER_HPP diff --git a/DataSpec/DNACommon/PAK.hpp b/DataSpec/DNACommon/PAK.hpp index 4ab7c3375..46a6eb5d9 100644 --- a/DataSpec/DNACommon/PAK.hpp +++ b/DataSpec/DNACommon/PAK.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_PAK_HPP__ -#define __DNACOMMON_PAK_HPP__ +#pragma once #include "DNACommon.hpp" #include "boo/ThreadLocalPtr.hpp" @@ -239,4 +238,3 @@ public: } -#endif // __DNACOMMON_PAK_HPP__ diff --git a/DataSpec/DNACommon/PART.hpp b/DataSpec/DNACommon/PART.hpp index 2cb666ba2..9d0da1c5c 100644 --- a/DataSpec/DNACommon/PART.hpp +++ b/DataSpec/DNACommon/PART.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_PART_HPP__ -#define __COMMON_PART_HPP__ +#pragma once #include "ParticleCommon.hpp" #include "PAK.hpp" @@ -115,4 +114,3 @@ bool WriteGPSM(const GPSM& gpsm, const hecl::ProjectPath& outPath); } -#endif // __COMMON_PART_HPP__ diff --git a/DataSpec/DNACommon/ParticleCommon.hpp b/DataSpec/DNACommon/ParticleCommon.hpp index 069fa8dbb..72d812123 100644 --- a/DataSpec/DNACommon/ParticleCommon.hpp +++ b/DataSpec/DNACommon/ParticleCommon.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_PARTICLECOMMON_HPP__ -#define __COMMON_PARTICLECOMMON_HPP__ +#pragma once #include "DNACommon.hpp" @@ -902,4 +901,3 @@ struct ChildResourceFactory : BigDNA } -#endif // __COMMON_PARTICLECOMMON_HPP__ diff --git a/DataSpec/DNACommon/RigInverter.hpp b/DataSpec/DNACommon/RigInverter.hpp index bb59ebcb5..26288d30d 100644 --- a/DataSpec/DNACommon/RigInverter.hpp +++ b/DataSpec/DNACommon/RigInverter.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_RIGINVERTER_HPP__ -#define __COMMON_RIGINVERTER_HPP__ +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/CMatrix3f.hpp" @@ -43,4 +42,3 @@ public: } -#endif // __COMMON_RIGINVERTER_HPP__ diff --git a/DataSpec/DNACommon/SAVWCommon.hpp b/DataSpec/DNACommon/SAVWCommon.hpp index b1f7b5e91..ac77430ee 100644 --- a/DataSpec/DNACommon/SAVWCommon.hpp +++ b/DataSpec/DNACommon/SAVWCommon.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_SAVWCOMMON_HPP__ -#define __COMMON_SAVWCOMMON_HPP__ +#pragma once #include "DNACommon.hpp" #include "PAK.hpp" @@ -51,4 +50,3 @@ static bool ExtractSAVW(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath } -#endif // __COMMON_SAVWCOMMON_HPP__ diff --git a/DataSpec/DNACommon/STRG.hpp b/DataSpec/DNACommon/STRG.hpp index 6c3de450c..721c036c7 100644 --- a/DataSpec/DNACommon/STRG.hpp +++ b/DataSpec/DNACommon/STRG.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_STRG_HPP__ -#define __COMMON_STRG_HPP__ +#pragma once #include #include @@ -26,4 +25,3 @@ std::unique_ptr LoadSTRG(athena::io::IStreamReader& reader); } -#endif // __COMMON_STRG_HPP__ diff --git a/DataSpec/DNACommon/SWHC.hpp b/DataSpec/DNACommon/SWHC.hpp index 1a1085f4a..8ada3c9f3 100644 --- a/DataSpec/DNACommon/SWHC.hpp +++ b/DataSpec/DNACommon/SWHC.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_SWHC_HPP__ -#define __COMMON_SWHC_HPP__ +#pragma once #include "ParticleCommon.hpp" #include "PAK.hpp" @@ -56,4 +55,3 @@ bool ExtractSWSH(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath); template bool WriteSWSH(const SWSH& gpsm, const hecl::ProjectPath& outPath); } -#endif // __COMMON_SWHC_HPP__ diff --git a/DataSpec/DNACommon/TXTR.hpp b/DataSpec/DNACommon/TXTR.hpp index 40621ca21..5877894eb 100644 --- a/DataSpec/DNACommon/TXTR.hpp +++ b/DataSpec/DNACommon/TXTR.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_TXTR_HPP__ -#define __DNACOMMON_TXTR_HPP__ +#pragma once #include "DNACommon.hpp" @@ -16,4 +15,3 @@ struct TXTR } -#endif // __DNACOMMON_TXTR_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweak.hpp b/DataSpec/DNACommon/Tweaks/ITweak.hpp index 5e981e0ff..105914272 100644 --- a/DataSpec/DNACommon/Tweaks/ITweak.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweak.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAK_HPP__ -#define __DNACOMMON_ITWEAK_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" @@ -16,4 +15,3 @@ struct ITweak : BigDNA }; } -#endif // __DNACOMMON_ITWEAK_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakAutoMapper.hpp b/DataSpec/DNACommon/Tweaks/ITweakAutoMapper.hpp index 1105dea59..dcdc3dc22 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakAutoMapper.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakAutoMapper.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKAUTOMAPPER_HPP__ -#define __DNACOMMON_ITWEAKAUTOMAPPER_HPP__ +#pragma once #include "ITweak.hpp" @@ -66,4 +65,3 @@ struct ITweakAutoMapper : public ITweak } -#endif // __DNACOMMON_ITWEAKAUTOMAPPER_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakBall.hpp b/DataSpec/DNACommon/Tweaks/ITweakBall.hpp index 5b9f48f10..66f965550 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakBall.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakBall.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKBALL_HPP__ -#define __DNACOMMON_ITWEAKBALL_HPP__ +#pragma once #include "ITweak.hpp" @@ -71,4 +70,3 @@ struct ITweakBall : ITweak }; } -#endif // __DNACOMMON_ITWEAKBALL_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakGame.hpp b/DataSpec/DNACommon/Tweaks/ITweakGame.hpp index 4d4860a3b..d140b96f0 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakGame.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakGame.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKGAME_HPP__ -#define __DNACOMMON_ITWEAKGAME_HPP__ +#pragma once #include "ITweak.hpp" @@ -28,4 +27,3 @@ struct ITweakGame : ITweak }; } -#endif diff --git a/DataSpec/DNACommon/Tweaks/ITweakGui.hpp b/DataSpec/DNACommon/Tweaks/ITweakGui.hpp index 909573bea..495653883 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakGui.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakGui.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKGUI_HPP__ -#define __DNACOMMON_ITWEAKGUI_HPP__ +#pragma once #include "ITweak.hpp" #include "zeus/CVector2f.hpp" @@ -152,4 +151,3 @@ struct ITweakGui : ITweak } -#endif // __DNACOMMON_ITWEAKGUI_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp b/DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp index 8dec52393..c27ff9282 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKGUICOLORS_HPP__ -#define __DNACOMMON_ITWEAKGUICOLORS_HPP__ +#pragma once #include "ITweak.hpp" @@ -106,4 +105,3 @@ struct ITweakGuiColors : ITweak }; } -#endif // __DNACOMMON_ITWEAKGUICOLORS_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp b/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp index 912bfd56c..49c8ac919 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKGUNRES_HPP__ -#define __DNACOMMON_ITWEAKGUNRES_HPP__ +#pragma once #include "ITweak.hpp" #include "Runtime/IFactory.hpp" @@ -139,4 +138,3 @@ protected: } -#endif diff --git a/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp b/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp index d5f038768..5515ca585 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakParticle.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKPARTICLE_HPP__ -#define __DNACOMMON_ITWEAKPARTICLE_HPP__ +#pragma once #include "ITweak.hpp" @@ -12,4 +11,3 @@ struct ITweakParticle : ITweak } -#endif diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp index 78e35a1bd..4bc3102c3 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKPLAYER_HPP__ -#define __DNACOMMON_ITWEAKPLAYER_HPP__ +#pragma once #include "ITweak.hpp" #include "zeus/CAABox.hpp" @@ -146,4 +145,3 @@ struct ITweakPlayer : ITweak } -#endif // __DNACOMMON_ITWEAKPLAYER_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp index d8634cb6f..6cc9b8c95 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKPLAYERCONTROL_HPP__ -#define __DNACOMMON_ITWEAKPLAYERCONTROL_HPP__ +#pragma once #include "ITweak.hpp" @@ -13,4 +12,3 @@ struct ITweakPlayerControl : ITweak } -#endif // __DNACOMMON_ITWEAKPLAYERCONTROL_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp index 6e4ed13ac..5ca7f2e72 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKPLAYERGUN_HPP__ -#define __DNACOMMON_ITWEAKPLAYERGUN_HPP__ +#pragma once #include "ITweak.hpp" #include "zeus/CAABox.hpp" @@ -73,4 +72,3 @@ struct ITweakPlayerGun : ITweak }; } -#endif // __DNACOMMON_ITWEAKPLAYERGUN_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp index 21c803115..fcc6152ca 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKPLAYERRES_HPP__ -#define __DNACOMMON_ITWEAKPLAYERRES_HPP__ +#pragma once #include "ITweak.hpp" #include "Runtime/IFactory.hpp" @@ -165,4 +164,3 @@ protected: } -#endif // __DNACOMMON_ITWEAKPLAYERRES_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakSlideShow.hpp b/DataSpec/DNACommon/Tweaks/ITweakSlideShow.hpp index 0c93a77da..f32c45092 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakSlideShow.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakSlideShow.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKSLIDESHOW_HPP__ -#define __DNACOMMON_ITWEAKSLIDESHOW_HPP__ +#pragma once #include "ITweak.hpp" @@ -17,4 +16,3 @@ struct ITweakSlideShow : ITweak } -#endif // __DNACOMMON_ITWEAKSLIDESHOW_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/ITweakTargeting.hpp b/DataSpec/DNACommon/Tweaks/ITweakTargeting.hpp index af543553b..1d9c1f75b 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakTargeting.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakTargeting.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_ITWEAKTARGETING_HPP__ -#define __DNACOMMON_ITWEAKTARGETING_HPP__ +#pragma once #include "ITweak.hpp" namespace DataSpec @@ -97,4 +96,3 @@ struct ITweakTargeting : public ITweak }; } -#endif // __DNACOMMON_ITWEAKTARGETING_HPP__ diff --git a/DataSpec/DNACommon/Tweaks/TweakWriter.hpp b/DataSpec/DNACommon/Tweaks/TweakWriter.hpp index abd093f1f..0a891921c 100644 --- a/DataSpec/DNACommon/Tweaks/TweakWriter.hpp +++ b/DataSpec/DNACommon/Tweaks/TweakWriter.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_TWEAKWRITER_HPP__ -#define __DNACOMMON_TWEAKWRITER_HPP__ +#pragma once #include "../PAK.hpp" @@ -36,4 +35,3 @@ bool ExtractTweak(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath) } -#endif // __DNACOMMON_TWEAKWRITER_HPP__ diff --git a/DataSpec/DNACommon/WPSC.hpp b/DataSpec/DNACommon/WPSC.hpp index 3f5d31057..b230efbba 100644 --- a/DataSpec/DNACommon/WPSC.hpp +++ b/DataSpec/DNACommon/WPSC.hpp @@ -1,5 +1,4 @@ -#ifndef __COMMON_WPSC_HPP__ -#define __COMMON_WPSC_HPP__ +#pragma once #include "ParticleCommon.hpp" #include "PAK.hpp" @@ -63,4 +62,3 @@ bool WriteWPSM(const WPSM& wpsm, const hecl::ProjectPath& outPath); } -#endif // __COMMON_WPSC_HPP__ diff --git a/DataSpec/DNAMP1/AFSM.hpp b/DataSpec/DNAMP1/AFSM.hpp index 4dcb3572b..1aa24997b 100644 --- a/DataSpec/DNAMP1/AFSM.hpp +++ b/DataSpec/DNAMP1/AFSM.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_AFSM_HPP_ -#define _DNAMP1_AFSM_HPP_ +#pragma once #include #include "DataSpec/DNACommon/DNACommon.hpp" @@ -58,4 +57,3 @@ struct AFSM : public BigDNA }; } -#endif // _RETRO_AFSM_HPP_ diff --git a/DataSpec/DNAMP1/AGSC.hpp b/DataSpec/DNAMP1/AGSC.hpp index 0e37d1d51..1b7beb56f 100644 --- a/DataSpec/DNAMP1/AGSC.hpp +++ b/DataSpec/DNAMP1/AGSC.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_AGSC_HPP_ -#define _DNAMP1_AGSC_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DNAMP1.hpp" @@ -22,4 +21,3 @@ public: } -#endif // _DNAMP1_AGSC_HPP_ diff --git a/DataSpec/DNAMP1/ANCS.hpp b/DataSpec/DNAMP1/ANCS.hpp index a0abc8247..7f14de6cf 100644 --- a/DataSpec/DNAMP1/ANCS.hpp +++ b/DataSpec/DNAMP1/ANCS.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ANCS_HPP_ -#define _DNAMP1_ANCS_HPP_ +#pragma once #include #include "DataSpec/DNACommon/DNACommon.hpp" @@ -518,4 +517,3 @@ struct ANCS : BigDNA } -#endif // _DNAMP1_ANCS_HPP_ diff --git a/DataSpec/DNAMP1/ANIM.hpp b/DataSpec/DNAMP1/ANIM.hpp index b8a3f50f8..ebb131bce 100644 --- a/DataSpec/DNAMP1/ANIM.hpp +++ b/DataSpec/DNAMP1/ANIM.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ANIM_HPP_ -#define _DNAMP1_ANIM_HPP_ +#pragma once #include "DNAMP1.hpp" #include "DataSpec/DNACommon/ANIM.hpp" @@ -220,4 +219,3 @@ struct ANIM : BigDNA } -#endif // _DNAMP1_ANIM_HPP_ diff --git a/DataSpec/DNAMP1/CINF.hpp b/DataSpec/DNAMP1/CINF.hpp index aa0011375..8078a6256 100644 --- a/DataSpec/DNAMP1/CINF.hpp +++ b/DataSpec/DNAMP1/CINF.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CINF_HPP_ -#define _DNAMP1_CINF_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/RigInverter.hpp" @@ -53,4 +52,3 @@ struct CINF : BigDNA } -#endif // _DNAMP1_CINF_HPP_ diff --git a/DataSpec/DNAMP1/CMDL.hpp b/DataSpec/DNAMP1/CMDL.hpp index 550bb3f99..36015d3ad 100644 --- a/DataSpec/DNAMP1/CMDL.hpp +++ b/DataSpec/DNAMP1/CMDL.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CMDL_HPP_ -#define _DNAMP1_CMDL_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/CMDL.hpp" @@ -43,4 +42,3 @@ struct CMDL } -#endif // _DNAMP1_CMDL_HPP_ diff --git a/DataSpec/DNAMP1/CMDLMaterials.hpp b/DataSpec/DNAMP1/CMDLMaterials.hpp index ba5ebd598..ca863b349 100644 --- a/DataSpec/DNAMP1/CMDLMaterials.hpp +++ b/DataSpec/DNAMP1/CMDLMaterials.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CMDL_MATERIALS_HPP_ -#define _DNAMP1_CMDL_MATERIALS_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/GX.hpp" @@ -391,4 +390,3 @@ struct HMDLMaterialSet : BigDNA } -#endif // _DNAMP1_CMDL_MATERIALS_HPP_ diff --git a/DataSpec/DNAMP1/CSKR.hpp b/DataSpec/DNAMP1/CSKR.hpp index 8b59f8c5f..49c67cf7c 100644 --- a/DataSpec/DNAMP1/CSKR.hpp +++ b/DataSpec/DNAMP1/CSKR.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CSKR_HPP_ -#define _DNAMP1_CSKR_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "CINF.hpp" @@ -36,4 +35,3 @@ struct CSKR : BigDNA } -#endif // _DNAMP1_CSKR_HPP_ diff --git a/DataSpec/DNAMP1/CSNG.hpp b/DataSpec/DNAMP1/CSNG.hpp index 630c574e0..26c65e900 100644 --- a/DataSpec/DNAMP1/CSNG.hpp +++ b/DataSpec/DNAMP1/CSNG.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CSNG_HPP_ -#define _DNAMP1_CSNG_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DNAMP1.hpp" @@ -25,4 +24,3 @@ public: } -#endif // _DNAMP1_CSNG_HPP_ diff --git a/DataSpec/DNAMP1/DCLN.hpp b/DataSpec/DNAMP1/DCLN.hpp index 672ca8693..1f3750d13 100644 --- a/DataSpec/DNAMP1/DCLN.hpp +++ b/DataSpec/DNAMP1/DCLN.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_DCLN_HPP__ -#define __DNAMP1_DCLN_HPP__ +#pragma once #include #include "DataSpec/DNACommon/DeafBabe.hpp" @@ -110,4 +109,3 @@ struct DCLN : BigDNA }; } - #endif // __DNAMP1_DCLN_HPP__ diff --git a/DataSpec/DNAMP1/DNAMP1.hpp b/DataSpec/DNAMP1/DNAMP1.hpp index fb4860b6a..3b8ea9707 100644 --- a/DataSpec/DNAMP1/DNAMP1.hpp +++ b/DataSpec/DNAMP1/DNAMP1.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_HPP__ -#define __DNAMP1_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "PAK.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __DNAMP1_HPP__ diff --git a/DataSpec/DNAMP1/DeafBabe.hpp b/DataSpec/DNAMP1/DeafBabe.hpp index c427ec407..57195400b 100644 --- a/DataSpec/DNAMP1/DeafBabe.hpp +++ b/DataSpec/DNAMP1/DeafBabe.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DEAFBABE_HPP_ -#define _DNAMP1_DEAFBABE_HPP_ +#pragma once #include "DataSpec/DNACommon/DeafBabe.hpp" @@ -152,4 +151,3 @@ struct DeafBabe : BigDNA } -#endif // _DNAMP1_DEAFBABE_HPP_ diff --git a/DataSpec/DNAMP1/EVNT.hpp b/DataSpec/DNAMP1/EVNT.hpp index 36a879474..2a3e8db4f 100644 --- a/DataSpec/DNAMP1/EVNT.hpp +++ b/DataSpec/DNAMP1/EVNT.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_EVNT_HPP__ -#define __DNAMP1_EVNT_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DNAMP1.hpp" @@ -110,4 +109,3 @@ struct EVNT : BigDNA } -#endif // __DNAMP1_EVNT_HPP__ diff --git a/DataSpec/DNAMP1/FRME.hpp b/DataSpec/DNAMP1/FRME.hpp index 9a041d91c..671237a80 100644 --- a/DataSpec/DNAMP1/FRME.hpp +++ b/DataSpec/DNAMP1/FRME.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FRME_HPP_ -#define _DNAMP1_FRME_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DNAMP1.hpp" @@ -317,4 +316,3 @@ struct FRME : BigDNA } -#endif // _DNAMP1_FRME_HPP_ diff --git a/DataSpec/DNAMP1/HINT.hpp b/DataSpec/DNAMP1/HINT.hpp index ce135e1b7..b8af0cffa 100644 --- a/DataSpec/DNAMP1/HINT.hpp +++ b/DataSpec/DNAMP1/HINT.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_HINT_HPP_ -#define _DNAMP1_HINT_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/PAK.hpp" @@ -56,4 +55,3 @@ struct HINT : BigDNA } }; } -#endif // _DNAMP1_HINT_HPP_ diff --git a/DataSpec/DNAMP1/MAPA.hpp b/DataSpec/DNAMP1/MAPA.hpp index b7d1558c2..96cd2c7f0 100644 --- a/DataSpec/DNAMP1/MAPA.hpp +++ b/DataSpec/DNAMP1/MAPA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_MAPA_HPP__ -#define __DNAMP1_MAPA_HPP__ +#pragma once #include @@ -38,4 +37,3 @@ struct MAPA : DNAMAPA::MAPA }; } -#endif diff --git a/DataSpec/DNAMP1/MAPU.hpp b/DataSpec/DNAMP1/MAPU.hpp index 35f8de2e1..c7997b6c0 100644 --- a/DataSpec/DNAMP1/MAPU.hpp +++ b/DataSpec/DNAMP1/MAPU.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_MAPU_HPP__ -#define __DNAMP1_MAPU_HPP__ +#pragma once #include @@ -29,4 +28,3 @@ struct MAPU : DNAMAPU::MAPU }; } -#endif diff --git a/DataSpec/DNAMP1/MLVL.hpp b/DataSpec/DNAMP1/MLVL.hpp index 1a6038711..ed3c30eaf 100644 --- a/DataSpec/DNAMP1/MLVL.hpp +++ b/DataSpec/DNAMP1/MLVL.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_MLVL_HPP__ -#define __DNAMP1_MLVL_HPP__ +#pragma once #include "DataSpec/DNACommon/PAK.hpp" #include "DataSpec/DNACommon/MLVL.hpp" @@ -168,4 +167,3 @@ struct MLVL : BigDNA } -#endif // __DNAMP1_MLVL_HPP__ diff --git a/DataSpec/DNAMP1/MREA.hpp b/DataSpec/DNAMP1/MREA.hpp index 0453500cf..c9b44a6ea 100644 --- a/DataSpec/DNAMP1/MREA.hpp +++ b/DataSpec/DNAMP1/MREA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_MREA_HPP__ -#define __DNAMP1_MREA_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "CMDLMaterials.hpp" @@ -137,4 +136,3 @@ struct MREA } -#endif diff --git a/DataSpec/DNAMP1/MazeSeeds.hpp b/DataSpec/DNAMP1/MazeSeeds.hpp index 11469317b..76c03d8c3 100644 --- a/DataSpec/DNAMP1/MazeSeeds.hpp +++ b/DataSpec/DNAMP1/MazeSeeds.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_MAZESEEDS_HPP__ -#define __DNAMP1_MAZESEEDS_HPP__ +#pragma once #include @@ -14,4 +13,3 @@ struct MazeSeeds : BigDNA }; } -#endif // __DNAMP1_MAZESEEDS_HPP__ diff --git a/DataSpec/DNAMP1/PAK.hpp b/DataSpec/DNAMP1/PAK.hpp index 6bf9ae305..12becbfa3 100644 --- a/DataSpec/DNAMP1/PAK.hpp +++ b/DataSpec/DNAMP1/PAK.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_PAK_HPP__ -#define __DNAMP1_PAK_HPP__ +#pragma once #include @@ -63,4 +62,3 @@ struct PAK : BigDNA } -#endif // __DNAMP1_PAK_HPP__ diff --git a/DataSpec/DNAMP1/PATH.hpp b/DataSpec/DNAMP1/PATH.hpp index 9b076e358..5323d325b 100644 --- a/DataSpec/DNAMP1/PATH.hpp +++ b/DataSpec/DNAMP1/PATH.hpp @@ -1,5 +1,4 @@ -#ifndef __DNACOMMON_PATH_HPP__ -#define __DNACOMMON_PATH_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/PAK.hpp" @@ -90,4 +89,3 @@ struct PATH : BigDNA }; } -#endif // __DNACOMMON_PATH_HPP__ diff --git a/DataSpec/DNAMP1/SAVW.hpp b/DataSpec/DNAMP1/SAVW.hpp index aff65a0e9..b9998272c 100644 --- a/DataSpec/DNAMP1/SAVW.hpp +++ b/DataSpec/DNAMP1/SAVW.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_SAVW_HPP__ -#define __DNAMP1_SAVW_HPP__ +#pragma once #include "DataSpec/DNACommon/SAVWCommon.hpp" #include "DNAMP1.hpp" @@ -33,4 +32,3 @@ struct SAVW : BigDNA }; } -#endif // __DNAMP1_SAVW_HPP__ diff --git a/DataSpec/DNAMP1/SCAN.hpp b/DataSpec/DNAMP1/SCAN.hpp index 4e4df24ba..371dab5b2 100644 --- a/DataSpec/DNAMP1/SCAN.hpp +++ b/DataSpec/DNAMP1/SCAN.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SCAN_HPP_ -#define _DNAMP1_SCAN_HPP_ +#pragma once #include #include "DataSpec/DNACommon/DNACommon.hpp" @@ -113,4 +112,3 @@ struct SCAN : BigDNA } -#endif diff --git a/DataSpec/DNAMP1/SCLY.hpp b/DataSpec/DNAMP1/SCLY.hpp index 18b4cfe20..6f59ce18d 100644 --- a/DataSpec/DNAMP1/SCLY.hpp +++ b/DataSpec/DNAMP1/SCLY.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SCLY_HPP_ -#define _DNAMP1_SCLY_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "ScriptObjects/IScriptObject.hpp" @@ -34,4 +33,3 @@ struct SCLY : BigDNA void nameIDs(PAKRouter& pakRouter) const; }; } -#endif diff --git a/DataSpec/DNAMP1/STRG.hpp b/DataSpec/DNAMP1/STRG.hpp index 0bd71d7d7..ebf282abe 100644 --- a/DataSpec/DNAMP1/STRG.hpp +++ b/DataSpec/DNAMP1/STRG.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_STRG_HPP__ -#define __DNAMP1_STRG_HPP__ +#pragma once #include #include "DataSpec/DNACommon/DNACommon.hpp" @@ -87,4 +86,3 @@ struct STRG : ISTRG } -#endif // __DNAMP1_STRG_HPP__ diff --git a/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp index 3963ebd1d..5a16e821c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_AIJUMPPOINT_HPP_ -#define _DNAMP1_AIJUMPPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -19,4 +18,3 @@ struct AIJumpPoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp index b80c3f54d..e7fc8c468 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_AIKEYFRAME_HPP_ -#define _DNAMP1_AIKEYFRAME_HPP_ +#pragma once #include "IScriptObject.hpp" #include "Parameters.hpp" @@ -21,4 +20,3 @@ struct AIKeyframe : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Actor.hpp b/DataSpec/DNAMP1/ScriptObjects/Actor.hpp index 1cfc2cea8..0417bbcde 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Actor.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Actor.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ACTOR_HPP_ -#define _DNAMP1_ACTOR_HPP_ +#pragma once #include "IScriptObject.hpp" #include "Parameters.hpp" @@ -69,4 +68,3 @@ struct Actor : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp b/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp index 124bd44b9..cdea46c76 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ACTORCONTRAPTION_HPP_ -#define _DNAMP1_ACTORCONTRAPTION_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -59,4 +58,3 @@ struct ActorContraption : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp index 079822930..01d1cf84b 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ACTORKEYFRAME_HPP_ -#define _DNAMP1_ACTORKEYFRAME_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -21,4 +20,3 @@ struct ActorKeyframe : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp b/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp index 775f2b5f8..65eb3dde1 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ACTORROTATE_HPP_ -#define _DNAMP1_ACTORROTATE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -20,4 +19,3 @@ struct ActorRotate : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp b/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp index 90b243605..d53293018 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_AMBIENTAI_HPP_ -#define _DNAMP1_AMBIENTAI_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -54,4 +53,3 @@ struct AmbientAI : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp b/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp index b973cbb40..a8db1a6d7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_AREAATTRIBUTES_HPP_ -#define _DNAMP1_AREAATTRIBUTES_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -36,4 +35,3 @@ struct AreaAttributes : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp b/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp index edaf03aaa..6e5389c4c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ATOMICALPHA_HPP_ -#define _DNAMP1_ATOMICALPHA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -64,4 +63,3 @@ struct AtomicAlpha : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp b/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp index d0912d307..e06e85d1b 100644 --- a/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ATOMICBETA_HPP_ -#define _DNAMP1_ATOMICBETA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -77,4 +76,3 @@ struct AtomicBeta : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp b/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp index df3924cf6..7b960459f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_Babygoth_HPP_ -#define _DNAMP1_Babygoth_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -140,4 +139,3 @@ struct Babygoth : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp b/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp index f164d8284..6ee229c3a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_BALLTRIGGER_HPP_ -#define _DNAMP1_BALLTRIGGER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -23,4 +22,3 @@ struct BallTrigger : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp b/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp index 3146106f2..a9673ee73 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_BEETLE_HPP_ -#define _DNAMP1_BEETLE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -60,4 +59,3 @@ struct Beetle : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp b/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp index 0057208e5..a97c390f0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_BLOODFLOWER_HPP_ -#define _DNAMP1_BLOODFLOWER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -98,4 +97,3 @@ struct BloodFlower : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp b/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp index d3f4578b7..c346509fe 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_BURROWER_HPP_ -#define _DNAMP1_BURROWER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -81,4 +80,3 @@ struct Burrower : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Camera.hpp b/DataSpec/DNAMP1/ScriptObjects/Camera.hpp index c5c6ab2e8..ac5f4fd85 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Camera.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Camera.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERA_HPP_ -#define _DNAMP1_CAMERA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -29,4 +28,3 @@ struct Camera : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp index 40f17c499..56094c8f3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERABLURKEYFRAME_HPP_ -#define _DNAMP1_CAMERABLURKEYFRAME_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -21,4 +20,3 @@ struct CameraBlurKeyframe : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp index af7e08c64..68c62f4bc 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERAFILTERKEYFRAME_HPP_ -#define _DNAMP1_CAMERAFILTERKEYFRAME_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -39,4 +38,3 @@ struct CameraFilterKeyframe : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp index 3977fa4cc..24839a7fe 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERAHINT_HPP_ -#define _DNAMP1_CAMERAHINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -68,4 +67,3 @@ struct CameraHint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp index 6464ebd59..f55f61f57 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERAHINTRIGGER_HPP_ -#define _DNAMP1_CAMERAHINTRIGGER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -21,4 +20,3 @@ struct CameraHintTrigger : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp index e8e6f7890..6804e67db 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERAPITCHVOLUME_HPP_ -#define _DNAMP1_CAMERAPITCHVOLUME_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -22,4 +21,3 @@ struct CameraPitchVolume : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp index 9256922ac..88fc7a42d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERASHAKER_HPP_ -#define _DNAMP1_CAMERASHAKER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -23,4 +22,3 @@ struct CameraShaker : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp index d2d268f7f..2071be251 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CAMERAWAYPOINT_HPP_ -#define _DNAMP1_CAMERAWAYPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -20,4 +19,3 @@ struct CameraWaypoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp b/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp index 4aa56979c..f8d774bd6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CHOZOGHOST_HPP_ -#define _DNAMP1_CHOZOGHOST_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -87,4 +86,3 @@ struct ChozoGhost : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp b/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp index 6a438e5d0..b3a3c01ee 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_COLORMODULATE_HPP_ -#define _DNAMP1_COLORMODULATE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -26,4 +25,3 @@ struct ColorModulate : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp b/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp index 084c77474..eedcf7c60 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CONTROLLERACTION_HPP_ -#define _DNAMP1_CONTROLLERACTION_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct ControllerAction : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Counter.hpp b/DataSpec/DNAMP1/ScriptObjects/Counter.hpp index df50ae4f1..c00057d07 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Counter.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Counter.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_COUNTER_HPP_ -#define _DNAMP1_COUNTER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -19,4 +18,3 @@ struct Counter : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp index e87d888c6..e8087cafd 100644 --- a/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_COVERPOINT_HPP_ -#define _DNAMP1_COVERPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -23,4 +22,3 @@ struct CoverPoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp b/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp index abe2da9ee..6be868590 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DAMAGABLETRIGGER_HPP_ -#define _DNAMP1_DAMAGABLETRIGGER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -60,4 +59,3 @@ struct DamageableTrigger : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Debris.hpp b/DataSpec/DNAMP1/ScriptObjects/Debris.hpp index 28daae50d..66ee4d0bf 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Debris.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Debris.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DEBRIS_HPP_ -#define _DNAMP1_DEBRIS_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -60,4 +59,3 @@ struct Debris : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp b/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp index 13e6fc109..b788668f4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DEBRISEXTENDED_HPP_ -#define _DNAMP1_DEBRISEXTENDED_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -93,4 +92,3 @@ struct DebrisExtended : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp index 536523f5b..b0cb3b912 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DEBUGCAMERAWAYPOINT_HPP_ -#define _DNAMP1_DEBUGCAMERAWAYPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct DebugCameraWaypoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp b/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp index cfbf71336..29a3d5060 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DISTANCEFOG_HPP_ -#define _DNAMP1_DISTANCEFOG_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -22,4 +21,3 @@ struct DistanceFog : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Dock.hpp b/DataSpec/DNAMP1/ScriptObjects/Dock.hpp index 10bdc11cc..b422cc803 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Dock.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Dock.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DOCK_HPP_ -#define _DNAMP1_DOCK_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -21,4 +20,3 @@ struct Dock : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp b/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp index 1671f0dfb..df52df7b3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DOCKAREACHANGE_HPP_ -#define _DNAMP1_DOCKAREACHANGE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -17,4 +16,3 @@ struct DockAreaChange : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp b/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp index 415a9d405..67881a3ba 100644 --- a/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DOORAREA_HPP_ -#define _DNAMP1_DOORAREA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -54,4 +53,3 @@ struct DoorArea : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Drone.hpp b/DataSpec/DNAMP1/ScriptObjects/Drone.hpp index 309a5d48a..8adf92b26 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Drone.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Drone.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_DRONE_HPP_ -#define _DNAMP1_DRONE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -99,4 +98,3 @@ struct Drone : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Effect.hpp b/DataSpec/DNAMP1/ScriptObjects/Effect.hpp index 531e4aec1..480157607 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Effect.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Effect.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_EFFECT_HPP_ -#define _DNAMP1_EFFECT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -59,4 +58,3 @@ struct Effect : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp b/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp index ffd1cbadf..679c6628c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ELECTROMAGNETICPULSE_HPP_ -#define _DNAMP1_ELECTROMAGNETICPULSE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -41,4 +40,3 @@ struct ElectroMagneticPulse : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp b/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp index ba036431c..ae46ffe09 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ELITEPIRATE_HPP_ -#define _DNAMP1_ELITEPIRATE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -140,4 +139,3 @@ struct ElitePirate : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp b/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp index 66ae5ec37..4e68a8381 100644 --- a/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ENERGYBALL_HPP_ -#define _DNAMP1_ENERGYBALL_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -82,4 +81,3 @@ struct EnergyBall : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp b/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp index 92410aaac..2aca79857 100644 --- a/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ENVFXDENSITYCONTROLLER_HPP_ -#define _DNAMP1_ENVFXDENSITYCONTROLLER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct EnvFxDensityController : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp b/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp index cbb33291c..527cabb9e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_EYEBALL_HPP_ -#define _DNAMP1_EYEBALL_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -89,4 +88,3 @@ struct Eyeball : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp b/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp index e72c5df35..0c838911e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FIREFLEA_HPP_ -#define _DNAMP1_FIREFLEA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -47,4 +46,3 @@ struct FireFlea : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp b/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp index a8e0b4cb5..dfef63d8c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FISHCLOUD_HPP_ -#define _DNAMP1_FISHCLOUD_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -91,4 +90,3 @@ struct FishCloud : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp b/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp index d35e16bc3..60970475c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FISHCLOUDMODIFIER_HPP_ -#define _DNAMP1_FISHCLOUDMODIFIER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -21,4 +20,3 @@ struct FishCloudModifier : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp b/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp index 4116952a3..d2bf67f35 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FLAAHGRA_HPP_ -#define _DNAMP1_FLAAHGRA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -91,4 +90,3 @@ struct Flaahgra : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp b/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp index 8e3117621..b15a6c730 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FLAAHGRATENTACLE_HPP_ -#define _DNAMP1_FLAAHGRATENTACLE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -44,4 +43,3 @@ struct FlaahgraTentacle : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp b/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp index e81450aa0..5224087b8 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FLICKERBAT_HPP_ -#define _DNAMP1_FLICKERBAT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -48,4 +47,3 @@ struct FlickerBat : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp b/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp index 7d7401be4..c889f6d5e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FLYINGPIRATE_HPP_ -#define _DNAMP1_FLYINGPIRATE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -116,4 +115,3 @@ struct FlyingPirate : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp b/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp index 343a1d6bf..8a856dfb4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_FOGVOLUME_HPP_ -#define _DNAMP1_FOGVOLUME_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -21,4 +20,3 @@ struct FogVolume : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp b/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp index 361a8a6bd..9c7a7feb9 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_GEEMER_HPP_ -#define _DNAMP1_GEEMER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -54,4 +53,3 @@ struct Geemer : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Generator.hpp b/DataSpec/DNAMP1/ScriptObjects/Generator.hpp index f41761244..c1c1d63e5 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Generator.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Generator.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_GENERATOR_HPP_ -#define _DNAMP1_GENERATOR_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -22,4 +21,3 @@ struct Generator : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp b/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp index 1dabe6fe9..04eda8b5e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_GRAPPLEPOINT_HPP_ -#define _DNAMP1_GRAPPLEPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -19,4 +18,3 @@ struct GrapplePoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp b/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp index a28873e69..b9eed75e6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_GUNTURRET_HPP_ -#define _DNAMP1_GUNTURRET_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -140,4 +139,3 @@ struct GunTurret : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp b/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp index 28c39314a..4f831f7a3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_HUDMEMO_HPP_ -#define _DNAMP1_HUDMEMO_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -35,4 +34,3 @@ struct HUDMemo : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp index f6c2fa8f2..21c9f29f0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_SCRIPTOBJECT_HPP -#define __DNAMP1_SCRIPTOBJECT_HPP +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "../DNAMP1.hpp" #include "../SAVW.hpp" @@ -51,4 +50,3 @@ struct IScriptObject : BigDNAVYaml }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp b/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp index c9610e35e..333a55a61 100644 --- a/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ICESHEEGOTH_HPP_ -#define _DNAMP1_ICESHEEGOTH_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -135,4 +134,3 @@ struct IceSheegoth : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp b/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp index 327527998..d47c8c28f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ICEZOOMER_HPP_ -#define _DNAMP1_ICEZOOMER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -54,4 +53,3 @@ struct IceZoomer : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp b/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp index dce7e4c8c..09e2667bf 100644 --- a/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_JELLYZAP_HPP_ -#define _DNAMP1_JELLYZAP_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -58,4 +57,3 @@ struct JellyZap : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp b/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp index 0940f4001..e22369ae0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_MAGDOLITE_HPP_ -#define _DNAMP1_MAGDOLITE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -91,4 +90,3 @@ struct Magdolite : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp b/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp index 9526e770b..a95c28b1c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_MAZENODE_HPP_ -#define _DNAMP1_MAZENODE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -24,4 +23,3 @@ struct MazeNode : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp b/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp index 9e0dc9f06..b03a4047c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_MEMORYRELAY_HPP_ -#define _DNAMP1_MEMORYRELAY_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -17,4 +16,3 @@ struct MemoryRelay : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp b/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp index 50d26eb97..bffdf942f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_METAREEALPHA_HPP_ -#define _DNAMP1_METAREEALPHA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -50,4 +49,3 @@ struct MetareeAlpha : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp index 53a8f2120..368526529 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_METROIDALPHA_HPP_ -#define _DNAMP1_METROIDALPHA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -66,4 +65,3 @@ struct MetroidAlpha : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp index 465fd9e30..17c6d8bb0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_METROIDBETA_HPP_ -#define _DNAMP1_METROIDBETA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -91,4 +90,3 @@ struct MetroidBeta : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp index ad8bc265d..728400385 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_METROIDPRIMESTAGE1_HPP_ -#define _DNAMP1_METROIDPRIMESTAGE1_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -354,4 +353,3 @@ struct MetroidPrimeStage1 : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp index ba3bed6b3..a3be2891e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_METROIDPRIMESTAGE2_HPP_ -#define _DNAMP1_METROIDPRIMESTAGE2_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -67,4 +66,3 @@ struct MetroidPrimeStage2 : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Midi.hpp b/DataSpec/DNAMP1/ScriptObjects/Midi.hpp index f493fae2b..34cc896f4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Midi.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Midi.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_MIDI_HPP_ -#define _DNAMP1_MIDI_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -36,4 +35,3 @@ struct Midi : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp b/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp index a99d78bb5..3210e4b69 100644 --- a/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_NEWCAMERASHAKER_HPP_ -#define _DNAMP1_NEWCAMERASHAKER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -36,4 +35,3 @@ struct NewCameraShaker : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp b/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp index 23280cf79..dd982abbc 100644 --- a/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_NEWINTROBOSS_HPP_ -#define _DNAMP1_NEWINTROBOSS_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -75,4 +74,3 @@ struct NewIntroBoss : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp b/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp index 56db08b6d..5d0b0085b 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_OCULUS_HPP_ -#define _DNAMP1_OCULUS_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -57,4 +56,3 @@ struct Oculus : IScriptObject } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp b/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp index 5d60ccaa1..482397342 100644 --- a/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_OMEGAPIRATE_HPP_ -#define _DNAMP1_OMEGAPIRATE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -163,4 +162,3 @@ struct OmegaPirate : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp index 4833818b7..358b506bc 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PARAMETERS_HPP_ -#define _DNAMP1_PARAMETERS_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "../DNAMP1.hpp" @@ -522,4 +521,3 @@ struct BeamInfo : BigDNA } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp b/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp index a350fc1d5..8513195dd 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PARASITE_HPP_ -#define _DNAMP1_PARASITE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -63,4 +62,3 @@ struct Parasite : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp b/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp index fb14216e0..9426cea0c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PATHCAMERA_HPP_ -#define _DNAMP1_PATHCAMERA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -36,4 +35,3 @@ struct PathCamera : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp b/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp index c09a80567..113c445ec 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PHAZONHEALINGNODULE_HPP_ -#define _DNAMP1_PHAZONHEALINGNODULE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -53,4 +52,3 @@ struct PhazonHealingNodule : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp b/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp index 4b5628741..4f3b2a9f6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PHAZONPOOL_HPP_ -#define _DNAMP1_PHAZONPOOL_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -65,4 +64,3 @@ struct PhazonPool : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp b/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp index ef786e4c4..2d797b89a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PICKUP_HPP_ -#define _DNAMP1_PICKUP_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -68,4 +67,3 @@ struct Pickup : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp b/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp index cdc67c095..f9c5ed10f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PICKUPGENERATOR_HPP_ -#define _DNAMP1_PICKUPGENERATOR_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct PickupGenerator : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Platform.hpp b/DataSpec/DNAMP1/ScriptObjects/Platform.hpp index 58099ebf6..9ca322212 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Platform.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Platform.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PLATFORM_HPP_ -#define _DNAMP1_PLATFORM_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -71,4 +70,3 @@ struct Platform : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp index 4d73c68cd..cb5ddfe46 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PLAYERACTOR_HPP_ -#define _DNAMP1_PLAYERACTOR_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -64,4 +63,3 @@ struct PlayerActor : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp b/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp index 897f16aa5..f1009a685 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PLAYERHINT_HPP_ -#define _DNAMP1_PLAYERHINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -20,4 +19,3 @@ struct PlayerHint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp b/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp index bf5f5c106..348e9a3d3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PLAYERSTATECHANGE_HPP_ -#define _DNAMP1_PLAYERSTATECHANGE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -21,4 +20,3 @@ struct PlayerStateChange : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp b/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp index e944cfb36..719d87d3d 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_POINTOFINTEREST_HPP_ -#define _DNAMP1_POINTOFINTEREST_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -36,4 +35,3 @@ struct PointOfInterest : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp b/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp index efab733fb..fadd373e0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PUDDLESPORE_HPP_ -#define _DNAMP1_PUDDLESPORE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -66,4 +65,3 @@ struct PuddleSpore : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp b/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp index b3760a49b..ae238302f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PUDDLETOADGAMMA_HPP_ -#define _DNAMP1_PUDDLETOADGAMMA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -61,4 +60,3 @@ struct PuddleToadGamma : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp b/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp index c11580fb0..c80bb0fec 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_PUFFER_HPP_ -#define _DNAMP1_PUFFER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -66,4 +65,3 @@ struct Puffer : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp b/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp index 06fd81300..d832f146a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_RADIALDAMAGE_HPP_ -#define _DNAMP1_RADIALDAMAGE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -19,4 +18,3 @@ struct RadialDamage : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp b/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp index f24dd3f56..50aa00123 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_RANDOMRELAY_HPP_ -#define _DNAMP1_RANDOMRELAY_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -19,4 +18,3 @@ struct RandomRelay : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Relay.hpp b/DataSpec/DNAMP1/ScriptObjects/Relay.hpp index 4fbb485c4..4bc80de62 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Relay.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Relay.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_RELAY_HPP_ -#define _DNAMP1_RELAY_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -16,4 +15,3 @@ struct Relay : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp b/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp index 904a3085e..fb0c50215 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_REPULSOR_HPP_ -#define _DNAMP1_REPULSOR_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct Repulsor : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp b/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp index 01e29d23a..1850e2de9 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_RIDLEY_HPP_ -#define _DNAMP1_RIDLEY_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -267,4 +266,3 @@ struct Ridley : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp b/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp index 566ff00f8..bdaeae9e7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_RIPPER_HPP_ -#define _DNAMP1_RIPPER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -46,4 +45,3 @@ struct Ripper : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp b/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp index bfefc72d8..236d722da 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Ripple.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_RIPPLE_HPP_ -#define _DNAMP1_RIPPLE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct Ripple : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp b/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp index 005604ed0..ef9454020 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_ROOMACOUSTICS_HPP_ -#define _DNAMP1_ROOMACOUSTICS_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -40,4 +39,3 @@ struct RoomAcoustics : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp b/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp index ec5d7b4c8..d3ed8722c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_RUMBLEEFFECT_HPP_ -#define _DNAMP1_RUMBLEEFFECT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -26,4 +25,3 @@ struct RumbleEffect : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp b/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp index d66cc7754..c891b58cf 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SCRIPTBEAM_HPP_ -#define _DNAMP1_SCRIPTBEAM_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -38,4 +37,3 @@ struct ScriptBeam : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp b/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp index 6f6453fa8..d4a2acce6 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ScriptTypes.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SCRIPTTYPES_HPP_ -#define _DNAMP1_SCRIPTTYPES_HPP_ +#pragma once #include "Actor.hpp" #include "ActorContraption.hpp" #include "ActorKeyframe.hpp" @@ -139,4 +138,3 @@ struct ScriptObjectSpec extern const std::vector SCRIPT_OBJECT_DB; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp b/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp index 009477c4f..cd813637b 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SEEDLING_HPP_ -#define _DNAMP1_SEEDLING_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -64,4 +63,3 @@ struct Seedling : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp b/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp index 8ca80a93b..24419db82 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ShadowProjector.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SHADOWPROJECT_HPP_ -#define _DNAMP1_SHADOWPROJECT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -24,4 +23,3 @@ struct ShadowProjector : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp b/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp index a1b409584..9ebf89c48 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SNAKEWEEDSWARM_HPP_ -#define _DNAMP1_SNAKEWEEDSWARM_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -63,4 +62,3 @@ struct SnakeWeedSwarm : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Sound.hpp b/DataSpec/DNAMP1/ScriptObjects/Sound.hpp index d3afe4664..a2d8d17af 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Sound.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Sound.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SOUND_HPP_ -#define _DNAMP1_SOUND_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -34,4 +33,3 @@ struct Sound : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp b/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp index eca7793b3..10e2b574f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SPACEPIRATE_HPP_ -#define _DNAMP1_SPACEPIRATE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -86,4 +85,3 @@ struct SpacePirate : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp b/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp index dfb132fd4..36d768990 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SPANKWEED_HPP_ -#define _DNAMP1_SPANKWEED_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -49,4 +48,3 @@ struct SpankWeed : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp index 9e28540dd..d47e74d06 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpawnPoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SPAWNPOINT_HPP_ -#define _DNAMP1_SPAWNPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -49,4 +48,3 @@ struct SpawnPoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp b/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp index c1c6d3dd5..f6e23fd43 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SPECIALFUNCTION_HPP_ -#define _DNAMP1_SPECIALFUNCTION_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -34,4 +33,3 @@ struct SpecialFunction : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp b/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp index c2912b6bf..fd245c69f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpiderBallAttractionSurface.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SPIDERBALLATTRACTIONSURFACE_HPP_ -#define _DNAMP1_SPIDERBALLATTRACTIONSURFACE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -19,4 +18,3 @@ struct SpiderBallAttractionSurface : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp index 5d3063f1e..cce108c67 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpiderBallWaypoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SPIDERBALLWAYPOINT_HPP_ -#define _DNAMP1_SPIDERBALLWAYPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -19,4 +18,3 @@ struct SpiderBallWaypoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp b/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp index db80f452c..e73299326 100644 --- a/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SPINDLECAMERA_HPP_ -#define _DNAMP1_SPINDLECAMERA_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -33,4 +32,3 @@ struct SpindleCamera : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Steam.hpp b/DataSpec/DNAMP1/ScriptObjects/Steam.hpp index 85ff17333..ff7017ebc 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Steam.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Steam.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_STEAM_HPP_ -#define _DNAMP1_STEAM_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -42,4 +41,3 @@ struct Steam : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp b/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp index de4be120e..c8e5b5119 100644 --- a/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/StreamedAudio.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_STREAMEDAUDIO_HPP_ -#define _DNAMP1_STREAMEDAUDIO_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -23,4 +22,3 @@ struct StreamedAudio : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Switch.hpp b/DataSpec/DNAMP1/ScriptObjects/Switch.hpp index 51b5e545c..b1eb61cba 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Switch.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Switch.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SWITCH_HPP_ -#define _DNAMP1_SWITCH_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct Switch : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp b/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp index 0f6c94a6c..d63598d5a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/TargetingPoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_TARGETTINGPOINT_HPP_ -#define _DNAMP1_TARGETTINGPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct TargetingPoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp b/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp index 0d162bc89..247e51f9a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/TeamAIMgr.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_TEAMAIMGR_HPP_ -#define _DNAMP1_TEAMAIMGR_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -24,4 +23,3 @@ struct TeamAIMgr : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp b/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp index d932a257b..bd92a5f0a 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_THARDUS_HPP_ -#define _DNAMP1_THARDUS_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -201,4 +200,3 @@ struct Thardus : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp b/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp index 9c75023ab..690c188e2 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_THARDUSROCKPROJECTILE_HPP_ -#define _DNAMP1_THARDUSROCKPROJECTILE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -61,4 +60,3 @@ struct ThardusRockProjectile : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp b/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp index d71012074..bae91bb6e 100644 --- a/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/ThermalHeatFader.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_THERMALHEATFADER_HPP_ -#define _DNAMP1_THERMALHEATFADER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct ThermalHeatFader : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Timer.hpp b/DataSpec/DNAMP1/ScriptObjects/Timer.hpp index f9a255b57..cc5f132b7 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Timer.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Timer.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_TIMER_HPP_ -#define _DNAMP1_TIMER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -20,4 +19,3 @@ struct Timer : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp b/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp index c5722edd8..9c219d1c4 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Trigger.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_SCRIPTOBJECT_HPP_ -#define _DNAMP1_SCRIPTOBJECT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -30,4 +29,3 @@ struct Trigger : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp b/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp index d1b617a9f..52dcbd37c 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_TRYCLOPS_HPP_ -#define _DNAMP1_TRYCLOPS_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -48,4 +47,3 @@ struct Tryclops : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp b/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp index 0c844fb27..06500e8aa 100644 --- a/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_VISORFLARE_HPP_ -#define _DNAMP1_VISORFLARE_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -40,4 +39,3 @@ struct VisorFlare : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp b/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp index 196205ac2..732b1142f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_VISORGOO_HPP_ -#define _DNAMP1_VISORGOO_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -46,4 +45,3 @@ struct VisorGoo : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp b/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp index 9325c6cd7..d6542b5ac 100644 --- a/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_WALLCRAWLERSWARM_HPP_ -#define _DNAMP1_WALLCRAWLERSWARM_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -89,4 +88,3 @@ struct WallCrawlerSwarm : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp b/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp index e360e3485..58415f9e8 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_WARWASP_HPP_ -#define _DNAMP1_WARWASP_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -63,4 +62,3 @@ struct Warwasp : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Water.hpp b/DataSpec/DNAMP1/ScriptObjects/Water.hpp index d926f39c1..56c79df39 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Water.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Water.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_WATER_HPP_ -#define _DNAMP1_WATER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -186,4 +185,3 @@ struct Water : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp b/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp index 4cf9f4c78..a07e57099 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/Waypoint.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_WAYPOINT_HPP_ -#define _DNAMP1_WAYPOINT_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -27,4 +26,3 @@ struct Waypoint : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp b/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp index 26b4ff3f6..e61957ed3 100644 --- a/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/WorldLightFader.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_WORLDLIGHTFADER_HPP_ -#define _DNAMP1_WORLDLIGHTFADER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -18,4 +17,3 @@ struct WorldLightFader : IScriptObject }; } -#endif diff --git a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp index 7f5c9db8b..bdfe20f00 100644 --- a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp +++ b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_WORLDTELEPORTER_HPP_ -#define _DNAMP1_WORLDTELEPORTER_HPP_ +#pragma once #include "../../DNACommon/DNACommon.hpp" #include "IScriptObject.hpp" @@ -71,4 +70,3 @@ struct WorldTeleporter : IScriptObject } -#endif diff --git a/DataSpec/DNAMP1/SnowForces.hpp b/DataSpec/DNAMP1/SnowForces.hpp index 93fc4996b..49ae3f463 100644 --- a/DataSpec/DNAMP1/SnowForces.hpp +++ b/DataSpec/DNAMP1/SnowForces.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_SNOWFORCES_HPP__ -#define __DNAMP1_SNOWFORCES_HPP__ +#pragma once #include @@ -21,4 +20,3 @@ struct SnowForces : BigDNA }; } -#endif // __DNAMP1_SNOWFORCES_HPP__ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakAutoMapper.hpp b/DataSpec/DNAMP1/Tweaks/CTweakAutoMapper.hpp index 45aabd7a3..58b96366d 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakAutoMapper.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakAutoMapper.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_CTWEAKAUTOMAPPER_HPP__ -#define __DNAMP1_CTWEAKAUTOMAPPER_HPP__ +#pragma once #include "../../DataSpec/DNACommon/Tweaks/ITweakAutoMapper.hpp" #include "zeus/CVector3f.hpp" @@ -138,4 +137,3 @@ struct CTweakAutoMapper final : public ITweakAutoMapper }; } -#endif // __DNAMP1_CTWEAKAUTOMAPPER_HPP__ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakBall.hpp b/DataSpec/DNAMP1/Tweaks/CTweakBall.hpp index 20086c00e..875b83474 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakBall.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakBall.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_CTWEAKBALL_HPP__ -#define __DNAMP1_CTWEAKBALL_HPP__ +#pragma once #include "../../DNACommon/Tweaks/ITweakBall.hpp" #include "zeus/CVector3f.hpp" @@ -218,4 +217,3 @@ struct CTweakBall final : public ITweakBall } }; } -#endif // __DNAMP1_CTWEAKBALL_HPP__ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakCameraBob.hpp b/DataSpec/DNAMP1/Tweaks/CTweakCameraBob.hpp index 8d86e702c..af6876517 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakCameraBob.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakCameraBob.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTWEAKCAMERABOB_HPP__ -#define __URDE_CTWEAKCAMERABOB_HPP__ +#pragma once #include "../../DNACommon/DNACommon.hpp" @@ -25,4 +24,3 @@ struct CTweakCameraBob : BigDNA }; } -#endif // __URDE_CTWEAKCAMERABOB_HPP__ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp b/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp index fb867c9db..ea139b5f2 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakGame.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKGAME_HPP_ -#define _DNAMP1_CTWEAKGAME_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakGame.hpp" @@ -60,4 +59,3 @@ struct CTweakGame final : ITweakGame }; } -#endif diff --git a/DataSpec/DNAMP1/Tweaks/CTweakGui.hpp b/DataSpec/DNAMP1/Tweaks/CTweakGui.hpp index 1c9d9f677..257b34a0d 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakGui.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakGui.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKGUI_HPP_ -#define _DNAMP1_CTWEAKGUI_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakGui.hpp" @@ -334,4 +333,3 @@ struct CTweakGui final : ITweakGui } -#endif // _DNAMP1_CTWEAKGUI_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakGuiColors.hpp b/DataSpec/DNAMP1/Tweaks/CTweakGuiColors.hpp index 4fdebe037..fca9b01f2 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakGuiColors.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakGuiColors.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP1_CTWEAKGUICOLORS_HPP__ -#define __DNAMP1_CTWEAKGUICOLORS_HPP__ +#pragma once #include "../../DNACommon/Tweaks/ITweakGuiColors.hpp" @@ -232,4 +231,3 @@ struct CTweakGuiColors final : public ITweakGuiColors }; } -#endif // __DNAMP1_CTWEAKGUICOLORS_HPP__ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp b/DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp index 4b2e1f923..1dbed2afb 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKGUNRES_HPP_ -#define _DNAMP1_CTWEAKGUNRES_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakGunRes.hpp" @@ -94,4 +93,3 @@ struct CTweakGunRes final : ITweakGunRes } -#endif // _DNAMP1_CTWEAKGUNRES_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp b/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp index f4162c997..b54c82afa 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKPARTICLE_HPP_ -#define _DNAMP1_CTWEAKPARTICLE_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakParticle.hpp" @@ -19,4 +18,3 @@ struct CTweakParticle final : ITweakParticle } -#endif // _DNAMP1_CTWEAKPARTICLE_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp b/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp index d0b2f8a94..776f0bfde 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKPLAYER_HPP_ -#define _DNAMP1_CTWEAKPLAYER_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakPlayer.hpp" @@ -318,4 +317,3 @@ struct CTweakPlayer final : ITweakPlayer } -#endif // _DNAMP1_CTWEAKPLAYER_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp b/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp index 81fb1cfcc..12aa5fb98 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKPLAYERCONTROL_HPP_ -#define _DNAMP1_CTWEAKPLAYERCONTROL_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakPlayerControl.hpp" @@ -17,4 +16,3 @@ struct CTweakPlayerControl final : ITweakPlayerControl } -#endif // _DNAMP1_CTWEAKPLAYERCONTROL_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakPlayerGun.hpp b/DataSpec/DNAMP1/Tweaks/CTweakPlayerGun.hpp index b77d223f2..39f2da746 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakPlayerGun.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakPlayerGun.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKPLAYERGUN_HPP_ -#define _DNAMP1_CTWEAKPLAYERGUN_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakPlayerGun.hpp" @@ -114,4 +113,3 @@ struct CTweakPlayerGun final : ITweakPlayerGun }; } -#endif // _DNAMP1_CTWEAKPLAYERGUN_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp b/DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp index 4c41e2cdf..ae815fa4f 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKPLAYERRES_HPP_ -#define _DNAMP1_CTWEAKPLAYERRES_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakPlayerRes.hpp" @@ -103,4 +102,3 @@ struct CTweakPlayerRes final : ITweakPlayerRes } -#endif // _DNAMP1_CTWEAKPLAYERRES_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp b/DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp index cc958a073..aa15cac56 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKSLIDESHOW_HPP_ -#define _DNAMP1_CTWEAKSLIDESHOW_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakSlideShow.hpp" #include "zeus/CColor.hpp" @@ -40,4 +39,3 @@ struct CTweakSlideShow final : ITweakSlideShow } -#endif // _DNAMP1_CTWEAKSLIDESHOW_HPP_ diff --git a/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp b/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp index e948189f5..52ef02b4a 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP1_CTWEAKTARGETING_HPP_ -#define _DNAMP1_CTWEAKTARGETING_HPP_ +#pragma once #include "../../DNACommon/Tweaks/ITweakTargeting.hpp" @@ -242,4 +241,3 @@ struct CTweakTargeting final : public ITweakTargeting float GetAngularLagSpeed() const { return x224_angularLagSpeed; } }; } -#endif // _DNAMP1_CTWEAKTARGETING_HPP_ diff --git a/DataSpec/DNAMP2/AFSM.hpp b/DataSpec/DNAMP2/AFSM.hpp index 6f287ca15..d106d908e 100644 --- a/DataSpec/DNAMP2/AFSM.hpp +++ b/DataSpec/DNAMP2/AFSM.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_AFSM_HPP_ -#define _DNAMP2_AFSM_HPP_ +#pragma once #include "../DNAMP1/AFSM.hpp" @@ -7,4 +6,3 @@ namespace DataSpec::DNAMP2 { using AFSM = DNAMP1::AFSM; } -#endif // _RETRO_AFSM_HPP_ diff --git a/DataSpec/DNAMP2/AGSC.hpp b/DataSpec/DNAMP2/AGSC.hpp index 357a578b4..9b57f9961 100644 --- a/DataSpec/DNAMP2/AGSC.hpp +++ b/DataSpec/DNAMP2/AGSC.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_AGSC_HPP_ -#define _DNAMP2_AGSC_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DNAMP2.hpp" @@ -27,4 +26,3 @@ public: } -#endif // _DNAMP2_AGSC_HPP_ diff --git a/DataSpec/DNAMP2/ANCS.hpp b/DataSpec/DNAMP2/ANCS.hpp index b539baaf8..7e593df24 100644 --- a/DataSpec/DNAMP2/ANCS.hpp +++ b/DataSpec/DNAMP2/ANCS.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_ANCS_HPP_ -#define _DNAMP2_ANCS_HPP_ +#pragma once #include #include "DataSpec/DNACommon/DNACommon.hpp" @@ -258,4 +257,3 @@ struct ANCS : BigDNA } -#endif // _DNAMP2_ANCS_HPP_ diff --git a/DataSpec/DNAMP2/ANIM.hpp b/DataSpec/DNAMP2/ANIM.hpp index e8e396900..b87701858 100644 --- a/DataSpec/DNAMP2/ANIM.hpp +++ b/DataSpec/DNAMP2/ANIM.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_ANIM_HPP_ -#define _DNAMP2_ANIM_HPP_ +#pragma once #include "DNAMP2.hpp" #include "DataSpec/DNACommon/ANIM.hpp" @@ -190,4 +189,3 @@ struct ANIM : BigDNA } -#endif // _DNAMP2_ANIM_HPP_ diff --git a/DataSpec/DNAMP2/CINF.hpp b/DataSpec/DNAMP2/CINF.hpp index cb7042b84..0107d7d73 100644 --- a/DataSpec/DNAMP2/CINF.hpp +++ b/DataSpec/DNAMP2/CINF.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_CINF_HPP_ -#define _DNAMP2_CINF_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/RigInverter.hpp" @@ -46,4 +45,3 @@ struct CINF : BigDNA } -#endif // _DNAMP2_CINF_HPP_ diff --git a/DataSpec/DNAMP2/CMDL.hpp b/DataSpec/DNAMP2/CMDL.hpp index c671f3059..281c2d638 100644 --- a/DataSpec/DNAMP2/CMDL.hpp +++ b/DataSpec/DNAMP2/CMDL.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_CMDL_HPP_ -#define _DNAMP2_CMDL_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/CMDL.hpp" @@ -25,4 +24,3 @@ struct CMDL } -#endif // _DNAMP2_CMDL_HPP_ diff --git a/DataSpec/DNAMP2/CMDLMaterials.hpp b/DataSpec/DNAMP2/CMDLMaterials.hpp index 466319230..b05fd4f9e 100644 --- a/DataSpec/DNAMP2/CMDLMaterials.hpp +++ b/DataSpec/DNAMP2/CMDLMaterials.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_CMDL_MATERIALS_HPP_ -#define _DNAMP2_CMDL_MATERIALS_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/GX.hpp" @@ -76,4 +75,3 @@ struct MaterialSet : BigDNA } -#endif // _DNAMP2_CMDL_MATERIALS_HPP_ diff --git a/DataSpec/DNAMP2/CSKR.hpp b/DataSpec/DNAMP2/CSKR.hpp index 2f93d825c..c1a236c4d 100644 --- a/DataSpec/DNAMP2/CSKR.hpp +++ b/DataSpec/DNAMP2/CSKR.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_CSKR_HPP_ -#define _DNAMP2_CSKR_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "CINF.hpp" @@ -22,4 +21,3 @@ struct CSKR : DNAMP1::CSKR } -#endif // _DNAMP2_CSKR_HPP_ diff --git a/DataSpec/DNAMP2/DNAMP2.hpp b/DataSpec/DNAMP2/DNAMP2.hpp index a88d2d786..ff48542d9 100644 --- a/DataSpec/DNAMP2/DNAMP2.hpp +++ b/DataSpec/DNAMP2/DNAMP2.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_HPP__ -#define __DNAMP2_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "PAK.hpp" @@ -42,4 +41,3 @@ public: } -#endif // __DNAMP2_HPP__ diff --git a/DataSpec/DNAMP2/DeafBabe.hpp b/DataSpec/DNAMP2/DeafBabe.hpp index 124bea066..68c8c0647 100644 --- a/DataSpec/DNAMP2/DeafBabe.hpp +++ b/DataSpec/DNAMP2/DeafBabe.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP2_DEAFBABE_HPP_ -#define _DNAMP2_DEAFBABE_HPP_ +#pragma once #include "../DNAMP1/DeafBabe.hpp" @@ -143,4 +142,3 @@ struct DeafBabe : BigDNA } -#endif // _DNAMP2_DEAFBABE_HPP_ diff --git a/DataSpec/DNAMP2/MAPA.hpp b/DataSpec/DNAMP2/MAPA.hpp index 92cbc28d8..820137c4b 100644 --- a/DataSpec/DNAMP2/MAPA.hpp +++ b/DataSpec/DNAMP2/MAPA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_MAPA_HPP__ -#define __DNAMP2_MAPA_HPP__ +#pragma once #include "DataSpec/DNACommon/PAK.hpp" #include "DataSpec/DNACommon/MAPA.hpp" @@ -36,4 +35,3 @@ struct MAPA : DNAMAPA::MAPA } -#endif diff --git a/DataSpec/DNAMP2/MAPU.hpp b/DataSpec/DNAMP2/MAPU.hpp index 8a3fe59b8..32ece287d 100644 --- a/DataSpec/DNAMP2/MAPU.hpp +++ b/DataSpec/DNAMP2/MAPU.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_MAPU_HPP__ -#define __DNAMP2_MAPU_HPP__ +#pragma once #include @@ -29,4 +28,3 @@ struct MAPU : DNAMAPU::MAPU }; } -#endif diff --git a/DataSpec/DNAMP2/MLVL.hpp b/DataSpec/DNAMP2/MLVL.hpp index 095a1f89f..0f2277077 100644 --- a/DataSpec/DNAMP2/MLVL.hpp +++ b/DataSpec/DNAMP2/MLVL.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_MLVL_HPP__ -#define __DNAMP2_MLVL_HPP__ +#pragma once #include "DataSpec/DNACommon/PAK.hpp" #include "DataSpec/DNACommon/MLVL.hpp" @@ -113,4 +112,3 @@ struct MLVL : BigDNA } -#endif // __DNAMP2_MLVL_HPP__ diff --git a/DataSpec/DNAMP2/MREA.hpp b/DataSpec/DNAMP2/MREA.hpp index bb8d32ae3..4e4f142ce 100644 --- a/DataSpec/DNAMP2/MREA.hpp +++ b/DataSpec/DNAMP2/MREA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_MREA_HPP__ -#define __DNAMP2_MREA_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "CMDLMaterials.hpp" @@ -127,4 +126,3 @@ struct MREA } -#endif diff --git a/DataSpec/DNAMP2/PAK.hpp b/DataSpec/DNAMP2/PAK.hpp index 586dc8e7c..0cd1a4e84 100644 --- a/DataSpec/DNAMP2/PAK.hpp +++ b/DataSpec/DNAMP2/PAK.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_PAK_HPP__ -#define __DNAMP2_PAK_HPP__ +#pragma once #include "../DNAMP1/PAK.hpp" @@ -15,4 +14,3 @@ struct PAK : DNAMP1::PAK } -#endif // __DNAMP2_PAK_HPP__ diff --git a/DataSpec/DNAMP2/PTLA.hpp b/DataSpec/DNAMP2/PTLA.hpp index c18fd15fd..58ce9e972 100644 --- a/DataSpec/DNAMP2/PTLA.hpp +++ b/DataSpec/DNAMP2/PTLA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_PTLA_HPP__ -#define __DNAMP2_PTLA_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" @@ -66,4 +65,3 @@ struct PTLA : BigDNA Vector entries3; }; } -#endif // __DNAMP2_PTLA_HPP__ diff --git a/DataSpec/DNAMP2/SAVW.hpp b/DataSpec/DNAMP2/SAVW.hpp index c0fad1933..cb2e5551e 100644 --- a/DataSpec/DNAMP2/SAVW.hpp +++ b/DataSpec/DNAMP2/SAVW.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_SAVW_HPP__ -#define __DNAMP2_SAVW_HPP__ +#pragma once #include "../DNAMP1/SAVW.hpp" #include "DNAMP2.hpp" @@ -18,4 +17,3 @@ struct SAVW : DNAMP1::SAVW }; } -#endif // __DNAMP2_SAVW_HPP__ diff --git a/DataSpec/DNAMP2/STRG.hpp b/DataSpec/DNAMP2/STRG.hpp index d87ebc488..715a7ebeb 100644 --- a/DataSpec/DNAMP2/STRG.hpp +++ b/DataSpec/DNAMP2/STRG.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP2_STRG_HPP__ -#define __DNAMP2_STRG_HPP__ +#pragma once #include #include "DataSpec/DNACommon/PAK.hpp" @@ -84,4 +83,3 @@ struct STRG : ISTRG } -#endif // __DNAMP2_STRG_HPP__ diff --git a/DataSpec/DNAMP3/ANIM.hpp b/DataSpec/DNAMP3/ANIM.hpp index 5b8642a71..ccbb7e699 100644 --- a/DataSpec/DNAMP3/ANIM.hpp +++ b/DataSpec/DNAMP3/ANIM.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_ANIM_HPP_ -#define _DNAMP3_ANIM_HPP_ +#pragma once #include "DNAMP3.hpp" #include "DataSpec/DNACommon/ANIM.hpp" @@ -95,4 +94,3 @@ struct ANIM : BigDNA } -#endif // _DNAMP3_ANIM_HPP_ diff --git a/DataSpec/DNAMP3/CAUD.hpp b/DataSpec/DNAMP3/CAUD.hpp index d1110a796..28f6f6708 100644 --- a/DataSpec/DNAMP3/CAUD.hpp +++ b/DataSpec/DNAMP3/CAUD.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_CAUD_HPP_ -#define _DNAMP3_CAUD_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/PAK.hpp" @@ -118,4 +117,3 @@ struct CAUD : BigDNA }; } -#endif // _DNAMP3_CAUD_HPP_ diff --git a/DataSpec/DNAMP3/CHAR.hpp b/DataSpec/DNAMP3/CHAR.hpp index e9ccaf9a6..9a6bab54b 100644 --- a/DataSpec/DNAMP3/CHAR.hpp +++ b/DataSpec/DNAMP3/CHAR.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_CHAR_HPP_ -#define _DNAMP3_CHAR_HPP_ +#pragma once #include #include "DataSpec/DNACommon/DNACommon.hpp" @@ -349,4 +348,3 @@ struct CHAR : BigDNA } -#endif // _DNAMP3_CHAR_HPP_ diff --git a/DataSpec/DNAMP3/CINF.hpp b/DataSpec/DNAMP3/CINF.hpp index 714b46b97..1eeffa3c1 100644 --- a/DataSpec/DNAMP3/CINF.hpp +++ b/DataSpec/DNAMP3/CINF.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_CINF_HPP_ -#define _DNAMP3_CINF_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "../DNAMP2/CINF.hpp" @@ -16,4 +15,3 @@ struct CINF : DNAMP2::CINF } -#endif // _DNAMP3_CINF_HPP_ diff --git a/DataSpec/DNAMP3/CMDL.hpp b/DataSpec/DNAMP3/CMDL.hpp index eae6d5d14..21e973c99 100644 --- a/DataSpec/DNAMP3/CMDL.hpp +++ b/DataSpec/DNAMP3/CMDL.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_CMDL_HPP_ -#define _DNAMP3_CMDL_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/CMDL.hpp" @@ -25,4 +24,3 @@ struct CMDL } -#endif // _DNAMP3_CMDL_HPP_ diff --git a/DataSpec/DNAMP3/CMDLMaterials.hpp b/DataSpec/DNAMP3/CMDLMaterials.hpp index 222a126e1..02e102105 100644 --- a/DataSpec/DNAMP3/CMDLMaterials.hpp +++ b/DataSpec/DNAMP3/CMDLMaterials.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_CMDL_MATERIALS_HPP_ -#define _DNAMP3_CMDL_MATERIALS_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/GX.hpp" @@ -203,4 +202,3 @@ struct MaterialSet : BigDNA } -#endif // _DNAMP3_CMDL_MATERIALS_HPP_ diff --git a/DataSpec/DNAMP3/CSKR.hpp b/DataSpec/DNAMP3/CSKR.hpp index 96e56e89b..03d392efa 100644 --- a/DataSpec/DNAMP3/CSKR.hpp +++ b/DataSpec/DNAMP3/CSKR.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_CSKR_HPP_ -#define _DNAMP3_CSKR_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "CINF.hpp" @@ -43,4 +42,3 @@ struct CSKR : BigDNA } -#endif // _DNAMP3_CSKR_HPP_ diff --git a/DataSpec/DNAMP3/DNAMP3.hpp b/DataSpec/DNAMP3/DNAMP3.hpp index 85455002e..30741d5ea 100644 --- a/DataSpec/DNAMP3/DNAMP3.hpp +++ b/DataSpec/DNAMP3/DNAMP3.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP3_HPP__ -#define __DNAMP3_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "PAK.hpp" @@ -41,4 +40,3 @@ public: } -#endif // __DNAMP3_HPP__ diff --git a/DataSpec/DNAMP3/HINT.hpp b/DataSpec/DNAMP3/HINT.hpp index 7195ff70b..7f3f1336a 100644 --- a/DataSpec/DNAMP3/HINT.hpp +++ b/DataSpec/DNAMP3/HINT.hpp @@ -1,5 +1,4 @@ -#ifndef _DNAMP3_HINT_HPP_ -#define _DNAMP3_HINT_HPP_ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "PAK.hpp" @@ -46,4 +45,3 @@ struct HINT : BigDNA } }; } -#endif // _DNAMP1_HINT_HPP_ diff --git a/DataSpec/DNAMP3/MAPA.hpp b/DataSpec/DNAMP3/MAPA.hpp index 3c3c42e1c..6b5e4a7cc 100644 --- a/DataSpec/DNAMP3/MAPA.hpp +++ b/DataSpec/DNAMP3/MAPA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP3_MAPA_HPP__ -#define __DNAMP3_MAPA_HPP__ +#pragma once #include "DataSpec/DNACommon/PAK.hpp" #include "DataSpec/DNACommon/MAPA.hpp" @@ -36,4 +35,3 @@ struct MAPA : DNAMAPA::MAPA } -#endif diff --git a/DataSpec/DNAMP3/MLVL.hpp b/DataSpec/DNAMP3/MLVL.hpp index 1591ede82..1ec315766 100644 --- a/DataSpec/DNAMP3/MLVL.hpp +++ b/DataSpec/DNAMP3/MLVL.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP3_MLVL_HPP__ -#define __DNAMP3_MLVL_HPP__ +#pragma once #include "DataSpec/DNACommon/PAK.hpp" #include "DataSpec/DNACommon/MLVL.hpp" @@ -102,4 +101,3 @@ struct MLVL : BigDNA } -#endif // __DNAMP3_MLVL_HPP__ diff --git a/DataSpec/DNAMP3/MREA.hpp b/DataSpec/DNAMP3/MREA.hpp index b42610cb8..58ec8b629 100644 --- a/DataSpec/DNAMP3/MREA.hpp +++ b/DataSpec/DNAMP3/MREA.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP3_MREA_HPP__ -#define __DNAMP3_MREA_HPP__ +#pragma once #include "DataSpec/DNACommon/DNACommon.hpp" #include "CMDLMaterials.hpp" @@ -127,4 +126,3 @@ struct MREA } -#endif // __DNAMP3_MREA_HPP__ diff --git a/DataSpec/DNAMP3/PAK.hpp b/DataSpec/DNAMP3/PAK.hpp index 6eb4f97a8..669ff8f9c 100644 --- a/DataSpec/DNAMP3/PAK.hpp +++ b/DataSpec/DNAMP3/PAK.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP3_PAK_HPP__ -#define __DNAMP3_PAK_HPP__ +#pragma once #include @@ -74,4 +73,3 @@ struct PAK : BigDNA } -#endif // __DNAMP3_PAK_HPP__ diff --git a/DataSpec/DNAMP3/SAVW.hpp b/DataSpec/DNAMP3/SAVW.hpp index 3d86dce5c..289bf4c00 100644 --- a/DataSpec/DNAMP3/SAVW.hpp +++ b/DataSpec/DNAMP3/SAVW.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP3_SAVW_HPP__ -#define __DNAMP3_SAVW_HPP__ +#pragma once #include "DataSpec/DNACommon/SAVWCommon.hpp" #include "DNAMP3.hpp" @@ -46,4 +45,3 @@ struct SAVW : BigDNA }; } -#endif // __DNAMP3_SAVW_HPP__ diff --git a/DataSpec/DNAMP3/STRG.hpp b/DataSpec/DNAMP3/STRG.hpp index 0eac86a5e..722f48905 100644 --- a/DataSpec/DNAMP3/STRG.hpp +++ b/DataSpec/DNAMP3/STRG.hpp @@ -1,5 +1,4 @@ -#ifndef __DNAMP3_STRG_HPP__ -#define __DNAMP3_STRG_HPP__ +#pragma once #include #include "DataSpec/DNACommon/PAK.hpp" @@ -83,4 +82,3 @@ struct STRG : ISTRG } -#endif // __DNAMP2_STRG_HPP__ diff --git a/DataSpec/SpecBase.hpp b/DataSpec/SpecBase.hpp index fb26a5a31..e2f411f7a 100644 --- a/DataSpec/SpecBase.hpp +++ b/DataSpec/SpecBase.hpp @@ -1,5 +1,4 @@ -#ifndef SPECBASE_HPP -#define SPECBASE_HPP +#pragma once #include #include @@ -240,5 +239,4 @@ protected: } -#endif // SPECBASE_HPP diff --git a/Editor/Camera.hpp b/Editor/Camera.hpp index 72beea6fb..ea7736cba 100644 --- a/Editor/Camera.hpp +++ b/Editor/Camera.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CAMERA_HPP -#define URDE_CAMERA_HPP +#pragma once #include "zeus/CProjection.hpp" #include "zeus/CFrustum.hpp" @@ -29,4 +28,3 @@ public: } -#endif // URDE_CAMERA_HPP diff --git a/Editor/GameMode.hpp b/Editor/GameMode.hpp index 16c432e5b..ff59a6186 100644 --- a/Editor/GameMode.hpp +++ b/Editor/GameMode.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_GAMEMODE_HPP -#define URDE_GAMEMODE_HPP +#pragma once #include "Space.hpp" #include "ViewManager.hpp" @@ -74,4 +73,3 @@ public: }; } -#endif // URDE_GAMEMODE_HPP diff --git a/Editor/InformationCenter.hpp b/Editor/InformationCenter.hpp index b7e53bcbc..1f578a143 100644 --- a/Editor/InformationCenter.hpp +++ b/Editor/InformationCenter.hpp @@ -1,5 +1,4 @@ -#ifndef INFORMATIONCENTER_HPP -#define INFORMATIONCENTER_HPP +#pragma once #include "Space.hpp" #include "ViewManager.hpp" @@ -68,4 +67,3 @@ public: }; } -#endif // INFORMATIONCENTER_HPP diff --git a/Editor/ModelViewer.hpp b/Editor/ModelViewer.hpp index 1941eea1a..cbc82bbde 100644 --- a/Editor/ModelViewer.hpp +++ b/Editor/ModelViewer.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_MODEL_VIEWER_HPP -#define URDE_MODEL_VIEWER_HPP +#pragma once #include "Space.hpp" #include "ViewManager.hpp" @@ -86,4 +85,3 @@ public: } -#endif // URDE_MODEL_VIEWER_HPP diff --git a/Editor/ParticleEditor.hpp b/Editor/ParticleEditor.hpp index eb2ecfc98..ba229c49c 100644 --- a/Editor/ParticleEditor.hpp +++ b/Editor/ParticleEditor.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_PARTICLE_EDITOR_HPP -#define URDE_PARTICLE_EDITOR_HPP +#pragma once #include "Space.hpp" @@ -45,4 +44,3 @@ public: } -#endif // URDE_PARTICLE_EDITOR_HPP diff --git a/Editor/ProjectManager.hpp b/Editor/ProjectManager.hpp index 87aa6fe2d..268e90f6d 100644 --- a/Editor/ProjectManager.hpp +++ b/Editor/ProjectManager.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_PROJECT_MANAGER_HPP -#define URDE_PROJECT_MANAGER_HPP +#pragma once #include "hecl/Database.hpp" #include "athena/DNAYaml.hpp" @@ -60,4 +59,3 @@ public: } -#endif // URDE_PROJECT_MANAGER_HPP diff --git a/Editor/ProjectResourceFactoryBase.hpp b/Editor/ProjectResourceFactoryBase.hpp index d8d23de42..b01c28295 100644 --- a/Editor/ProjectResourceFactoryBase.hpp +++ b/Editor/ProjectResourceFactoryBase.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_PROJECT_RESOURCE_FACTORY_BASE_HPP -#define URDE_PROJECT_RESOURCE_FACTORY_BASE_HPP +#pragma once #include "hecl/ClientProcess.hpp" #include "hecl/Database.hpp" @@ -185,4 +184,3 @@ public: } -#endif // URDE_PROJECT_RESOURCE_FACTORY_BASE_HPP diff --git a/Editor/ProjectResourceFactoryMP1.hpp b/Editor/ProjectResourceFactoryMP1.hpp index bcb4d36c5..a2c95811f 100644 --- a/Editor/ProjectResourceFactoryMP1.hpp +++ b/Editor/ProjectResourceFactoryMP1.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_PROJECT_RESOURCE_FACTORY_MP1_HPP -#define URDE_PROJECT_RESOURCE_FACTORY_MP1_HPP +#pragma once #include "ProjectResourceFactoryBase.hpp" #include "CToken.hpp" @@ -23,4 +22,3 @@ public: } -#endif // URDE_PROJECT_RESOURCE_FACTORY_MP1_HPP diff --git a/Editor/Resource.hpp b/Editor/Resource.hpp index 4bd3def17..04848ebec 100644 --- a/Editor/Resource.hpp +++ b/Editor/Resource.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_RESOURCE_HPP -#define URDE_RESOURCE_HPP +#pragma once #include "hecl/Database.hpp" #include "Space.hpp" @@ -47,4 +46,3 @@ private: } -#endif // URDE_RESOURCE_HPP diff --git a/Editor/ResourceBrowser.hpp b/Editor/ResourceBrowser.hpp index 7062db850..8cd08a64b 100644 --- a/Editor/ResourceBrowser.hpp +++ b/Editor/ResourceBrowser.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_RESOURCE_OUTLINER_HPP -#define URDE_RESOURCE_OUTLINER_HPP +#pragma once #include "Space.hpp" #include "ViewManager.hpp" @@ -261,4 +260,3 @@ public: } -#endif // URDE_RESOURCE_OUTLINER_HPP diff --git a/Editor/Space.hpp b/Editor/Space.hpp index bf069adcc..dd588999b 100644 --- a/Editor/Space.hpp +++ b/Editor/Space.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_SPACE_HPP -#define URDE_SPACE_HPP +#pragma once #include "athena/DNAYaml.hpp" #include "specter/Space.hpp" @@ -427,4 +426,3 @@ public: } -#endif // URDE_SPACE_HPP diff --git a/Editor/SplashScreen.hpp b/Editor/SplashScreen.hpp index 651107689..8009d4627 100644 --- a/Editor/SplashScreen.hpp +++ b/Editor/SplashScreen.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_SPLASH_SCREEN_HPP -#define URDE_SPLASH_SCREEN_HPP +#pragma once #include "specter/View.hpp" #include "specter/ModalWindow.hpp" @@ -184,4 +183,3 @@ public: } -#endif // URDE_SPLASH_SCREEN_HPP diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index 60c564b1d..f2478cd28 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_VIEW_MANAGER_HPP -#define URDE_VIEW_MANAGER_HPP +#pragma once #include "hecl/CVarManager.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp" @@ -205,4 +204,3 @@ public: } -#endif // URDE_VIEW_MANAGER_HPP diff --git a/Editor/badging/Badging.hpp b/Editor/badging/Badging.hpp index b54f5ec00..39c2a4d5f 100644 --- a/Editor/badging/Badging.hpp +++ b/Editor/badging/Badging.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_BADGING_HPP__ -#define __URDE_BADGING_HPP__ +#pragma once #include "specter/ViewResources.hpp" @@ -15,4 +14,3 @@ specter::Icon& GetBadge(); #define BADGE_PHRASE "Prototype" #endif -#endif // __URDE_BADGING_HPP__ diff --git a/Editor/icons/icons.hpp b/Editor/icons/icons.hpp index f31f4bdab..0d7ad301a 100644 --- a/Editor/icons/icons.hpp +++ b/Editor/icons/icons.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_ICONS_HPP -#define URDE_ICONS_HPP +#pragma once #include "specter/Icon.hpp" #include "specter/ViewResources.hpp" @@ -43,4 +42,3 @@ specter::Icon& GetIcon(MonoIcon icon); } -#endif // URDE_ICONS_HPP diff --git a/Editor/locale b/Editor/locale index b2436bbd0..aa6705c84 160000 --- a/Editor/locale +++ b/Editor/locale @@ -1 +1 @@ -Subproject commit b2436bbd0331d15df34b68345770d295513cbd9d +Subproject commit aa6705c84714ed9da49a8613d9f3bdc46328ea54 diff --git a/NESEmulator/CNESEmulator.hpp b/NESEmulator/CNESEmulator.hpp index c36c46c87..62fad206e 100644 --- a/NESEmulator/CNESEmulator.hpp +++ b/NESEmulator/CNESEmulator.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CNESEMULATOR_HPP__ -#define __URDE_CNESEMULATOR_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CColor.hpp" @@ -97,4 +96,3 @@ public: } } -#endif // __URDE_CNESEMULATOR_HPP__ diff --git a/NESEmulator/CNESShader.hpp b/NESEmulator/CNESShader.hpp index 6253002f8..56a5074cb 100644 --- a/NESEmulator/CNESShader.hpp +++ b/NESEmulator/CNESShader.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CNESSHADER_HPP -#define URDE_CNESSHADER_HPP +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" @@ -22,4 +21,3 @@ public: } -#endif // URDE_CNESSHADER_HPP diff --git a/Runtime/Audio/CAudioGroupSet.hpp b/Runtime/Audio/CAudioGroupSet.hpp index 5be306a03..9482162d1 100644 --- a/Runtime/Audio/CAudioGroupSet.hpp +++ b/Runtime/Audio/CAudioGroupSet.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUDIOGROUPSET_HPP__ -#define __URDE_CAUDIOGROUPSET_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -31,4 +30,3 @@ CFactoryFnReturn FAudioGroupSetDataFactory(const urde::SObjectTag& tag, } -#endif // __URDE_CAUDIOGROUPSET_HPP__ diff --git a/Runtime/Audio/CAudioSys.hpp b/Runtime/Audio/CAudioSys.hpp index acb7beddf..ba18c6bb5 100644 --- a/Runtime/Audio/CAudioSys.hpp +++ b/Runtime/Audio/CAudioSys.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUDIOSYS_HPP__ -#define __URDE_CAUDIOSYS_HPP__ +#pragma once #include "../GCNTypes.hpp" #include "zeus/CVector3f.hpp" @@ -96,4 +95,3 @@ public: } -#endif // __URDE_CAUDIOSYS_HPP__ diff --git a/Runtime/Audio/CMidiManager.hpp b/Runtime/Audio/CMidiManager.hpp index 7efd43999..815366531 100644 --- a/Runtime/Audio/CMidiManager.hpp +++ b/Runtime/Audio/CMidiManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMIDIMANAGER_HPP__ -#define __URDE_CMIDIMANAGER_HPP__ +#pragma once #include "CSfxManager.hpp" @@ -59,4 +58,3 @@ using CMidiHandle = CMidiManager::CMidiHandle; } -#endif // __URDE_CMIDIMANAGER_HPP__ diff --git a/Runtime/Audio/CSfxManager.hpp b/Runtime/Audio/CSfxManager.hpp index 1bdb189e3..9e0f513f5 100644 --- a/Runtime/Audio/CSfxManager.hpp +++ b/Runtime/Audio/CSfxManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSFXMANAGER_HPP__ -#define __URDE_CSFXMANAGER_HPP__ +#pragma once #include #include "../RetroTypes.hpp" @@ -260,4 +259,3 @@ using CSfxHandle = CSfxManager::CSfxHandle; } -#endif // __URDE_CSFXMANAGER_HPP__ diff --git a/Runtime/Audio/CStaticAudioPlayer.hpp b/Runtime/Audio/CStaticAudioPlayer.hpp index c94455e64..f3f878789 100644 --- a/Runtime/Audio/CStaticAudioPlayer.hpp +++ b/Runtime/Audio/CStaticAudioPlayer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTATICAUDIOPLAYER_HPP__ -#define __URDE_CSTATICAUDIOPLAYER_HPP__ +#pragma once #include "CAudioSys.hpp" #include "RetroTypes.hpp" @@ -86,4 +85,3 @@ public: } -#endif // __URDE_CSTATICAUDIOPLAYER_HPP__ diff --git a/Runtime/Audio/CStreamAudioManager.hpp b/Runtime/Audio/CStreamAudioManager.hpp index 44380dd16..7fbbdcc2d 100644 --- a/Runtime/Audio/CStreamAudioManager.hpp +++ b/Runtime/Audio/CStreamAudioManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTREAMAUDIOMANAGER_HPP__ -#define __URDE_CSTREAMAUDIOMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -38,4 +37,3 @@ public: } -#endif // __URDE_CSTREAMAUDIOMANAGER_HPP__ diff --git a/Runtime/AutoMapper/CAutoMapper.hpp b/Runtime/AutoMapper/CAutoMapper.hpp index 4a94a4f78..0c019b75d 100644 --- a/Runtime/AutoMapper/CAutoMapper.hpp +++ b/Runtime/AutoMapper/CAutoMapper.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUTOMAPPER_HPP__ -#define __URDE_CAUTOMAPPER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CInGameTweakManagerBase.hpp" @@ -303,4 +302,3 @@ public: }; } -#endif // __URDE_CAUTOMAPPER_HPP__ diff --git a/Runtime/AutoMapper/CMapArea.hpp b/Runtime/AutoMapper/CMapArea.hpp index 92fece680..1aaac6e60 100644 --- a/Runtime/AutoMapper/CMapArea.hpp +++ b/Runtime/AutoMapper/CMapArea.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAPAREA_HPP__ -#define __URDE_CMAPAREA_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CResFactory.hpp" @@ -92,4 +91,3 @@ public: CFactoryFnReturn FMapAreaFactory(const SObjectTag& objTag, CInputStream& in, const CVParamTransfer&, CObjectReference*); } -#endif // __URDE_CMAPAREA_HPP__ diff --git a/Runtime/AutoMapper/CMapUniverse.hpp b/Runtime/AutoMapper/CMapUniverse.hpp index 008542ca5..b43b608a0 100644 --- a/Runtime/AutoMapper/CMapUniverse.hpp +++ b/Runtime/AutoMapper/CMapUniverse.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAPUNIVERSE_HPP__ -#define __URDE_CMAPUNIVERSE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -121,4 +120,3 @@ CFactoryFnReturn FMapUniverseFactory(const SObjectTag& tag, CInputStream& in, co CObjectReference*); } -#endif diff --git a/Runtime/AutoMapper/CMapWorld.hpp b/Runtime/AutoMapper/CMapWorld.hpp index ec8180588..b91eaff85 100644 --- a/Runtime/AutoMapper/CMapWorld.hpp +++ b/Runtime/AutoMapper/CMapWorld.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAPWORLD_HPP__ -#define __URDE_CMAPWORLD_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -174,4 +173,3 @@ CFactoryFnReturn FMapWorldFactory(const SObjectTag& tag, CInputStream& in, const } -#endif // __URDE_CMAPWORLD_HPP__ diff --git a/Runtime/AutoMapper/CMapWorldInfo.hpp b/Runtime/AutoMapper/CMapWorldInfo.hpp index 4a6afda2c..531974cf2 100644 --- a/Runtime/AutoMapper/CMapWorldInfo.hpp +++ b/Runtime/AutoMapper/CMapWorldInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAPWORLDINFO_HPP__ -#define __URDE_CMAPWORLDINFO_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -32,4 +31,3 @@ public: }; } -#endif // __URDE_CMAPWORLDINFO_HPP__ diff --git a/Runtime/AutoMapper/CMappableObject.hpp b/Runtime/AutoMapper/CMappableObject.hpp index df58363b0..f834d7d85 100644 --- a/Runtime/AutoMapper/CMappableObject.hpp +++ b/Runtime/AutoMapper/CMappableObject.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAPPABLEOBJECT_HPP__ -#define __URDE_CMAPPABLEOBJECT_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -104,4 +103,3 @@ public: static void Shutdown(); }; } -#endif // __URDE_CMAPPABLEOBJECT_HPP__ diff --git a/Runtime/CArchitectureMessage.hpp b/Runtime/CArchitectureMessage.hpp index 0426d6bc2..e1f0cc069 100644 --- a/Runtime/CArchitectureMessage.hpp +++ b/Runtime/CArchitectureMessage.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CARCHITECTUREMESSAGE_HPP__ -#define __URDE_CARCHITECTUREMESSAGE_HPP__ +#pragma once #include "GCNTypes.hpp" #include "Input/CFinalInput.hpp" @@ -180,4 +179,3 @@ public: }; } -#endif // __URDE_CARCHITECTUREMESSAGE_HPP__ diff --git a/Runtime/CArchitectureQueue.hpp b/Runtime/CArchitectureQueue.hpp index 336151127..2fb70c480 100644 --- a/Runtime/CArchitectureQueue.hpp +++ b/Runtime/CArchitectureQueue.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CARCHITECTUREQUEUE_HPP__ -#define __URDE_CARCHITECTUREQUEUE_HPP__ +#pragma once #include #include "CArchitectureMessage.hpp" @@ -27,4 +26,3 @@ public: } -#endif // __URDE_CARCHITECTUREQUEUE_HPP__ diff --git a/Runtime/CBasics.hpp b/Runtime/CBasics.hpp index bd0567fcd..31b1c01cd 100644 --- a/Runtime/CBasics.hpp +++ b/Runtime/CBasics.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBASICS_HPP__ -#define __URDE_CBASICS_HPP__ +#pragma once #include #include @@ -48,4 +47,3 @@ public: } -#endif // __URDE_CBASICS_HPP__ diff --git a/Runtime/CCRC32.hpp b/Runtime/CCRC32.hpp index cb715f07d..1f58a743f 100644 --- a/Runtime/CCRC32.hpp +++ b/Runtime/CCRC32.hpp @@ -1,5 +1,4 @@ -#ifndef RETRO_CRC32_HPP -#define RETRO_CRC32_HPP +#pragma once #include namespace urde @@ -17,4 +16,3 @@ public: } -#endif diff --git a/Runtime/CDependencyGroup.hpp b/Runtime/CDependencyGroup.hpp index d130cc20a..976d368eb 100644 --- a/Runtime/CDependencyGroup.hpp +++ b/Runtime/CDependencyGroup.hpp @@ -1,5 +1,4 @@ -#ifndef CDEPENDENCYGROUP_HPP -#define CDEPENDENCYGROUP_HPP +#pragma once #include "CFactoryMgr.hpp" @@ -18,4 +17,3 @@ CFactoryFnReturn FDependencyGroupFactory(const SObjectTag& tag, CInputStream& in CObjectReference* selfRef); } -#endif // CDEPENDENCYGROUP_HPP diff --git a/Runtime/CDvdFile.hpp b/Runtime/CDvdFile.hpp index 35a9ba0b4..748e5424c 100644 --- a/Runtime/CDvdFile.hpp +++ b/Runtime/CDvdFile.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDVDFILE_HPP__ -#define __URDE_CDVDFILE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "athena/FileReader.hpp" @@ -78,4 +77,3 @@ public: }; } -#endif // __URDE_CDVDFILE_HPP__ diff --git a/Runtime/CDvdRequest.hpp b/Runtime/CDvdRequest.hpp index 500cbc029..728bc428a 100644 --- a/Runtime/CDvdRequest.hpp +++ b/Runtime/CDvdRequest.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDVDREQUEST_HPP__ -#define __URDE_CDVDREQUEST_HPP__ +#pragma once namespace urde { @@ -25,4 +24,3 @@ public: } -#endif // __URDE_CDVDREQUEST_HPP__ diff --git a/Runtime/CFactoryMgr.hpp b/Runtime/CFactoryMgr.hpp index de31d16bd..555b1454f 100644 --- a/Runtime/CFactoryMgr.hpp +++ b/Runtime/CFactoryMgr.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFACTORYMGR_HPP__ -#define __URDE_CFACTORYMGR_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -46,4 +45,3 @@ public: } -#endif // __URDE_CFACTORYMGR_HPP__ diff --git a/Runtime/CGameAllocator.hpp b/Runtime/CGameAllocator.hpp index 48bad96ed..d52f58e48 100644 --- a/Runtime/CGameAllocator.hpp +++ b/Runtime/CGameAllocator.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMEALLOCATOR_HPP__ -#define __URDE_CGAMEALLOCATOR_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -31,4 +30,3 @@ public: }; } -#endif diff --git a/Runtime/CGameDebug.hpp b/Runtime/CGameDebug.hpp index de5d34f5d..7afbf892d 100644 --- a/Runtime/CGameDebug.hpp +++ b/Runtime/CGameDebug.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMEDEBUG_HPP__ -#define __URDE_CGAMEDEBUG_HPP__ +#pragma once #include @@ -53,4 +52,3 @@ public: } -#endif // __URDE_CGAMEDEBUG_HPP__ diff --git a/Runtime/CGameHintInfo.hpp b/Runtime/CGameHintInfo.hpp index 6e22f6f1f..571b49c5b 100644 --- a/Runtime/CGameHintInfo.hpp +++ b/Runtime/CGameHintInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMEHINTINFO_HPP__ -#define __URDE_CGAMEHINTINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "IFactory.hpp" @@ -47,4 +46,3 @@ public: CFactoryFnReturn FHintFactory(const SObjectTag&, CInputStream&, const CVParamTransfer, CObjectReference*); } -#endif // __URDE_CGAMEHINTINFO_HPP__ diff --git a/Runtime/CGameOptions.hpp b/Runtime/CGameOptions.hpp index 68c8d6fdf..206200594 100644 --- a/Runtime/CGameOptions.hpp +++ b/Runtime/CGameOptions.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMEOPTIONS_HPP__ -#define __URDE_CGAMEOPTIONS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Audio/CAudioSys.hpp" @@ -239,4 +238,3 @@ public: } -#endif // __URDE_CGAMEOPTIONS_HPP__ diff --git a/Runtime/CGameOptionsTouchBar.hpp b/Runtime/CGameOptionsTouchBar.hpp index 828638ec7..8e3ba4a39 100644 --- a/Runtime/CGameOptionsTouchBar.hpp +++ b/Runtime/CGameOptionsTouchBar.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMEOPTIONSTOUCHBAR_HPP__ -#define __URDE_CGAMEOPTIONSTOUCHBAR_HPP__ +#pragma once #include #include @@ -28,4 +27,3 @@ std::unique_ptr NewGameOptionsTouchBar(); } -#endif // __URDE_CGAMEOPTIONSTOUCHBAR_HPP__ diff --git a/Runtime/CGameState.hpp b/Runtime/CGameState.hpp index 5050fb4f6..7cfba220a 100644 --- a/Runtime/CGameState.hpp +++ b/Runtime/CGameState.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMESTATE_HPP__ -#define __URDE_CGAMESTATE_HPP__ +#pragma once #include #include "CBasics.hpp" @@ -142,4 +141,3 @@ public: }; } // namespace urde -#endif // __URDE_CGAMESTATE_HPP__ diff --git a/Runtime/CIOWin.hpp b/Runtime/CIOWin.hpp index 29b75cc1b..f7fc26449 100644 --- a/Runtime/CIOWin.hpp +++ b/Runtime/CIOWin.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CIOWIN_HPP__ -#define __URDE_CIOWIN_HPP__ +#pragma once #include #include @@ -35,4 +34,3 @@ public: } -#endif // __URDE_CIOWIN_HPP__ diff --git a/Runtime/CIOWinManager.hpp b/Runtime/CIOWinManager.hpp index 7eb79a755..18e435586 100644 --- a/Runtime/CIOWinManager.hpp +++ b/Runtime/CIOWinManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CIOWINMANAGER_HPP__ -#define __URDE_CIOWINMANAGER_HPP__ +#pragma once #include #include @@ -42,4 +41,3 @@ public: } -#endif // __URDE_CIOWINMANAGER_HPP__ diff --git a/Runtime/CInGameTweakManagerBase.hpp b/Runtime/CInGameTweakManagerBase.hpp index 50edf4f14..8b3e00fb2 100644 --- a/Runtime/CInGameTweakManagerBase.hpp +++ b/Runtime/CInGameTweakManagerBase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINGAMETWEAKMANAGERBASE_HPP__ -#define __URDE_CINGAMETWEAKMANAGERBASE_HPP__ +#pragma once #include #include @@ -87,4 +86,3 @@ public: } -#endif // __URDE_CINGAMETWEAKMANAGERBASE_HPP__ diff --git a/Runtime/CMFGameBase.hpp b/Runtime/CMFGameBase.hpp index 18ad4390c..f41a5b3b1 100644 --- a/Runtime/CMFGameBase.hpp +++ b/Runtime/CMFGameBase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMFGAMEBASE_HPP__ -#define __URDE_CMFGAMEBASE_HPP__ +#pragma once #include "CIOWin.hpp" @@ -20,4 +19,3 @@ public: } -#endif // __URDE_CMFGAMEBASE_HPP__ diff --git a/Runtime/CMainFlowBase.hpp b/Runtime/CMainFlowBase.hpp index 1061ca04d..036687a0f 100644 --- a/Runtime/CMainFlowBase.hpp +++ b/Runtime/CMainFlowBase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAINFLOWBASE_HPP__ -#define __URDE_CMAINFLOWBASE_HPP__ +#pragma once #include "CIOWin.hpp" @@ -28,4 +27,3 @@ public: } -#endif // __URDE_CMAINFLOWBASE_HPP__ diff --git a/Runtime/CMemoryCardSys.hpp b/Runtime/CMemoryCardSys.hpp index c98215476..ed5fb0d85 100644 --- a/Runtime/CMemoryCardSys.hpp +++ b/Runtime/CMemoryCardSys.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMEMORYCARDSYS_HPP__ -#define __URDE_CMEMORYCARDSYS_HPP__ +#pragma once #include "CToken.hpp" #include "World/CWorld.hpp" @@ -191,4 +190,3 @@ public: } -#endif // __URDE_CMEMORYCARDSYS_HPP__ diff --git a/Runtime/CObjectList.hpp b/Runtime/CObjectList.hpp index 7766fcac4..c602b2ce0 100644 --- a/Runtime/CObjectList.hpp +++ b/Runtime/CObjectList.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_COBJECTLIST_HPP__ -#define __URDE_COBJECTLIST_HPP__ +#pragma once #include "World/CEntity.hpp" #include "RetroTypes.hpp" @@ -84,4 +83,3 @@ public: } -#endif // __URDE_COBJECTLIST_HPP__ diff --git a/Runtime/CPakFile.hpp b/Runtime/CPakFile.hpp index b8fefe4a5..a926d216b 100644 --- a/Runtime/CPakFile.hpp +++ b/Runtime/CPakFile.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPAKFILE_HPP__ -#define __URDE_CPAKFILE_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -84,4 +83,3 @@ public: } -#endif // __URDE_CPAKFILE_HPP__ diff --git a/Runtime/CPlayMovieBase.hpp b/Runtime/CPlayMovieBase.hpp index acb5f5f25..4f7e457da 100644 --- a/Runtime/CPlayMovieBase.hpp +++ b/Runtime/CPlayMovieBase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYMOVIEBASE_HPP__ -#define __URDE_CPLAYMOVIEBASE_HPP__ +#pragma once #include "CIOWin.hpp" #include "Graphics/CMoviePlayer.hpp" @@ -19,4 +18,3 @@ public: } -#endif // __URDE_CPLAYMOVIEBASE_HPP__ diff --git a/Runtime/CPlayerState.hpp b/Runtime/CPlayerState.hpp index f82aff783..cee0837dd 100644 --- a/Runtime/CPlayerState.hpp +++ b/Runtime/CPlayerState.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYERSTATE_HPP__ -#define __URDE_CPLAYERSTATE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CBasics.hpp" @@ -193,4 +192,3 @@ public: }; } -#endif // __URDE_CPLAYERSTATE_HPP__ diff --git a/Runtime/CRandom16.hpp b/Runtime/CRandom16.hpp index cb7b55f96..2ef57217f 100644 --- a/Runtime/CRandom16.hpp +++ b/Runtime/CRandom16.hpp @@ -1,5 +1,4 @@ -#ifndef RETRO_CRANDOM16_HPP -#define RETRO_CRANDOM16_HPP +#pragma once #include "GCNTypes.hpp" @@ -73,4 +72,3 @@ public: } -#endif // RETRO_CRANDOM16_HPP diff --git a/Runtime/CRelayTracker.hpp b/Runtime/CRelayTracker.hpp index 6aaa44463..41b22fcb4 100644 --- a/Runtime/CRelayTracker.hpp +++ b/Runtime/CRelayTracker.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRELAYTRACKER_HPP__ -#define __URDE_CRELAYTRACKER_HPP__ +#pragma once #include "IOStreams.hpp" #include "World/ScriptObjectSupport.hpp" @@ -40,4 +39,3 @@ public: } -#endif // __URDE_CRELAYTRACKER_HPP__ diff --git a/Runtime/CResFactory.hpp b/Runtime/CResFactory.hpp index 7de49183f..43206074b 100644 --- a/Runtime/CResFactory.hpp +++ b/Runtime/CResFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRESFACTORY_HPP__ -#define __URDE_CRESFACTORY_HPP__ +#pragma once #include #include "IFactory.hpp" @@ -121,4 +120,3 @@ public: } -#endif // __URDE_CRESFACTORY_HPP__ diff --git a/Runtime/CResLoader.hpp b/Runtime/CResLoader.hpp index 22fb9b935..f7ed6b087 100644 --- a/Runtime/CResLoader.hpp +++ b/Runtime/CResLoader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRESLOADER_HPP__ -#define __URDE_CRESLOADER_HPP__ +#pragma once #include #include @@ -59,4 +58,3 @@ public: } -#endif // __URDE_CRESLOADER_HPP__ diff --git a/Runtime/CSaveWorld.hpp b/Runtime/CSaveWorld.hpp index df4043779..ca5b2f592 100644 --- a/Runtime/CSaveWorld.hpp +++ b/Runtime/CSaveWorld.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSAVEWORLD_HPP__ -#define __URDE_CSAVEWORLD_HPP__ +#pragma once #include "RetroTypes.hpp" #include "DNACommon/SAVWCommon.hpp" @@ -51,4 +50,3 @@ CFactoryFnReturn FSaveWorldFactory(const SObjectTag& tag, CInputStream& in, cons } -#endif // __URDE_CSAVEWORLD_HPP__ diff --git a/Runtime/CScannableObjectInfo.hpp b/Runtime/CScannableObjectInfo.hpp index 51d59a43f..2c784860e 100644 --- a/Runtime/CScannableObjectInfo.hpp +++ b/Runtime/CScannableObjectInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCANNABLEOBJECTINFO_HPP__ -#define __URDE_CSCANNABLEOBJECTINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "IFactory.hpp" @@ -48,4 +47,3 @@ public: CFactoryFnReturn FScannableObjectInfoFactory(const SObjectTag&, CInputStream&, const CVParamTransfer&, CObjectReference* selfRef); } -#endif // __URDE_CSCANNABLEOBJECTINFO_HPP__ diff --git a/Runtime/CSimplePool.hpp b/Runtime/CSimplePool.hpp index 7e6dffaee..758382717 100644 --- a/Runtime/CSimplePool.hpp +++ b/Runtime/CSimplePool.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSIMPLEPOOL_HPP__ -#define __URDE_CSIMPLEPOOL_HPP__ +#pragma once #include "IObjectStore.hpp" #include "RetroTypes.hpp" @@ -36,4 +35,3 @@ public: } -#endif // __URDE_CSIMPLEPOOL_HPP__ diff --git a/Runtime/CSortedLists.hpp b/Runtime/CSortedLists.hpp index 471211bad..4a145d289 100644 --- a/Runtime/CSortedLists.hpp +++ b/Runtime/CSortedLists.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSORTEDLISTS_HPP__ -#define __URDE_CSORTEDLISTS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -66,4 +65,3 @@ public: } -#endif // __URDE_CSORTEDLISTS_HPP__ diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp index 7937baa9a..1a414f68e 100644 --- a/Runtime/CStateManager.hpp +++ b/Runtime/CStateManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTATEMANAGER_HPP__ -#define __URDE_CSTATEMANAGER_HPP__ +#pragma once #include #include @@ -478,4 +477,3 @@ public: }; } -#endif diff --git a/Runtime/CStaticInterference.hpp b/Runtime/CStaticInterference.hpp index a9f310c11..de38ec174 100644 --- a/Runtime/CStaticInterference.hpp +++ b/Runtime/CStaticInterference.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTATICINTERFERENCE_HPP__ -#define __URDE_CSTATICINTERFERENCE_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -28,4 +27,3 @@ public: } -#endif // __URDE_CSTATICINTERFERENCE_HPP__ diff --git a/Runtime/CStopwatch.hpp b/Runtime/CStopwatch.hpp index 82ad87897..53937ae92 100644 --- a/Runtime/CStopwatch.hpp +++ b/Runtime/CStopwatch.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTOPWATCH_HPP__ -#define __URDE_CSTOPWATCH_HPP__ +#pragma once #include @@ -25,4 +24,3 @@ public: }; } -#endif // __URDE_CSTOPWATCH_HPP__ diff --git a/Runtime/CStringExtras.hpp b/Runtime/CStringExtras.hpp index 73aa20a6f..3c50c0e8d 100644 --- a/Runtime/CStringExtras.hpp +++ b/Runtime/CStringExtras.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTRINGEXTRAS_HPP__ -#define __URDE_CSTRINGEXTRAS_HPP__ +#pragma once #include #include @@ -36,4 +35,3 @@ public: } -#endif // __URDE_CSTRINGEXTRAS_HPP__ diff --git a/Runtime/CTimeProvider.hpp b/Runtime/CTimeProvider.hpp index 1a031aa49..f33bb7b06 100644 --- a/Runtime/CTimeProvider.hpp +++ b/Runtime/CTimeProvider.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE__CTIMEPROVIDER_HPP__ -#define __URDE__CTIMEPROVIDER_HPP__ +#pragma once namespace urde { class CTimeProvider; @@ -16,4 +15,3 @@ public: }; } -#endif diff --git a/Runtime/CToken.hpp b/Runtime/CToken.hpp index 93fb76fbb..b6ddcebaa 100644 --- a/Runtime/CToken.hpp +++ b/Runtime/CToken.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTOKEN_HPP__ -#define __URDE_CTOKEN_HPP__ +#pragma once #include #include "IObj.hpp" @@ -188,4 +187,3 @@ public: } -#endif // __URDE_CTOKEN_HPP__ diff --git a/Runtime/Camera/CBallCamera.hpp b/Runtime/Camera/CBallCamera.hpp index 4d68a2576..2046f8724 100644 --- a/Runtime/Camera/CBallCamera.hpp +++ b/Runtime/Camera/CBallCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBALLCAMERA_HPP__ -#define __URDE_CBALLCAMERA_HPP__ +#pragma once #include "CGameCamera.hpp" #include "CCameraSpline.hpp" @@ -279,4 +278,3 @@ public: } -#endif // __URDE_CBALLCAMERA_HPP__ diff --git a/Runtime/Camera/CCameraFilter.hpp b/Runtime/Camera/CCameraFilter.hpp index af93ab4c2..265c921bb 100644 --- a/Runtime/Camera/CCameraFilter.hpp +++ b/Runtime/Camera/CCameraFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCAMERAFILTER_HPP__ -#define __URDE_CCAMERAFILTER_HPP__ +#pragma once #include "zeus/CColor.hpp" #include "RetroTypes.hpp" @@ -120,4 +119,3 @@ public: } -#endif // __URDE_CCAMERAFILTER_HPP__ diff --git a/Runtime/Camera/CCameraManager.hpp b/Runtime/Camera/CCameraManager.hpp index bf6bfea0d..84a54f7c7 100644 --- a/Runtime/Camera/CCameraManager.hpp +++ b/Runtime/Camera/CCameraManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCAMERAMANAGER_HPP__ -#define __URDE_CCAMERAMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -163,4 +162,3 @@ public: } -#endif // __URDE_CCAMERAMANAGER_HPP__ diff --git a/Runtime/Camera/CCameraShakeData.hpp b/Runtime/Camera/CCameraShakeData.hpp index b4aabe8c0..90e294191 100644 --- a/Runtime/Camera/CCameraShakeData.hpp +++ b/Runtime/Camera/CCameraShakeData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCAMERASHAKEDATA_HPP__ -#define __URDE_CCAMERASHAKEDATA_HPP__ +#pragma once #include "zeus/CVector3f.hpp" #include "RetroTypes.hpp" @@ -80,4 +79,3 @@ public: } -#endif // __URDE_CCAMERASHAKEDATA_HPP__ diff --git a/Runtime/Camera/CCameraSpline.hpp b/Runtime/Camera/CCameraSpline.hpp index f1ad8a22e..cdeb21073 100644 --- a/Runtime/Camera/CCameraSpline.hpp +++ b/Runtime/Camera/CCameraSpline.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCAMERASPLINE_HPP__ -#define __URDE_CCAMERASPLINE_HPP__ +#pragma once #include "World/CEntityInfo.hpp" #include "zeus/CVector3f.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CCAMERASPLINE_HPP__ diff --git a/Runtime/Camera/CCinematicCamera.hpp b/Runtime/Camera/CCinematicCamera.hpp index b5e79a358..1172306ef 100644 --- a/Runtime/Camera/CCinematicCamera.hpp +++ b/Runtime/Camera/CCinematicCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCINEMATICCAMERA_HPP__ -#define __URDE_CCINEMATICCAMERA_HPP__ +#pragma once #include "CGameCamera.hpp" @@ -54,4 +53,3 @@ public: } -#endif // __URDE_CCINEMATICCAMERA_HPP__ diff --git a/Runtime/Camera/CFirstPersonCamera.hpp b/Runtime/Camera/CFirstPersonCamera.hpp index dc9f73eb0..b10376ade 100644 --- a/Runtime/Camera/CFirstPersonCamera.hpp +++ b/Runtime/Camera/CFirstPersonCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFIRSTPERSONCAMERA_HPP__ -#define __URDE_CFIRSTPERSONCAMERA_HPP__ +#pragma once #include "CGameCamera.hpp" @@ -38,4 +37,3 @@ public: }; } -#endif // __URDE_CFIRSTPERSONCAMERA_HPP__ diff --git a/Runtime/Camera/CGameCamera.hpp b/Runtime/Camera/CGameCamera.hpp index c6fd6113d..216d274ac 100644 --- a/Runtime/Camera/CGameCamera.hpp +++ b/Runtime/Camera/CGameCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMECAMERA_HPP__ -#define __URDE_CGAMECAMERA_HPP__ +#pragma once #include "World/CActor.hpp" #include "zeus/CTransform.hpp" @@ -56,4 +55,3 @@ public: }; } -#endif // __URDE_CGAMECAMERA_HPP__ diff --git a/Runtime/Camera/CInterpolationCamera.hpp b/Runtime/Camera/CInterpolationCamera.hpp index 4a6788b7d..c47eeb2b9 100644 --- a/Runtime/Camera/CInterpolationCamera.hpp +++ b/Runtime/Camera/CInterpolationCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINTERPOLATIONCAMERA_HPP__ -#define __URDE_CINTERPOLATIONCAMERA_HPP__ +#pragma once #include "CGameCamera.hpp" @@ -40,4 +39,3 @@ public: } -#endif // __URDE_CINTERPOLATIONCAMERA_HPP__ diff --git a/Runtime/Camera/CPathCamera.hpp b/Runtime/Camera/CPathCamera.hpp index fd7bd7e04..7eb81f653 100644 --- a/Runtime/Camera/CPathCamera.hpp +++ b/Runtime/Camera/CPathCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPATHCAMERA_HPP__ -#define __URDE_CPATHCAMERA_HPP__ +#pragma once #include "CGameCamera.hpp" #include "CCameraSpline.hpp" @@ -48,4 +47,3 @@ public: } -#endif // __URDE_CPATHCAMERA_HPP__ diff --git a/Runtime/Character/CActorLights.hpp b/Runtime/Character/CActorLights.hpp index 5e81a51cd..922bc6d6d 100644 --- a/Runtime/Character/CActorLights.hpp +++ b/Runtime/Character/CActorLights.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CACTORLIGHTS_HPP__ -#define __URDE_CACTORLIGHTS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -98,4 +97,3 @@ public: } -#endif // __URDE_CACTORLIGHTS_HPP__ diff --git a/Runtime/Character/CAdditiveAnimPlayback.hpp b/Runtime/Character/CAdditiveAnimPlayback.hpp index 728af3484..df5a2de1a 100644 --- a/Runtime/Character/CAdditiveAnimPlayback.hpp +++ b/Runtime/Character/CAdditiveAnimPlayback.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CADDITIVEANIMPLAYBACK_HPP__ -#define __URDE_CADDITIVEANIMPLAYBACK_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -66,4 +65,3 @@ public: } -#endif // __URDE_CADDITIVEANIMPLAYBACK_HPP__ diff --git a/Runtime/Character/CAdditiveBodyState.hpp b/Runtime/Character/CAdditiveBodyState.hpp index e74121ae0..23b27e8aa 100644 --- a/Runtime/Character/CAdditiveBodyState.hpp +++ b/Runtime/Character/CAdditiveBodyState.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CADDITIVEBODYSTATE_HPP__ -#define __URDE_CADDITIVEBODYSTATE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CharacterCommon.hpp" @@ -73,4 +72,3 @@ public: } -#endif // __URDE_CADDITIVEBODYSTATE_HPP__ diff --git a/Runtime/Character/CAllFormatsAnimSource.hpp b/Runtime/Character/CAllFormatsAnimSource.hpp index c0d94aea0..8c627f31d 100644 --- a/Runtime/Character/CAllFormatsAnimSource.hpp +++ b/Runtime/Character/CAllFormatsAnimSource.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CALLFORMATANIMSOURCE_HPP__ -#define __URDE_CALLFORMATANIMSOURCE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -54,4 +53,3 @@ CFactoryFnReturn AnimSourceFactory(const SObjectTag& tag, CInputStream& in, cons } -#endif // __URDE_CALLFORMATANIMSOURCE_HPP__ diff --git a/Runtime/Character/CAnimCharacterSet.hpp b/Runtime/Character/CAnimCharacterSet.hpp index 246efc6c8..709382531 100644 --- a/Runtime/Character/CAnimCharacterSet.hpp +++ b/Runtime/Character/CAnimCharacterSet.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMCHARACTERSET_HPP__ -#define __URDE_CANIMCHARACTERSET_HPP__ +#pragma once #include "CFactoryMgr.hpp" #include "CCharacterSet.hpp" @@ -24,4 +23,3 @@ CFactoryFnReturn FAnimCharacterSet(const SObjectTag&, CInputStream&, const CVPar } -#endif // __URDE_CANIMCHARACTERSET_HPP__ diff --git a/Runtime/Character/CAnimData.hpp b/Runtime/Character/CAnimData.hpp index 49d656946..f553c9d0c 100644 --- a/Runtime/Character/CAnimData.hpp +++ b/Runtime/Character/CAnimData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMDATA_HPP__ -#define __URDE_CANIMDATA_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -260,4 +259,3 @@ public: } -#endif // __URDE_CANIMDATA_HPP__ diff --git a/Runtime/Character/CAnimPOIData.hpp b/Runtime/Character/CAnimPOIData.hpp index cee2e2170..2203e7d06 100644 --- a/Runtime/Character/CAnimPOIData.hpp +++ b/Runtime/Character/CAnimPOIData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMPOIDATA_HPP__ -#define __URDE_CANIMPOIDATA_HPP__ +#pragma once #include "CFactoryMgr.hpp" #include "CBoolPOINode.hpp" @@ -32,4 +31,3 @@ CFactoryFnReturn AnimPOIDataFactory(const SObjectTag& tag, CInputStream& in, } -#endif // __URDE_CANIMPOIDATA_HPP__ diff --git a/Runtime/Character/CAnimPerSegmentData.hpp b/Runtime/Character/CAnimPerSegmentData.hpp index 24fe8efa7..b1ee2beae 100644 --- a/Runtime/Character/CAnimPerSegmentData.hpp +++ b/Runtime/Character/CAnimPerSegmentData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMPERSEGMENTDATA_HPP__ -#define __URDE_CANIMPERSEGMENTDATA_HPP__ +#pragma once #include "zeus/CQuaternion.hpp" #include "zeus/CVector3f.hpp" @@ -16,4 +15,3 @@ struct CAnimPerSegmentData } -#endif // __URDE_CANIMPERSEGMENTDATA_HPP__ diff --git a/Runtime/Character/CAnimPlaybackParms.hpp b/Runtime/Character/CAnimPlaybackParms.hpp index 7b92d9a54..b5fd6815c 100644 --- a/Runtime/Character/CAnimPlaybackParms.hpp +++ b/Runtime/Character/CAnimPlaybackParms.hpp @@ -1,5 +1,4 @@ -#ifndef __CANIMPLAYBACKPARMS_HPP__ -#define __CANIMPLAYBACKPARMS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CQuaternion.hpp" @@ -41,4 +40,3 @@ public: }; } -#endif // CANIMPLAYBACKPARMS_HPP diff --git a/Runtime/Character/CAnimSource.hpp b/Runtime/Character/CAnimSource.hpp index d40062dc0..2d6099fe2 100644 --- a/Runtime/Character/CAnimSource.hpp +++ b/Runtime/Character/CAnimSource.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMSOURCE_HPP__ -#define __URDE_CANIMSOURCE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CCharAnimTime.hpp" @@ -85,4 +84,3 @@ public: } -#endif // __URDE_CANIMSOURCE_HPP__ diff --git a/Runtime/Character/CAnimSourceReader.hpp b/Runtime/Character/CAnimSourceReader.hpp index 5e25fba9e..6ffe8f229 100644 --- a/Runtime/Character/CAnimSourceReader.hpp +++ b/Runtime/Character/CAnimSourceReader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMSOURCEREADER_HPP__ -#define __URDE_CANIMSOURCEREADER_HPP__ +#pragma once #include "IAnimReader.hpp" #include "CToken.hpp" @@ -102,4 +101,3 @@ public: } -#endif // __URDE_CANIMSOURCEREADER_HPP__ diff --git a/Runtime/Character/CAnimSysContext.hpp b/Runtime/Character/CAnimSysContext.hpp index 28a0d00fb..2a8d8a623 100644 --- a/Runtime/Character/CAnimSysContext.hpp +++ b/Runtime/Character/CAnimSysContext.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMSYSCONTEXT_HPP__ -#define __URDE_CANIMSYSCONTEXT_HPP__ +#pragma once #include "CToken.hpp" #include "CRandom16.hpp" @@ -24,4 +23,3 @@ struct CAnimSysContext } -#endif // __URDE_CANIMSYSCONTEXT_HPP__ diff --git a/Runtime/Character/CAnimTreeAnimReaderContainer.hpp b/Runtime/Character/CAnimTreeAnimReaderContainer.hpp index 1fd65b215..01f08168e 100644 --- a/Runtime/Character/CAnimTreeAnimReaderContainer.hpp +++ b/Runtime/Character/CAnimTreeAnimReaderContainer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREEANIMREADERCONTAINER_HPP__ -#define __URDE_CANIMTREEANIMREADERCONTAINER_HPP__ +#pragma once #include "CAnimTreeNode.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CANIMTREEANIMREADERCONTAINER_HPP__ diff --git a/Runtime/Character/CAnimTreeBlend.hpp b/Runtime/Character/CAnimTreeBlend.hpp index 01075aae0..d036afd3c 100644 --- a/Runtime/Character/CAnimTreeBlend.hpp +++ b/Runtime/Character/CAnimTreeBlend.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREEBLEND_HPP__ -#define __URDE_CANIMTREEBLEND_HPP__ +#pragma once #include "CAnimTreeTweenBase.hpp" @@ -29,4 +28,3 @@ public: } -#endif // __URDE_CANIMTREEBLEND_HPP__ diff --git a/Runtime/Character/CAnimTreeDoubleChild.hpp b/Runtime/Character/CAnimTreeDoubleChild.hpp index 499106273..481c693f9 100644 --- a/Runtime/Character/CAnimTreeDoubleChild.hpp +++ b/Runtime/Character/CAnimTreeDoubleChild.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREEDOUBLECHILD_HPP__ -#define __URDE_CANIMTREEDOUBLECHILD_HPP__ +#pragma once #include "CAnimTreeNode.hpp" @@ -56,4 +55,3 @@ public: }; } -#endif // __URDE_CANIMTREEDOUBLECHILD_HPP__ diff --git a/Runtime/Character/CAnimTreeLoopIn.hpp b/Runtime/Character/CAnimTreeLoopIn.hpp index 4fd340c85..e604eba83 100644 --- a/Runtime/Character/CAnimTreeLoopIn.hpp +++ b/Runtime/Character/CAnimTreeLoopIn.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREELOOPIN_HPP__ -#define __URDE_CANIMTREELOOPIN_HPP__ +#pragma once #include "CAnimTreeSingleChild.hpp" #include "CAnimSysContext.hpp" @@ -47,4 +46,3 @@ public: } -#endif // __URDE_CANIMTREELOOPIN_HPP__ diff --git a/Runtime/Character/CAnimTreeNode.hpp b/Runtime/Character/CAnimTreeNode.hpp index af2988784..3b8172b28 100644 --- a/Runtime/Character/CAnimTreeNode.hpp +++ b/Runtime/Character/CAnimTreeNode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREENODE_HPP__ -#define __URDE_CANIMTREENODE_HPP__ +#pragma once #include "IAnimReader.hpp" @@ -37,4 +36,3 @@ public: } -#endif // __URDE_CANIMTREENODE_HPP__ diff --git a/Runtime/Character/CAnimTreeSequence.hpp b/Runtime/Character/CAnimTreeSequence.hpp index 68536cc96..8375571ea 100644 --- a/Runtime/Character/CAnimTreeSequence.hpp +++ b/Runtime/Character/CAnimTreeSequence.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREESEQUENCE_HPP__ -#define __URDE_CANIMTREESEQUENCE_HPP__ +#pragma once #include "CAnimTreeSingleChild.hpp" #include "CAnimSysContext.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CANIMTREESEQUENCE_HPP__ diff --git a/Runtime/Character/CAnimTreeSingleChild.hpp b/Runtime/Character/CAnimTreeSingleChild.hpp index 6fa14e530..a3647578d 100644 --- a/Runtime/Character/CAnimTreeSingleChild.hpp +++ b/Runtime/Character/CAnimTreeSingleChild.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREESINGLECHILD_HPP__ -#define __URDE_CANIMTREESINGLECHILD_HPP__ +#pragma once #include "CAnimTreeNode.hpp" @@ -37,4 +36,3 @@ public: } -#endif // __URDE_CANIMTREESINGLECHILD_HPP__ diff --git a/Runtime/Character/CAnimTreeTimeScale.hpp b/Runtime/Character/CAnimTreeTimeScale.hpp index 41a95f01a..209f638df 100644 --- a/Runtime/Character/CAnimTreeTimeScale.hpp +++ b/Runtime/Character/CAnimTreeTimeScale.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREETIMESCALE_HPP__ -#define __URDE_CANIMTREETIMESCALE_HPP__ +#pragma once #include "CAnimTreeSingleChild.hpp" #include "CTimeScaleFunctions.hpp" @@ -43,4 +42,3 @@ public: } -#endif // __URDE_CANIMTREETIMESCALE_HPP__ diff --git a/Runtime/Character/CAnimTreeTransition.hpp b/Runtime/Character/CAnimTreeTransition.hpp index 9cc51cc21..fcc527c42 100644 --- a/Runtime/Character/CAnimTreeTransition.hpp +++ b/Runtime/Character/CAnimTreeTransition.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREETRANSITION_HPP__ -#define __URDE_CANIMTREETRANSITION_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CAnimTreeTweenBase.hpp" @@ -41,4 +40,3 @@ public: }; } -#endif // __URDE_CANIMTREETRANSITION_HPP__ diff --git a/Runtime/Character/CAnimTreeTweenBase.hpp b/Runtime/Character/CAnimTreeTweenBase.hpp index 8c521790f..0ddddd260 100644 --- a/Runtime/Character/CAnimTreeTweenBase.hpp +++ b/Runtime/Character/CAnimTreeTweenBase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMTREETWEENBASE_HPP__ -#define __URDE_CANIMTREETWEENBASE_HPP__ +#pragma once #include "CAnimTreeDoubleChild.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CANIMTREETWEENBASE_HPP__ diff --git a/Runtime/Character/CAnimation.hpp b/Runtime/Character/CAnimation.hpp index 455300961..5492e59c5 100644 --- a/Runtime/Character/CAnimation.hpp +++ b/Runtime/Character/CAnimation.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMATION_HPP__ -#define __URDE_CANIMATION_HPP__ +#pragma once #include "IOStreams.hpp" #include "CMetaAnimFactory.hpp" @@ -20,4 +19,3 @@ public: } -#endif // __URDE_CANIMATION_HPP__ diff --git a/Runtime/Character/CAnimationDatabase.hpp b/Runtime/Character/CAnimationDatabase.hpp index ed342c691..436a3a72c 100644 --- a/Runtime/Character/CAnimationDatabase.hpp +++ b/Runtime/Character/CAnimationDatabase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMATIONDATABASE_HPP__ -#define __URDE_CANIMATIONDATABASE_HPP__ +#pragma once #include "../RetroTypes.hpp" #include @@ -23,4 +22,3 @@ public: } -#endif // __URDE_CANIMATIONDATABASE_HPP__ diff --git a/Runtime/Character/CAnimationDatabaseGame.hpp b/Runtime/Character/CAnimationDatabaseGame.hpp index 65d12749d..4a59f53a7 100644 --- a/Runtime/Character/CAnimationDatabaseGame.hpp +++ b/Runtime/Character/CAnimationDatabaseGame.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMATIONDATABASEGAME_HPP__ -#define __URDE_CANIMATIONDATABASEGAME_HPP__ +#pragma once #include "CAnimationDatabase.hpp" @@ -21,4 +20,3 @@ public: } -#endif // __URDE_CANIMATIONDATABASEGAME_HPP__ diff --git a/Runtime/Character/CAnimationManager.hpp b/Runtime/Character/CAnimationManager.hpp index fe8dcf89b..c9aef6f06 100644 --- a/Runtime/Character/CAnimationManager.hpp +++ b/Runtime/Character/CAnimationManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMATIONMANAGER_HPP__ -#define __URDE_CANIMATIONMANAGER_HPP__ +#pragma once #include "CToken.hpp" #include "CAnimSysContext.hpp" @@ -29,4 +28,3 @@ public: } -#endif // __URDE_CANIMATIONMANAGER_HPP__ diff --git a/Runtime/Character/CAnimationSet.hpp b/Runtime/Character/CAnimationSet.hpp index b262bf0d8..29d306008 100644 --- a/Runtime/Character/CAnimationSet.hpp +++ b/Runtime/Character/CAnimationSet.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMATIONSET_HPP__ -#define __URDE_CANIMATIONSET_HPP__ +#pragma once #include "IOStreams.hpp" #include "CAnimation.hpp" @@ -34,4 +33,3 @@ public: }; } -#endif // __URDE_CANIMATIONSET_HPP__ diff --git a/Runtime/Character/CAssetFactory.hpp b/Runtime/Character/CAssetFactory.hpp index 7ae62a6b9..73972c1a9 100644 --- a/Runtime/Character/CAssetFactory.hpp +++ b/Runtime/Character/CAssetFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CASSETFACTORY_HPP__ -#define __URDE_CASSETFACTORY_HPP__ +#pragma once #include "IFactory.hpp" #include "IObj.hpp" @@ -45,4 +44,3 @@ public: } -#endif // __URDE_CASSETFACTORY_HPP__ diff --git a/Runtime/Character/CBodyController.hpp b/Runtime/Character/CBodyController.hpp index 2b5612c5c..0cb3eca69 100644 --- a/Runtime/Character/CBodyController.hpp +++ b/Runtime/Character/CBodyController.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBODYCONTROLLER_HPP__ -#define __URDE_CBODYCONTROLLER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CQuaternion.hpp" @@ -111,4 +110,3 @@ public: }; } -#endif // __URDE_CBODYCONTROLLER_HPP__ diff --git a/Runtime/Character/CBodyState.hpp b/Runtime/Character/CBodyState.hpp index 7b9bee575..75508287a 100644 --- a/Runtime/Character/CBodyState.hpp +++ b/Runtime/Character/CBodyState.hpp @@ -1,5 +1,4 @@ -#ifndef CBODYSTATE_HPP -#define CBODYSTATE_HPP +#pragma once #include "RetroTypes.hpp" #include "CharacterCommon.hpp" @@ -429,4 +428,3 @@ public: float ApplyLocomotionPhysics(float dt, CBodyController& bc); }; } -#endif // CBODYSTATE_HPP diff --git a/Runtime/Character/CBodyStateCmdMgr.hpp b/Runtime/Character/CBodyStateCmdMgr.hpp index addba6e08..58aa3b048 100644 --- a/Runtime/Character/CBodyStateCmdMgr.hpp +++ b/Runtime/Character/CBodyStateCmdMgr.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBODYSTATECMDMGR_HPP__ -#define __URDE_CBODYSTATECMDMGR_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CharacterCommon.hpp" @@ -468,4 +467,3 @@ public: }; } -#endif // __URDE_CBODYSTATECMDMGR_HPP__ diff --git a/Runtime/Character/CBodyStateInfo.hpp b/Runtime/Character/CBodyStateInfo.hpp index 4cf84e0aa..6598d029d 100644 --- a/Runtime/Character/CBodyStateInfo.hpp +++ b/Runtime/Character/CBodyStateInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBODYSTATEINFO_HPP__ -#define __URDE_CBODYSTATEINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CharacterCommon.hpp" @@ -46,4 +45,3 @@ public: } -#endif // __URDE_CBODYSTATEINFO_HPP__ diff --git a/Runtime/Character/CBoolPOINode.hpp b/Runtime/Character/CBoolPOINode.hpp index 19c68f5c6..d86f74a71 100644 --- a/Runtime/Character/CBoolPOINode.hpp +++ b/Runtime/Character/CBoolPOINode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBOOLPOINODE_HPP__ -#define __URDE_CBOOLPOINODE_HPP__ +#pragma once #include "CPOINode.hpp" @@ -20,4 +19,3 @@ public: } -#endif // __URDE_CBOOLPOINODE_HPP__ diff --git a/Runtime/Character/CCharAnimTime.hpp b/Runtime/Character/CCharAnimTime.hpp index 7e70b0a87..344d2c227 100644 --- a/Runtime/Character/CCharAnimTime.hpp +++ b/Runtime/Character/CCharAnimTime.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCHARANIMTIME_HPP__ -#define __URDE_CCHARANIMTIME_HPP__ +#pragma once #include "IOStreams.hpp" @@ -62,4 +61,3 @@ public: }; } -#endif // __URDE_CCHARANIMTIME_HPP__ diff --git a/Runtime/Character/CCharLayoutInfo.hpp b/Runtime/Character/CCharLayoutInfo.hpp index 4a5b019a0..3b0d4b195 100644 --- a/Runtime/Character/CCharLayoutInfo.hpp +++ b/Runtime/Character/CCharLayoutInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCHARLAYOUTINFO_HPP__ -#define __URDE_CCHARLAYOUTINFO_HPP__ +#pragma once #include "CFactoryMgr.hpp" #include "IOStreams.hpp" @@ -46,4 +45,3 @@ CFactoryFnReturn FCharLayoutInfo(const SObjectTag&, CInputStream&, const CVParam } -#endif // __URDE_CCHARLAYOUTINFO_HPP__ diff --git a/Runtime/Character/CCharacterFactory.hpp b/Runtime/Character/CCharacterFactory.hpp index 5e0b9a0e4..0d106f9b1 100644 --- a/Runtime/Character/CCharacterFactory.hpp +++ b/Runtime/Character/CCharacterFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCHARACTERFACTORY_HPP__ -#define __URDE_CCHARACTERFACTORY_HPP__ +#pragma once #include "IFactory.hpp" #include "IObjFactory.hpp" @@ -77,4 +76,3 @@ public: } -#endif // __URDE_CCHARACTERFACTORY_HPP__ diff --git a/Runtime/Character/CCharacterInfo.hpp b/Runtime/Character/CCharacterInfo.hpp index 224be83fb..4f06738e8 100644 --- a/Runtime/Character/CCharacterInfo.hpp +++ b/Runtime/Character/CCharacterInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCHARACTERINFO_HPP__ -#define __URDE_CCHARACTERINFO_HPP__ +#pragma once #include "IOStreams.hpp" #include "CPASDatabase.hpp" @@ -66,4 +65,3 @@ public: }; } -#endif // __URDE_CCHARACTERINFO_HPP__ diff --git a/Runtime/Character/CCharacterSet.hpp b/Runtime/Character/CCharacterSet.hpp index 224b971ee..578edb627 100644 --- a/Runtime/Character/CCharacterSet.hpp +++ b/Runtime/Character/CCharacterSet.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCHARACTERSET_HPP__ -#define __URDE_CCHARACTERSET_HPP__ +#pragma once #include "IOStreams.hpp" #include "CCharacterInfo.hpp" @@ -18,4 +17,3 @@ public: } -#endif // __URDE_CCHARACTERSET_HPP__ diff --git a/Runtime/Character/CEffectComponent.hpp b/Runtime/Character/CEffectComponent.hpp index 33590e435..f2e4e4acf 100644 --- a/Runtime/Character/CEffectComponent.hpp +++ b/Runtime/Character/CEffectComponent.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CEFFECTCOMPONENT_HPP__ -#define __URDE_CEFFECTCOMPONENT_HPP__ +#pragma once #include "IOStreams.hpp" #include "RetroTypes.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CEFFECTCOMPONENT_HPP__ diff --git a/Runtime/Character/CFBStreamedAnimReader.hpp b/Runtime/Character/CFBStreamedAnimReader.hpp index 81c9771cf..9a6544a65 100644 --- a/Runtime/Character/CFBStreamedAnimReader.hpp +++ b/Runtime/Character/CFBStreamedAnimReader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFSTREAMEDANIMREADER_HPP__ -#define __URDE_CFSTREAMEDANIMREADER_HPP__ +#pragma once #include "CAnimSourceReader.hpp" #include "CFBStreamedCompression.hpp" @@ -123,4 +122,3 @@ public: } -#endif // __URDE_CFSTREAMEDANIMREADER_HPP__ diff --git a/Runtime/Character/CFBStreamedCompression.hpp b/Runtime/Character/CFBStreamedCompression.hpp index 94db9474a..2a66744ea 100644 --- a/Runtime/Character/CFBStreamedCompression.hpp +++ b/Runtime/Character/CFBStreamedCompression.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFSTREAMEDCOMPRESSION_HPP__ -#define __URDE_CFSTREAMEDCOMPRESSION_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -85,4 +84,3 @@ public: } -#endif // __URDE_CFSTREAMEDCOMPRESSION_HPP__ diff --git a/Runtime/Character/CGroundMovement.hpp b/Runtime/Character/CGroundMovement.hpp index 29c34aa08..29745a544 100644 --- a/Runtime/Character/CGroundMovement.hpp +++ b/Runtime/Character/CGroundMovement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGROUNDMOVEMENT_HPP__ -#define __URDE_CGROUNDMOVEMENT_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Collision/CCollisionInfo.hpp" @@ -71,4 +70,3 @@ public: } -#endif // __URDE_CGROUNDMOVEMENT_HPP__ diff --git a/Runtime/Character/CHalfTransition.hpp b/Runtime/Character/CHalfTransition.hpp index e2216ab43..335a08618 100644 --- a/Runtime/Character/CHalfTransition.hpp +++ b/Runtime/Character/CHalfTransition.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHALFTRANSITION_HPP__ -#define __URDE_CHALFTRANSITION_HPP__ +#pragma once #include "IOStreams.hpp" #include "IMetaTrans.hpp" @@ -19,4 +18,3 @@ public: } -#endif // __URDE_CHALFTRANSITION_HPP__ diff --git a/Runtime/Character/CHierarchyPoseBuilder.hpp b/Runtime/Character/CHierarchyPoseBuilder.hpp index 1bcd4b9c2..29aa99ac1 100644 --- a/Runtime/Character/CHierarchyPoseBuilder.hpp +++ b/Runtime/Character/CHierarchyPoseBuilder.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHIERARCHYPOSEBUILDER_HPP__ -#define __URDE_CHIERARCHYPOSEBUILDER_HPP__ +#pragma once #include "CSegId.hpp" #include "TSegIdMap.hpp" @@ -56,4 +55,3 @@ public: } -#endif // __URDE_CHIERARCHYPOSEBUILDER_HPP__ diff --git a/Runtime/Character/CIkChain.hpp b/Runtime/Character/CIkChain.hpp index 8d1e2d0b1..bce60d11b 100644 --- a/Runtime/Character/CIkChain.hpp +++ b/Runtime/Character/CIkChain.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CIKCHAIN_HPP__ -#define __URDE_CIKCHAIN_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CTransform.hpp" @@ -44,4 +43,3 @@ public: }; } -#endif // __URDE_CIKCHAIN_HPP__ diff --git a/Runtime/Character/CInt32POINode.hpp b/Runtime/Character/CInt32POINode.hpp index c1cc55c52..a421dc9b4 100644 --- a/Runtime/Character/CInt32POINode.hpp +++ b/Runtime/Character/CInt32POINode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINT32POINODE_HPP__ -#define __URDE_CINT32POINODE_HPP__ +#pragma once #include "CPOINode.hpp" @@ -23,4 +22,3 @@ public: } -#endif // __URDE_CINT32POINODE_HPP__ diff --git a/Runtime/Character/CLayoutDescription.hpp b/Runtime/Character/CLayoutDescription.hpp index b546d9ca1..3b668513b 100644 --- a/Runtime/Character/CLayoutDescription.hpp +++ b/Runtime/Character/CLayoutDescription.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CLAYOUTDESCRIPTION_HPP__ -#define __URDE_CLAYOUTDESCRIPTION_HPP__ +#pragma once #include "optional.hpp" #include "CToken.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CLAYOUTDESCRIPTION_HPP__ diff --git a/Runtime/Character/CMetaAnimBlend.hpp b/Runtime/Character/CMetaAnimBlend.hpp index 432112401..83bdba90e 100644 --- a/Runtime/Character/CMetaAnimBlend.hpp +++ b/Runtime/Character/CMetaAnimBlend.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETAANIMBLEND_HPP__ -#define __URDE_CMETAANIMBLEND_HPP__ +#pragma once #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -24,4 +23,3 @@ public: } -#endif // __URDE_CMETAANIMBLEND_HPP__ diff --git a/Runtime/Character/CMetaAnimFactory.hpp b/Runtime/Character/CMetaAnimFactory.hpp index 42431e956..4307d7a77 100644 --- a/Runtime/Character/CMetaAnimFactory.hpp +++ b/Runtime/Character/CMetaAnimFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETAANIMFACTORY_HPP__ -#define __URDE_CMETAANIMFACTORY_HPP__ +#pragma once #include "IOStreams.hpp" #include "IMetaAnim.hpp" @@ -15,4 +14,3 @@ public: } -#endif // __URDE_CMETAANIMFACTORY_HPP__ diff --git a/Runtime/Character/CMetaAnimPhaseBlend.hpp b/Runtime/Character/CMetaAnimPhaseBlend.hpp index 60958739c..9ad7a899b 100644 --- a/Runtime/Character/CMetaAnimPhaseBlend.hpp +++ b/Runtime/Character/CMetaAnimPhaseBlend.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETAANIMPHASEBLEND_HPP__ -#define __URDE_CMETAANIMPHASEBLEND_HPP__ +#pragma once #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -24,4 +23,3 @@ public: } -#endif // __URDE_CMETAANIMPHASEBLEND_HPP__ diff --git a/Runtime/Character/CMetaAnimPlay.hpp b/Runtime/Character/CMetaAnimPlay.hpp index 3e0c5de76..61bc1c262 100644 --- a/Runtime/Character/CMetaAnimPlay.hpp +++ b/Runtime/Character/CMetaAnimPlay.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETAANIMPLAY_HPP__ -#define __URDE_CMETAANIMPLAY_HPP__ +#pragma once #include "IMetaAnim.hpp" #include "CPrimitive.hpp" @@ -23,4 +22,3 @@ public: } -#endif // __URDE_CMETAANIMPLAY_HPP__ diff --git a/Runtime/Character/CMetaAnimRandom.hpp b/Runtime/Character/CMetaAnimRandom.hpp index 4f9a1e80b..d0475ee54 100644 --- a/Runtime/Character/CMetaAnimRandom.hpp +++ b/Runtime/Character/CMetaAnimRandom.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETAANIMRANDOM_HPP__ -#define __URDE_CMETAANIMRANDOM_HPP__ +#pragma once #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -23,4 +22,3 @@ public: } -#endif // __URDE_CMETAANIMRANDOM_HPP__ diff --git a/Runtime/Character/CMetaAnimSequence.hpp b/Runtime/Character/CMetaAnimSequence.hpp index 1377a48db..b185506bf 100644 --- a/Runtime/Character/CMetaAnimSequence.hpp +++ b/Runtime/Character/CMetaAnimSequence.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETAANIMSEQUENCE_HPP__ -#define __URDE_CMETAANIMSEQUENCE_HPP__ +#pragma once #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CMETAANIMSEQUENCE_HPP__ diff --git a/Runtime/Character/CMetaTransFactory.hpp b/Runtime/Character/CMetaTransFactory.hpp index bf42d6e75..c0af3a8ba 100644 --- a/Runtime/Character/CMetaTransFactory.hpp +++ b/Runtime/Character/CMetaTransFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETATRANSFACTORY_HPP__ -#define __URDE_CMETATRANSFACTORY_HPP__ +#pragma once #include "IOStreams.hpp" #include "IMetaTrans.hpp" @@ -15,4 +14,3 @@ public: } -#endif // __URDE_CMETATRANSFACTORY_HPP__ diff --git a/Runtime/Character/CMetaTransMetaAnim.hpp b/Runtime/Character/CMetaTransMetaAnim.hpp index 2d90a23cd..9ddf4124a 100644 --- a/Runtime/Character/CMetaTransMetaAnim.hpp +++ b/Runtime/Character/CMetaTransMetaAnim.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETATRANSMETAANIM_HPP__ -#define __URDE_CMETATRANSMETAANIM_HPP__ +#pragma once #include "IMetaTrans.hpp" #include "IMetaAnim.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CMETATRANSMETAANIM_HPP__ diff --git a/Runtime/Character/CMetaTransPhaseTrans.hpp b/Runtime/Character/CMetaTransPhaseTrans.hpp index 9fd079d0c..dca5b5132 100644 --- a/Runtime/Character/CMetaTransPhaseTrans.hpp +++ b/Runtime/Character/CMetaTransPhaseTrans.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETATRANSPHASETRANS_HPP__ -#define __URDE_CMETATRANSPHASETRANS_HPP__ +#pragma once #include "IMetaTrans.hpp" #include "IOStreams.hpp" @@ -25,4 +24,3 @@ public: } -#endif // __URDE_CMETATRANSPHASETRANS_HPP__ diff --git a/Runtime/Character/CMetaTransSnap.hpp b/Runtime/Character/CMetaTransSnap.hpp index e84855484..80fdc54bb 100644 --- a/Runtime/Character/CMetaTransSnap.hpp +++ b/Runtime/Character/CMetaTransSnap.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETATRANSSNAP_HPP__ -#define __URDE_CMETATRANSSNAP_HPP__ +#pragma once #include "IMetaTrans.hpp" #include "IOStreams.hpp" @@ -19,4 +18,3 @@ public: } -#endif // __URDE_CMETATRANSSNAP_HPP__ diff --git a/Runtime/Character/CMetaTransTrans.hpp b/Runtime/Character/CMetaTransTrans.hpp index da6c3ff14..412a4d2c1 100644 --- a/Runtime/Character/CMetaTransTrans.hpp +++ b/Runtime/Character/CMetaTransTrans.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETATRANSTRANS_HPP__ -#define __URDE_CMETATRANSTRANS_HPP__ +#pragma once #include "IMetaTrans.hpp" #include "IOStreams.hpp" @@ -25,4 +24,3 @@ public: } -#endif // __URDE_CMETATRANSTRANS_HPP__ diff --git a/Runtime/Character/CModelData.hpp b/Runtime/Character/CModelData.hpp index c14fb10c3..817aaeb61 100644 --- a/Runtime/Character/CModelData.hpp +++ b/Runtime/Character/CModelData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMODELDATA_HPP__ -#define __URDE_CMODELDATA_HPP__ +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/CAABox.hpp" @@ -187,4 +186,3 @@ public: } -#endif // __URDE_CMODELDATA_HPP__ diff --git a/Runtime/Character/CPASAnimInfo.hpp b/Runtime/Character/CPASAnimInfo.hpp index 0ebdc4d21..f00892150 100644 --- a/Runtime/Character/CPASAnimInfo.hpp +++ b/Runtime/Character/CPASAnimInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPASANIMINFO_HPP__ -#define __URDE_CPASANIMINFO_HPP__ +#pragma once #include "IOStreams.hpp" #include "rstl.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CPASANIMINFO_HPP__ diff --git a/Runtime/Character/CPASAnimParm.hpp b/Runtime/Character/CPASAnimParm.hpp index 31e8ac022..a26f1221c 100644 --- a/Runtime/Character/CPASAnimParm.hpp +++ b/Runtime/Character/CPASAnimParm.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPASANIMPARM_HPP__ -#define __URDE_CPASANIMPARM_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -84,4 +83,3 @@ public: } -#endif // __URDE_CPASANIMPARM_HPP__ diff --git a/Runtime/Character/CPASAnimParmData.hpp b/Runtime/Character/CPASAnimParmData.hpp index 32ef1fa61..8d830cac7 100644 --- a/Runtime/Character/CPASAnimParmData.hpp +++ b/Runtime/Character/CPASAnimParmData.hpp @@ -1,5 +1,4 @@ -#ifndef CPASANIMPARMDATA_HPP -#define CPASANIMPARMDATA_HPP +#pragma once #include "RetroTypes.hpp" #include "CPASAnimParm.hpp" @@ -35,4 +34,3 @@ public: }; } -#endif // CPASANIMPARMDATA_HPP diff --git a/Runtime/Character/CPASAnimState.hpp b/Runtime/Character/CPASAnimState.hpp index 787325fc1..e30464335 100644 --- a/Runtime/Character/CPASAnimState.hpp +++ b/Runtime/Character/CPASAnimState.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPASANIMSTATE_HPP__ -#define __URDE_CPASANIMSTATE_HPP__ +#pragma once #include "IOStreams.hpp" #include "CPASParmInfo.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CPASANIMSTATE_HPP__ diff --git a/Runtime/Character/CPASDatabase.hpp b/Runtime/Character/CPASDatabase.hpp index 1f8d1241b..fe1248fb4 100644 --- a/Runtime/Character/CPASDatabase.hpp +++ b/Runtime/Character/CPASDatabase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPASDATABASE_HPP__ -#define __URDE_CPASDATABASE_HPP__ +#pragma once #include "IOStreams.hpp" #include "CPASAnimState.hpp" @@ -49,4 +48,3 @@ public: } -#endif // __URDE_CPASDATABASE_HPP__ diff --git a/Runtime/Character/CPASParmInfo.hpp b/Runtime/Character/CPASParmInfo.hpp index 6856f507c..8aaaacb7b 100644 --- a/Runtime/Character/CPASParmInfo.hpp +++ b/Runtime/Character/CPASParmInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPASPARMINFO_HPP__ -#define __URDE_CPASPARMINFO_HPP__ +#pragma once #include "IOStreams.hpp" #include "CPASAnimParm.hpp" @@ -34,4 +33,3 @@ public: } -#endif // __URDE_CPASPARMINFO_HPP__ diff --git a/Runtime/Character/CPOINode.hpp b/Runtime/Character/CPOINode.hpp index 205679c36..86a9b964d 100644 --- a/Runtime/Character/CPOINode.hpp +++ b/Runtime/Character/CPOINode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPOINODE_HPP__ -#define __URDE_CPOINODE_HPP__ +#pragma once #include "IOStreams.hpp" #include "CCharAnimTime.hpp" @@ -69,4 +68,3 @@ u32 _getPOIList(const CCharAnimTime& time, } -#endif // __URDE_CPOINODE_HPP__ diff --git a/Runtime/Character/CParticleData.hpp b/Runtime/Character/CParticleData.hpp index cbb396c94..0b8129944 100644 --- a/Runtime/Character/CParticleData.hpp +++ b/Runtime/Character/CParticleData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEDATA_HPP__ -#define __URDE_CPARTICLEDATA_HPP__ +#pragma once #include "IOStreams.hpp" #include "RetroTypes.hpp" @@ -48,4 +47,3 @@ public: } -#endif // __URDE_CPARTICLEDATA_HPP__ diff --git a/Runtime/Character/CParticleDatabase.hpp b/Runtime/Character/CParticleDatabase.hpp index e4f95b516..d2ebf8e02 100644 --- a/Runtime/Character/CParticleDatabase.hpp +++ b/Runtime/Character/CParticleDatabase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEDATABASE_HPP__ -#define __URDE_CPARTICLEDATABASE_HPP__ +#pragma once #include "CCharacterInfo.hpp" #include "CParticleGenInfo.hpp" @@ -73,4 +72,3 @@ public: }; } -#endif // __URDE_CPARTICLEDATABASE_HPP__ diff --git a/Runtime/Character/CParticleGenInfo.hpp b/Runtime/Character/CParticleGenInfo.hpp index a7c9d0ca2..665877b1b 100644 --- a/Runtime/Character/CParticleGenInfo.hpp +++ b/Runtime/Character/CParticleGenInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEGENINFO_HPP__ -#define __URDE_CPARTICLEGENINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CParticleData.hpp" @@ -115,4 +114,3 @@ public: }; } -#endif // __URDE_CPARTICLEGENINFO_HPP__ diff --git a/Runtime/Character/CParticlePOINode.hpp b/Runtime/Character/CParticlePOINode.hpp index ceda64b9d..83183f2a7 100644 --- a/Runtime/Character/CParticlePOINode.hpp +++ b/Runtime/Character/CParticlePOINode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEPOINODE_HPP__ -#define __URDE_CPARTICLEPOINODE_HPP__ +#pragma once #include "CPOINode.hpp" #include "CParticleData.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CPARTICLEPOINODE_HPP__ diff --git a/Runtime/Character/CPoseAsTransforms.hpp b/Runtime/Character/CPoseAsTransforms.hpp index ce725271c..cac5eb491 100644 --- a/Runtime/Character/CPoseAsTransforms.hpp +++ b/Runtime/Character/CPoseAsTransforms.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPOSEASTRANSFORMS_HPP__ -#define __URDE_CPOSEASTRANSFORMS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CSegId.hpp" @@ -41,4 +40,3 @@ public: } -#endif // __URDE_CPOSEASTRANSFORMS_HPP__ diff --git a/Runtime/Character/CPrimitive.hpp b/Runtime/Character/CPrimitive.hpp index d93f9c0e3..c22ea62e8 100644 --- a/Runtime/Character/CPrimitive.hpp +++ b/Runtime/Character/CPrimitive.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPRIMITIVE_HPP__ -#define __URDE_CPRIMITIVE_HPP__ +#pragma once #include "IOStreams.hpp" #include "RetroTypes.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CPRIMITIVE_HPP__ diff --git a/Runtime/Character/CSegId.hpp b/Runtime/Character/CSegId.hpp index e294470f2..a13bd3046 100644 --- a/Runtime/Character/CSegId.hpp +++ b/Runtime/Character/CSegId.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSEGID_HPP__ -#define __URDE_CSEGID_HPP__ +#pragma once #include "RetroTypes.hpp" #include "IOStreams.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CSEGID_HPP__ diff --git a/Runtime/Character/CSegIdList.hpp b/Runtime/Character/CSegIdList.hpp index 05f080ae4..bbdc5f689 100644 --- a/Runtime/Character/CSegIdList.hpp +++ b/Runtime/Character/CSegIdList.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSEGIDLIST_HPP__ -#define __URDE_CSEGIDLIST_HPP__ +#pragma once #include "IOStreams.hpp" #include "CSegId.hpp" @@ -17,4 +16,3 @@ public: } -#endif // __URDE_CSEGIDLIST_HPP__ diff --git a/Runtime/Character/CSegStatementSet.hpp b/Runtime/Character/CSegStatementSet.hpp index 0288abf03..59bddc1ec 100644 --- a/Runtime/Character/CSegStatementSet.hpp +++ b/Runtime/Character/CSegStatementSet.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSEGSTATEMENTSET_HPP__ -#define __URDE_CSEGSTATEMENTSET_HPP__ +#pragma once #include "CAnimPerSegmentData.hpp" #include "CSegId.hpp" @@ -23,4 +22,3 @@ public: } -#endif // __URDE_CSEGSTATEMENTSET_HPP__ diff --git a/Runtime/Character/CSequenceHelper.hpp b/Runtime/Character/CSequenceHelper.hpp index e5ab86f18..23487a667 100644 --- a/Runtime/Character/CSequenceHelper.hpp +++ b/Runtime/Character/CSequenceHelper.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSEQUENCEHELPER_HPP__ -#define __URDE_CSEQUENCEHELPER_HPP__ +#pragma once #include "CAnimTreeNode.hpp" #include "CBoolPOINode.hpp" @@ -50,4 +49,3 @@ public: } -#endif // __URDE_CSEQUENCEHELPER_HPP__ diff --git a/Runtime/Character/CSkinBank.hpp b/Runtime/Character/CSkinBank.hpp index 0e8b65d29..5f5a1b1f9 100644 --- a/Runtime/Character/CSkinBank.hpp +++ b/Runtime/Character/CSkinBank.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSKINBANK_HPP__ -#define __URDE_CSKINBANK_HPP__ +#pragma once #include "IOStreams.hpp" #include "CSegId.hpp" @@ -19,4 +18,3 @@ public: } -#endif // __URDE_CSKINBANK_HPP__ diff --git a/Runtime/Character/CSkinRules.hpp b/Runtime/Character/CSkinRules.hpp index ca4903e45..147448fd0 100644 --- a/Runtime/Character/CSkinRules.hpp +++ b/Runtime/Character/CSkinRules.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSKINRULES_HPP__ -#define __URDE_CSKINRULES_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "RetroTypes.hpp" @@ -58,4 +57,3 @@ CFactoryFnReturn FSkinRulesFactory(const SObjectTag& tag, CInputStream& in, cons } -#endif // __URDE_CSKINRULES_HPP__ diff --git a/Runtime/Character/CSoundPOINode.hpp b/Runtime/Character/CSoundPOINode.hpp index 613ab63f2..aa4a6805c 100644 --- a/Runtime/Character/CSoundPOINode.hpp +++ b/Runtime/Character/CSoundPOINode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSOUNDPOINODE_HPP__ -#define __URDE_CSOUNDPOINODE_HPP__ +#pragma once #include "CPOINode.hpp" #include "CCharAnimTime.hpp" @@ -29,4 +28,3 @@ public: } -#endif // __URDE_CSOUNDPOINODE_HPP__ diff --git a/Runtime/Character/CSteeringBehaviors.hpp b/Runtime/Character/CSteeringBehaviors.hpp index 86a33bc86..354024c58 100644 --- a/Runtime/Character/CSteeringBehaviors.hpp +++ b/Runtime/Character/CSteeringBehaviors.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTEERINGBEHAVIORS_HPP__ -#define __URDE_CSTEERINGBEHAVIORS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -18,4 +17,3 @@ public: } -#endif // __URDE_CSTEERINGBEHAVIORS_HPP__ diff --git a/Runtime/Character/CTimeScaleFunctions.hpp b/Runtime/Character/CTimeScaleFunctions.hpp index f6865f2bf..02dd8c4b1 100644 --- a/Runtime/Character/CTimeScaleFunctions.hpp +++ b/Runtime/Character/CTimeScaleFunctions.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTIMESCALEFUNCTIONS_HPP__ -#define __URDE_CTIMESCALEFUNCTIONS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CCharAnimTime.hpp" @@ -66,4 +65,3 @@ public: } -#endif // __URDE_CTIMESCALEFUNCTIONS_HPP__ diff --git a/Runtime/Character/CTransition.hpp b/Runtime/Character/CTransition.hpp index 8ab47b385..a245d9ff3 100644 --- a/Runtime/Character/CTransition.hpp +++ b/Runtime/Character/CTransition.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTRANSITION_HPP__ -#define __URDE_CTRANSITION_HPP__ +#pragma once #include "IOStreams.hpp" #include "CMetaTransFactory.hpp" @@ -23,4 +22,3 @@ public: } -#endif // __URDE_CTRANSITION_HPP__ diff --git a/Runtime/Character/CTransitionDatabase.hpp b/Runtime/Character/CTransitionDatabase.hpp index 5b927009f..16aec9974 100644 --- a/Runtime/Character/CTransitionDatabase.hpp +++ b/Runtime/Character/CTransitionDatabase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTRANSITIONDATABASE_HPP__ -#define __URDE_CTRANSITIONDATABASE_HPP__ +#pragma once #include "../RetroTypes.hpp" @@ -15,4 +14,3 @@ public: } -#endif // __URDE_CTRANSITIONDATABASE_HPP__ diff --git a/Runtime/Character/CTransitionDatabaseGame.hpp b/Runtime/Character/CTransitionDatabaseGame.hpp index 0ef856807..a171366ae 100644 --- a/Runtime/Character/CTransitionDatabaseGame.hpp +++ b/Runtime/Character/CTransitionDatabaseGame.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTRANSITIONDATABASEGAME_HPP__ -#define __URDE_CTRANSITIONDATABASEGAME_HPP__ +#pragma once #include "CTransitionDatabase.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CTRANSITIONDATABASEGAME_HPP__ diff --git a/Runtime/Character/CTransitionManager.hpp b/Runtime/Character/CTransitionManager.hpp index 548d9c547..8c53a992d 100644 --- a/Runtime/Character/CTransitionManager.hpp +++ b/Runtime/Character/CTransitionManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTRANSITIONMANAGER_HPP__ -#define __URDE_CTRANSITIONMANAGER_HPP__ +#pragma once #include "CToken.hpp" #include "CAnimSysContext.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CTRANSITIONMANAGER_HPP__ diff --git a/Runtime/Character/CTreeUtils.hpp b/Runtime/Character/CTreeUtils.hpp index d4d35222e..b085672c5 100644 --- a/Runtime/Character/CTreeUtils.hpp +++ b/Runtime/Character/CTreeUtils.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTREEUTILS_HPP__ -#define __URDE_CTREEUTILS_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -18,4 +17,3 @@ public: } -#endif // __URDE_CTREEUTILS_HPP__ diff --git a/Runtime/Character/CharacterCommon.hpp b/Runtime/Character/CharacterCommon.hpp index f4b70999b..350513a30 100644 --- a/Runtime/Character/CharacterCommon.hpp +++ b/Runtime/Character/CharacterCommon.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_PASTYPES_HPP__ -#define __URDE_PASTYPES_HPP__ +#pragma once namespace urde { @@ -263,4 +262,3 @@ enum class EBodyStateCmd } -#endif // __URDE_PASTYPES_HPP__ diff --git a/Runtime/Character/IAnimReader.hpp b/Runtime/Character/IAnimReader.hpp index 19059af37..148bc240f 100644 --- a/Runtime/Character/IAnimReader.hpp +++ b/Runtime/Character/IAnimReader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IANIMREADER_HPP__ -#define __URDE_IANIMREADER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CCharAnimTime.hpp" @@ -142,4 +141,3 @@ public: } -#endif // __URDE_IANIMREADER_HPP__ diff --git a/Runtime/Character/IMetaAnim.hpp b/Runtime/Character/IMetaAnim.hpp index 515b31201..802f71e83 100644 --- a/Runtime/Character/IMetaAnim.hpp +++ b/Runtime/Character/IMetaAnim.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IMETAANIM_HPP__ -#define __URDE_IMETAANIM_HPP__ +#pragma once #include "../RetroTypes.hpp" #include "CCharAnimTime.hpp" @@ -83,4 +82,3 @@ public: } -#endif // __URDE_IMETAANIM_HPP__ diff --git a/Runtime/Character/IMetaTrans.hpp b/Runtime/Character/IMetaTrans.hpp index df0c76115..1b36555df 100644 --- a/Runtime/Character/IMetaTrans.hpp +++ b/Runtime/Character/IMetaTrans.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IMETATRANS_HPP__ -#define __URDE_IMETATRANS_HPP__ +#pragma once #include "../RetroTypes.hpp" @@ -35,4 +34,3 @@ public: } -#endif // __URDE_IMETATRANS_HPP__ diff --git a/Runtime/Character/IVaryingAnimationTimeScale.hpp b/Runtime/Character/IVaryingAnimationTimeScale.hpp index 4c603f808..e304f1d2f 100644 --- a/Runtime/Character/IVaryingAnimationTimeScale.hpp +++ b/Runtime/Character/IVaryingAnimationTimeScale.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IVARYINGANIMATIONTIMESCALE_HPP__ -#define __URDE_IVARYINGANIMATIONTIMESCALE_HPP__ +#pragma once #include "CCharAnimTime.hpp" @@ -26,4 +25,3 @@ public: std::unique_ptr Clone() const { return VClone(); } }; } -#endif // __URDE_IVARYINGANIMATIONTIMESCALE_HPP__ diff --git a/Runtime/Character/TSegIdMap.hpp b/Runtime/Character/TSegIdMap.hpp index e3c35a4f2..cb7fc4810 100644 --- a/Runtime/Character/TSegIdMap.hpp +++ b/Runtime/Character/TSegIdMap.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_TSEGIDMAP_HPP__ -#define __URDE_TSEGIDMAP_HPP__ +#pragma once #include #include "CSegId.hpp" @@ -69,4 +68,3 @@ public: } -#endif // __URDE_TSEGIDMAP_HPP__ diff --git a/Runtime/Collision/CAABoxFilter.hpp b/Runtime/Collision/CAABoxFilter.hpp index cb9e693aa..c6ef0e597 100644 --- a/Runtime/Collision/CAABoxFilter.hpp +++ b/Runtime/Collision/CAABoxFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAABOXFILTER_HPP__ -#define __URDE_CAABOXFILTER_HPP__ +#pragma once #include "ICollisionFilter.hpp" @@ -16,4 +15,3 @@ public: } -#endif // __URDE_CAABOXFILTER_HPP__ diff --git a/Runtime/Collision/CAreaOctTree.hpp b/Runtime/Collision/CAreaOctTree.hpp index 94403e2b7..87cbdd3bf 100644 --- a/Runtime/Collision/CAreaOctTree.hpp +++ b/Runtime/Collision/CAreaOctTree.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAREAOCTTREE_HPP__ -#define __URDE_CAREAOCTTREE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -147,4 +146,3 @@ public: } -#endif // __URDE_CAREAOCTTREE_HPP__ diff --git a/Runtime/Collision/CBallFilter.hpp b/Runtime/Collision/CBallFilter.hpp index 131264c33..c1c8b6fc1 100644 --- a/Runtime/Collision/CBallFilter.hpp +++ b/Runtime/Collision/CBallFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBALLFILTER_HPP__ -#define __URDE_CBALLFILTER_HPP__ +#pragma once #include "ICollisionFilter.hpp" @@ -16,4 +15,3 @@ public: } -#endif // __URDE_CBALLFILTER_HPP__ diff --git a/Runtime/Collision/CCollidableAABox.hpp b/Runtime/Collision/CCollidableAABox.hpp index 3e51daf1c..2d0c95931 100644 --- a/Runtime/Collision/CCollidableAABox.hpp +++ b/Runtime/Collision/CCollidableAABox.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLIDABLEAABOX_HPP__ -#define __URDE_CCOLLIDABLEAABOX_HPP__ +#pragma once #include "CCollisionPrimitive.hpp" @@ -39,4 +38,3 @@ public: }; } -#endif // __URDE_CCOLLIDABLEAABOX_HPP__ diff --git a/Runtime/Collision/CCollidableCollisionSurface.hpp b/Runtime/Collision/CCollidableCollisionSurface.hpp index cf9a429d6..8173011e7 100644 --- a/Runtime/Collision/CCollidableCollisionSurface.hpp +++ b/Runtime/Collision/CCollidableCollisionSurface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_COLLIDABLECOLLISIONSURFACE_HPP__ -#define __URDE_COLLIDABLECOLLISIONSURFACE_HPP__ +#pragma once #include "CCollisionPrimitive.hpp" @@ -14,4 +13,3 @@ public: static void SetStaticTableIndex(u32 index); }; } -#endif // __URDE_COLLIDABLECOLLISIONSURFACE_HPP__ diff --git a/Runtime/Collision/CCollidableOBBTree.hpp b/Runtime/Collision/CCollidableOBBTree.hpp index 47b288e2b..32ce093fb 100644 --- a/Runtime/Collision/CCollidableOBBTree.hpp +++ b/Runtime/Collision/CCollidableOBBTree.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLIDABLEOBBTREE_HPP__ -#define __URDE_CCOLLIDABLEOBBTREE_HPP__ +#pragma once #include "Collision/CCollisionPrimitive.hpp" #include "COBBTree.hpp" @@ -85,4 +84,3 @@ public: } -#endif // __URDE_CCOLLIDABLEOBBTREE_HPP__ diff --git a/Runtime/Collision/CCollidableOBBTreeGroup.hpp b/Runtime/Collision/CCollidableOBBTreeGroup.hpp index 6ae7a5e8d..be2ad4def 100644 --- a/Runtime/Collision/CCollidableOBBTreeGroup.hpp +++ b/Runtime/Collision/CCollidableOBBTreeGroup.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLIDABLEOBBTREEGROUP_HPP__ -#define __URDE_CCOLLIDABLEOBBTREEGROUP_HPP__ +#pragma once #include "IOStreams.hpp" #include "CFactoryMgr.hpp" @@ -55,4 +54,3 @@ CFactoryFnReturn FCollidableOBBTreeGroupFactory(const SObjectTag& tag, CInputStr CObjectReference* selfRef); } -#endif // __URDE_CCOLLIDABLEOBBTREEGROUP_HPP__ diff --git a/Runtime/Collision/CCollidableSphere.hpp b/Runtime/Collision/CCollidableSphere.hpp index ff10bc149..5f17d136f 100644 --- a/Runtime/Collision/CCollidableSphere.hpp +++ b/Runtime/Collision/CCollidableSphere.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLIDALBESPHERE_HPP -#define __URDE_CCOLLIDALBESPHERE_HPP +#pragma once #include "CCollisionPrimitive.hpp" #include "zeus/CSphere.hpp" @@ -43,4 +42,3 @@ public: }; } -#endif // __URDE_CCOLLIDALBESPHERE_HPP diff --git a/Runtime/Collision/CCollisionActor.hpp b/Runtime/Collision/CCollisionActor.hpp index 8c6f770ef..54f1c4dde 100644 --- a/Runtime/Collision/CCollisionActor.hpp +++ b/Runtime/Collision/CCollisionActor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONACTOR_HPP__ -#define __URDE_CCOLLISIONACTOR_HPP__ +#pragma once #include "World/CPhysicsActor.hpp" #include "World/CHealthInfo.hpp" @@ -60,4 +59,3 @@ public: }; } -#endif // __URDE_CCOLLISIONACTOR_HPP__ diff --git a/Runtime/Collision/CCollisionActorManager.hpp b/Runtime/Collision/CCollisionActorManager.hpp index 317128e6d..6b4ec8b30 100644 --- a/Runtime/Collision/CCollisionActorManager.hpp +++ b/Runtime/Collision/CCollisionActorManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONACTORMANAGER_HPP__ -#define __URDE_CCOLLISIONACTORMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -35,4 +34,3 @@ public: zeus::CTransform GetWRLocatorTransform(const CAnimData&, CSegId, const zeus::CTransform&, const zeus::CTransform&); }; } -#endif // __URDE_CCOLLISIONACTORMANAGER_HPP__ diff --git a/Runtime/Collision/CCollisionEdge.hpp b/Runtime/Collision/CCollisionEdge.hpp index 2af14cde6..b9ca0b394 100644 --- a/Runtime/Collision/CCollisionEdge.hpp +++ b/Runtime/Collision/CCollisionEdge.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONEDGE_HPP__ -#define __URDE_CCOLLISIONEDGE_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -24,4 +23,3 @@ public: }; } -#endif // __URDE_CCOLLISIONEDGE_HPP__ diff --git a/Runtime/Collision/CCollisionInfo.hpp b/Runtime/Collision/CCollisionInfo.hpp index 35b38ab21..76413f215 100644 --- a/Runtime/Collision/CCollisionInfo.hpp +++ b/Runtime/Collision/CCollisionInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONINFO_HPP__ -#define __URDE_CCOLLISIONINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CMaterialList.hpp" @@ -54,4 +53,3 @@ public: } -#endif // __URDE_CCOLLISIONINFO_HPP__ diff --git a/Runtime/Collision/CCollisionInfoList.hpp b/Runtime/Collision/CCollisionInfoList.hpp index b056abc5a..8dd171ed9 100644 --- a/Runtime/Collision/CCollisionInfoList.hpp +++ b/Runtime/Collision/CCollisionInfoList.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONINFOLIST_HPP__ -#define __URDE_CCOLLISIONINFOLIST_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CCollisionInfo.hpp" @@ -37,4 +36,3 @@ public: }; } -#endif // __URDE_CCOLLISIONINFOLIST_HPP__ diff --git a/Runtime/Collision/CCollisionPrimitive.hpp b/Runtime/Collision/CCollisionPrimitive.hpp index 429648aeb..1088119ab 100644 --- a/Runtime/Collision/CCollisionPrimitive.hpp +++ b/Runtime/Collision/CCollisionPrimitive.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONPRIMITIVE_HPP__ -#define __URDE_CCOLLISIONPRIMITIVE_HPP__ +#pragma once #include "Collision/CMaterialList.hpp" #include "CRayCastResult.hpp" @@ -178,4 +177,3 @@ public: }; } -#endif // __URDE_CCOLLISIONPRIMITIVE_HPP__ diff --git a/Runtime/Collision/CCollisionResponseData.hpp b/Runtime/Collision/CCollisionResponseData.hpp index b137c3e39..8edc69011 100644 --- a/Runtime/Collision/CCollisionResponseData.hpp +++ b/Runtime/Collision/CCollisionResponseData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONRESPONSEDATA_HPP__ -#define __URDE_CCOLLISIONRESPONSEDATA_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Collision/CMaterialList.hpp" @@ -75,4 +74,3 @@ CFactoryFnReturn FCollisionResponseDataFactory(const SObjectTag& tag, CInputStre CObjectReference*); } -#endif // __URDE_CCOLLISIONRESPONSEDATA_HPP__ diff --git a/Runtime/Collision/CCollisionSurface.hpp b/Runtime/Collision/CCollisionSurface.hpp index 70e48030b..afc293635 100644 --- a/Runtime/Collision/CCollisionSurface.hpp +++ b/Runtime/Collision/CCollisionSurface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLLISIONSURFACE_HPP__ -#define __URDE_CCOLLISIONSURFACE_HPP__ +#pragma once #include "zeus/zeus.hpp" #include "RetroTypes.hpp" @@ -23,4 +22,3 @@ public: }; } -#endif // __URDE_CCOLLISIONSURFACE_HPP__ diff --git a/Runtime/Collision/CGameCollision.hpp b/Runtime/Collision/CGameCollision.hpp index 5b01ed1d4..0b8f1a366 100644 --- a/Runtime/Collision/CGameCollision.hpp +++ b/Runtime/Collision/CGameCollision.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMECOLLISION_HPP__ -#define __URDE_CGAMECOLLISION_HPP__ +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/CPlane.hpp" #include "rstl.hpp" @@ -125,4 +124,3 @@ public: }; } -#endif // __URDE_CGAMECOLLISION_HPP__ diff --git a/Runtime/Collision/CInternalRayCastStructure.hpp b/Runtime/Collision/CInternalRayCastStructure.hpp index 06ebe0661..f42dee0b9 100644 --- a/Runtime/Collision/CInternalRayCastStructure.hpp +++ b/Runtime/Collision/CInternalRayCastStructure.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINTERNALRAYCASTSTRUCTURE_HPP__ -#define __URDE_CINTERNALRAYCASTSTRUCTURE_HPP__ +#pragma once #include "zeus/CTransform.hpp" #include "zeus/CMRay.hpp" @@ -31,4 +30,3 @@ public: }; } -#endif // __URDE_CINTERNALRAYCASTSTRUCTURE_HPP__ diff --git a/Runtime/Collision/CJointCollisionDescription.hpp b/Runtime/Collision/CJointCollisionDescription.hpp index e75f69378..5657ed3a6 100644 --- a/Runtime/Collision/CJointCollisionDescription.hpp +++ b/Runtime/Collision/CJointCollisionDescription.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CJOINTCOLLISIONDESCRIPTION_HPP__ -#define __URDE_CJOINTCOLLISIONDESCRIPTION_HPP__ +#pragma once #include "Character/CSegId.hpp" #include "zeus/CAABox.hpp" @@ -63,4 +62,3 @@ public: }; } -#endif // __URDE_CJOINTCOLLISIONDESCRIPTION_HPP__ diff --git a/Runtime/Collision/CMaterialFilter.hpp b/Runtime/Collision/CMaterialFilter.hpp index 30107ca2c..988fe7679 100644 --- a/Runtime/Collision/CMaterialFilter.hpp +++ b/Runtime/Collision/CMaterialFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMATERIALFILTER_HPP__ -#define __URDE_CMATERIALFILTER_HPP__ +#pragma once #include "CMaterialList.hpp" #include "zeus/Math.hpp" @@ -37,4 +36,3 @@ public: bool Passes(const CMaterialList&) const; }; } -#endif // __CMATERIALFILTER_HPP__ diff --git a/Runtime/Collision/CMaterialList.hpp b/Runtime/Collision/CMaterialList.hpp index 5a035add1..340e4b1a0 100644 --- a/Runtime/Collision/CMaterialList.hpp +++ b/Runtime/Collision/CMaterialList.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMATERIALLIST_HPP__ -#define __URDE_CMATERIALLIST_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -159,4 +158,3 @@ public: } -#endif // __URDE_CMATERIALLIST_HPP__ diff --git a/Runtime/Collision/CMetroidAreaCollider.hpp b/Runtime/Collision/CMetroidAreaCollider.hpp index ef4497d9e..288a23583 100644 --- a/Runtime/Collision/CMetroidAreaCollider.hpp +++ b/Runtime/Collision/CMetroidAreaCollider.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETROIDAREACOLLIDER_HPP__ -#define __URDE_CMETROIDAREACOLLIDER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -197,4 +196,3 @@ public: } -#endif // __URDE_CMETROIDAREACOLLIDER_HPP__ diff --git a/Runtime/Collision/COBBTree.hpp b/Runtime/Collision/COBBTree.hpp index d29cfb54a..8161d0c57 100644 --- a/Runtime/Collision/COBBTree.hpp +++ b/Runtime/Collision/COBBTree.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_COBBTREE_HPP__ -#define __URDE_COBBTREE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CCollisionEdge.hpp" #include "CCollisionSurface.hpp" @@ -91,4 +90,3 @@ public: }; } -#endif // __URDE_COBBTREE_HPP__ diff --git a/Runtime/Collision/CRayCastResult.hpp b/Runtime/Collision/CRayCastResult.hpp index 9260fb12a..8f2c40042 100644 --- a/Runtime/Collision/CRayCastResult.hpp +++ b/Runtime/Collision/CRayCastResult.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRAYCASTRESULT_HPP__ -#define __URDE_CRAYCASTRESULT_HPP__ +#pragma once #include "CMaterialList.hpp" #include "zeus/zeus.hpp" @@ -50,4 +49,3 @@ public: }; } -#endif // __URDE_CRAYCASTRESULT_HPP__ diff --git a/Runtime/Collision/CollisionUtil.hpp b/Runtime/Collision/CollisionUtil.hpp index 9704a9868..f312a53b2 100644 --- a/Runtime/Collision/CollisionUtil.hpp +++ b/Runtime/Collision/CollisionUtil.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_COLLISIONUTIL_HPP__ -#define __URDE_COLLISIONUTIL_HPP__ +#pragma once #include "GCNTypes.hpp" #include "zeus/zeus.hpp" @@ -50,4 +49,3 @@ bool AABox_AABox_Moving(const zeus::CAABox& aabb0, const zeus::CAABox& aabb1, co void AddAverageToFront(const CCollisionInfoList& in, CCollisionInfoList& out); } } -#endif // __URDE_COLLISIONUTIL_HPP__ diff --git a/Runtime/Collision/ICollisionFilter.hpp b/Runtime/Collision/ICollisionFilter.hpp index 2f8fcd36e..13e8ce2a1 100644 --- a/Runtime/Collision/ICollisionFilter.hpp +++ b/Runtime/Collision/ICollisionFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_ICOLLISIONFILTER_HPP__ -#define __URDE_ICOLLISIONFILTER_HPP__ +#pragma once #include "CCollisionInfoList.hpp" @@ -18,4 +17,3 @@ public: } -#endif // __URDE_ICOLLISIONFILTER_HPP__ diff --git a/Runtime/Collision/InternalColliders.hpp b/Runtime/Collision/InternalColliders.hpp index 05a0c7e40..1dfef20d7 100644 --- a/Runtime/Collision/InternalColliders.hpp +++ b/Runtime/Collision/InternalColliders.hpp @@ -1,9 +1,7 @@ -#ifndef __URDE_INTERNALCOLLIDERS_HPP__ -#define __URDE_INTERNALCOLLIDERS_HPP__ +#pragma once namespace urde::InternalColliders { void AddTypes(); void AddColliders(); } -#endif // __URDE_INTERNALCOLLIDERS_HPP__ diff --git a/Runtime/GCNTypes.hpp b/Runtime/GCNTypes.hpp index f6dd5758d..745e00441 100644 --- a/Runtime/GCNTypes.hpp +++ b/Runtime/GCNTypes.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_GCTYPES_HPP__ -#define __URDE_GCTYPES_HPP__ +#pragma once #include #include @@ -13,4 +12,3 @@ using u32 = uint32_t; using s64 = int64_t; using u64 = uint64_t; -#endif // __URDE_GCTYPES_HPP__ diff --git a/Runtime/GameGlobalObjects.hpp b/Runtime/GameGlobalObjects.hpp index f1b616c7f..ed984ee01 100644 --- a/Runtime/GameGlobalObjects.hpp +++ b/Runtime/GameGlobalObjects.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_GAMEGLOBALOBJECTS_HPP__ -#define __URDE_GAMEGLOBALOBJECTS_HPP__ +#pragma once #define USE_DOWNCAST_TWEAKS 1 @@ -102,4 +101,3 @@ extern ITweakGuiColors* g_tweakGuiColors; } -#endif // __URDE_GAMEGLOBALOBJECTS_HPP__ diff --git a/Runtime/GameObjectLists.hpp b/Runtime/GameObjectLists.hpp index 1d5fe78ce..091ff658b 100644 --- a/Runtime/GameObjectLists.hpp +++ b/Runtime/GameObjectLists.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_GAMEOBJECTLISTS_HPP__ -#define __URDE_GAMEOBJECTLISTS_HPP__ +#pragma once #include "CObjectList.hpp" @@ -63,4 +62,3 @@ public: } -#endif // __URDE_GAMEOBJECTLISTS_HPP__ diff --git a/Runtime/Graphics/CBooRenderer.hpp b/Runtime/Graphics/CBooRenderer.hpp index 616b9dd31..95e577fe5 100644 --- a/Runtime/Graphics/CBooRenderer.hpp +++ b/Runtime/Graphics/CBooRenderer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBOORENDERER_HPP__ -#define __URDE_CBOORENDERER_HPP__ +#pragma once #include #include "IRenderer.hpp" @@ -311,4 +310,3 @@ public: } -#endif // __URDE_CBOORENDERER_HPP__ diff --git a/Runtime/Graphics/CDrawable.hpp b/Runtime/Graphics/CDrawable.hpp index 820856162..5aba17753 100644 --- a/Runtime/Graphics/CDrawable.hpp +++ b/Runtime/Graphics/CDrawable.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDRAWABLE_HPP__ -#define __URDE_CDRAWABLE_HPP__ +#pragma once #include "GCNTypes.hpp" #include "zeus/CAABox.hpp" @@ -34,4 +33,3 @@ public: }; } -#endif // __URDE_CDRAWABLE_HPP__ diff --git a/Runtime/Graphics/CDrawablePlaneObject.hpp b/Runtime/Graphics/CDrawablePlaneObject.hpp index 0522a25d5..5c738b8cb 100644 --- a/Runtime/Graphics/CDrawablePlaneObject.hpp +++ b/Runtime/Graphics/CDrawablePlaneObject.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDRAWABLEOBJECT_HPP__ -#define __URDE_CDRAWABLEOBJECT_HPP__ +#pragma once #include "CDrawable.hpp" #include "zeus/CPlane.hpp" @@ -23,4 +22,3 @@ public: }; } -#endif // __URDE_CDRAWABLEOBJECT_HPP__ diff --git a/Runtime/Graphics/CGraphics.hpp b/Runtime/Graphics/CGraphics.hpp index 7e8a7f0d7..9d53a732c 100644 --- a/Runtime/Graphics/CGraphics.hpp +++ b/Runtime/Graphics/CGraphics.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGRAPHICS_HPP__ -#define __URDE_CGRAPHICS_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "boo/graphicsdev/IGraphicsCommandQueue.hpp" @@ -408,4 +407,3 @@ public: } -#endif // __URDE_CGRAPHICS_HPP__ diff --git a/Runtime/Graphics/CGraphicsPalette.hpp b/Runtime/Graphics/CGraphicsPalette.hpp index 683b6964d..8a085a7b5 100644 --- a/Runtime/Graphics/CGraphicsPalette.hpp +++ b/Runtime/Graphics/CGraphicsPalette.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGRAPHICSPALETTE_HPP__ -#define __URDE_CGRAPHICSPALETTE_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -39,4 +38,3 @@ public: } -#endif // __URDE_CGRAPHICSPALETTE_HPP__ diff --git a/Runtime/Graphics/CLight.hpp b/Runtime/Graphics/CLight.hpp index ef4101c6d..2b3e2f616 100644 --- a/Runtime/Graphics/CLight.hpp +++ b/Runtime/Graphics/CLight.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CLIGHT_HPP__ -#define __URDE_CLIGHT_HPP__ +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/CColor.hpp" @@ -143,4 +142,3 @@ public: } -#endif // __URDE_CLIGHT_HPP__ diff --git a/Runtime/Graphics/CLineRenderer.hpp b/Runtime/Graphics/CLineRenderer.hpp index a7d7bd79e..a894182c9 100644 --- a/Runtime/Graphics/CLineRenderer.hpp +++ b/Runtime/Graphics/CLineRenderer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CLINERENDERER_HPP__ -#define __URDE_CLINERENDERER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -99,4 +98,3 @@ public: } -#endif // __URDE_CLINERENDERER_HPP__ diff --git a/Runtime/Graphics/CMetroidModelInstance.hpp b/Runtime/Graphics/CMetroidModelInstance.hpp index ccf7d96be..e349c4980 100644 --- a/Runtime/Graphics/CMetroidModelInstance.hpp +++ b/Runtime/Graphics/CMetroidModelInstance.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMETROIDMODELINSTANCE_HPP__ -#define __URDE_CMETROIDMODELINSTANCE_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -42,4 +41,3 @@ public: } -#endif // __URDE_CMETROIDMODELINSTANCE_HPP__ diff --git a/Runtime/Graphics/CModel.hpp b/Runtime/Graphics/CModel.hpp index d4dbae713..826666f93 100644 --- a/Runtime/Graphics/CModel.hpp +++ b/Runtime/Graphics/CModel.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMODEL_HPP__ -#define __URDE_CMODEL_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CColor.hpp" @@ -332,4 +331,3 @@ CFactoryFnReturn FModelFactory(const urde::SObjectTag& tag, } -#endif // __URDE_CMODEL_HPP__ diff --git a/Runtime/Graphics/CMoviePlayer.hpp b/Runtime/Graphics/CMoviePlayer.hpp index 2751bd81d..e208598ea 100644 --- a/Runtime/Graphics/CMoviePlayer.hpp +++ b/Runtime/Graphics/CMoviePlayer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMOVIEPLAYER_HPP__ -#define __URDE_CMOVIEPLAYER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CDvdFile.hpp" @@ -173,4 +172,3 @@ public: } -#endif // __URDE_CMOVIEPLAYER_HPP__ diff --git a/Runtime/Graphics/CPVSAreaSet.hpp b/Runtime/Graphics/CPVSAreaSet.hpp index 0bef03ab9..cb07a056e 100644 --- a/Runtime/Graphics/CPVSAreaSet.hpp +++ b/Runtime/Graphics/CPVSAreaSet.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPVSAREASET_HPP__ -#define __URDE_CPVSAREASET_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CPVSVisOctree.hpp" @@ -42,4 +41,3 @@ public: } -#endif // __URDE_CPVSAREASET_HPP__ diff --git a/Runtime/Graphics/CPVSVisOctree.hpp b/Runtime/Graphics/CPVSVisOctree.hpp index 51d45dd3b..b24d17397 100644 --- a/Runtime/Graphics/CPVSVisOctree.hpp +++ b/Runtime/Graphics/CPVSVisOctree.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPVSVISOCTREE_HPP__ -#define __URDE_CPVSVISOCTREE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -33,4 +32,3 @@ public: } -#endif // __URDE_CPVSVISOCTREE_HPP__ diff --git a/Runtime/Graphics/CPVSVisSet.hpp b/Runtime/Graphics/CPVSVisSet.hpp index cd2aec30b..7f6fc62d1 100644 --- a/Runtime/Graphics/CPVSVisSet.hpp +++ b/Runtime/Graphics/CPVSVisSet.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPVSVISSET_HPP__ -#define __URDE_CPVSVISSET_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -33,4 +32,3 @@ public: } -#endif // __URDE_CPVSVISSET_HPP__ diff --git a/Runtime/Graphics/CRainSplashGenerator.hpp b/Runtime/Graphics/CRainSplashGenerator.hpp index cb90a8163..e4d6c64b8 100644 --- a/Runtime/Graphics/CRainSplashGenerator.hpp +++ b/Runtime/Graphics/CRainSplashGenerator.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CRAINSPLASHGENERATOR_HPP -#define URDE_CRAINSPLASHGENERATOR_HPP +#pragma once #include "RetroTypes.hpp" #include "CRandom16.hpp" @@ -74,4 +73,3 @@ public: } -#endif // URDE_CRAINSPLASHGENERATOR_HPP diff --git a/Runtime/Graphics/CSimpleShadow.hpp b/Runtime/Graphics/CSimpleShadow.hpp index 0e3102064..e554e184d 100644 --- a/Runtime/Graphics/CSimpleShadow.hpp +++ b/Runtime/Graphics/CSimpleShadow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSIMPLESHADOW_HPP__ -#define __URDE_CSIMPLESHADOW_HPP__ +#pragma once #include "zeus/CAABox.hpp" #include "Graphics/Shaders/CTexturedQuadFilter.hpp" @@ -36,4 +35,3 @@ public: }; } -#endif // __URDE_CSIMPLESHADOW_HPP__ diff --git a/Runtime/Graphics/CSkinnedModel.hpp b/Runtime/Graphics/CSkinnedModel.hpp index 436a44284..446c88633 100644 --- a/Runtime/Graphics/CSkinnedModel.hpp +++ b/Runtime/Graphics/CSkinnedModel.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSKINNEDMODEL_HPP__ -#define __URDE_CSKINNEDMODEL_HPP__ +#pragma once #include "CToken.hpp" #include "CModel.hpp" @@ -70,4 +69,3 @@ public: } -#endif // __URDE_CSKINNEDMODEL_HPP__ diff --git a/Runtime/Graphics/CTexture.hpp b/Runtime/Graphics/CTexture.hpp index 888836fbb..9d68b8749 100644 --- a/Runtime/Graphics/CTexture.hpp +++ b/Runtime/Graphics/CTexture.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEXTURE_HPP__ -#define __URDE_CTEXTURE_HPP__ +#pragma once #include "GCNTypes.hpp" #include "CFactoryMgr.hpp" @@ -83,4 +82,3 @@ CFactoryFnReturn FTextureFactory(const urde::SObjectTag& tag, } -#endif // __URDE_CTEXTURE_HPP__ diff --git a/Runtime/Graphics/CVertexMorphEffect.hpp b/Runtime/Graphics/CVertexMorphEffect.hpp index 8bf8cf07a..9bdc9262f 100644 --- a/Runtime/Graphics/CVertexMorphEffect.hpp +++ b/Runtime/Graphics/CVertexMorphEffect.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CVERTEXMORPHEFFECT_HPP__ -#define __URDE_CVERTEXMORPHEFFECT_HPP__ +#pragma once #include "CToken.hpp" #include "Character/CPoseAsTransforms.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CVERTEXMORPHEFFECT_HPP__ diff --git a/Runtime/Graphics/IRenderer.hpp b/Runtime/Graphics/IRenderer.hpp index 3b6b1c7a4..8081ca25e 100644 --- a/Runtime/Graphics/IRenderer.hpp +++ b/Runtime/Graphics/IRenderer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IRENDERER_HPP__ -#define __URDE_IRENDERER_HPP__ +#pragma once #include #include "../RetroTypes.hpp" @@ -112,4 +111,3 @@ public: } -#endif // __URDE_IRENDERER_HPP__ diff --git a/Runtime/Graphics/IWeaponRenderer.hpp b/Runtime/Graphics/IWeaponRenderer.hpp index c3fd7c879..99f0666bf 100644 --- a/Runtime/Graphics/IWeaponRenderer.hpp +++ b/Runtime/Graphics/IWeaponRenderer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IWEAPONRENDERER_HPP__ -#define __URDE_IWEAPONRENDERER_HPP__ +#pragma once namespace urde { @@ -20,4 +19,3 @@ public: } -#endif // __URDE_IWEAPONRENDERER_HPP__ diff --git a/Runtime/Graphics/Shaders/CAABoxShader.hpp b/Runtime/Graphics/Shaders/CAABoxShader.hpp index d81511301..a80d05686 100644 --- a/Runtime/Graphics/Shaders/CAABoxShader.hpp +++ b/Runtime/Graphics/Shaders/CAABoxShader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAABOXSHADER_HPP__ -#define __URDE_CAABOXSHADER_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "zeus/CMatrix4f.hpp" @@ -31,4 +30,3 @@ public: } -#endif // __URDE_CAABOXSHADER_HPP__ diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp index 0f260ac01..bfd7d91df 100644 --- a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp +++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCAMERABLURFILTER_HPP__ -#define __URDE_CCAMERABLURFILTER_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "zeus/CMatrix4f.hpp" @@ -35,4 +34,3 @@ public: } -#endif // __URDE_CCAMERABLURFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp b/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp index c84e6dc47..cabe6fb00 100644 --- a/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp +++ b/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLOREDQUADFILTER_HPP__ -#define __URDE_CCOLOREDQUADFILTER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -50,4 +49,3 @@ public: } -#endif // __URDE_CCOLOREDQUADFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CDecalShaders.hpp b/Runtime/Graphics/Shaders/CDecalShaders.hpp index 1b1294cca..2072e1c91 100644 --- a/Runtime/Graphics/Shaders/CDecalShaders.hpp +++ b/Runtime/Graphics/Shaders/CDecalShaders.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDECALSHADERS_HPP__ -#define __URDE_CDECALSHADERS_HPP__ +#pragma once #include "Graphics/CGraphics.hpp" @@ -25,4 +24,3 @@ public: } -#endif // __URDE_CDECALSHADERS_HPP__ diff --git a/Runtime/Graphics/Shaders/CElementGenShaders.hpp b/Runtime/Graphics/Shaders/CElementGenShaders.hpp index 4209e6a5e..e8163e150 100644 --- a/Runtime/Graphics/Shaders/CElementGenShaders.hpp +++ b/Runtime/Graphics/Shaders/CElementGenShaders.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CELEMENTGENSHADERS_HPP__ -#define __URDE_CELEMENTGENSHADERS_HPP__ +#pragma once #include "Graphics/CGraphics.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp" @@ -56,4 +55,3 @@ public: } -#endif // __URDE_CELEMENTGENSHADERS_HPP__ diff --git a/Runtime/Graphics/Shaders/CEnergyBarShader.hpp b/Runtime/Graphics/Shaders/CEnergyBarShader.hpp index c91c7ca63..1461406a2 100644 --- a/Runtime/Graphics/Shaders/CEnergyBarShader.hpp +++ b/Runtime/Graphics/Shaders/CEnergyBarShader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CENERGYBARSHADER_HPP__ -#define __URDE_CENERGYBARSHADER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -43,4 +42,3 @@ public: } -#endif // __URDE_CENERGYBARSHADER_HPP__ diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp b/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp index c731bdf73..a554cd0b5 100644 --- a/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp +++ b/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp @@ -1,5 +1,4 @@ -#ifndef CFLUIDPLANESHADER_HPP -#define CFLUIDPLANESHADER_HPP +#pragma once #include "RetroTypes.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp" @@ -199,4 +198,3 @@ public: } -#endif // CFLUIDPLANESHADER_HPP diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShaderGLSL.cpp b/Runtime/Graphics/Shaders/CFluidPlaneShaderGLSL.cpp deleted file mode 100644 index 45569d1bf..000000000 --- a/Runtime/Graphics/Shaders/CFluidPlaneShaderGLSL.cpp +++ /dev/null @@ -1,958 +0,0 @@ -#include "CFluidPlaneShader.hpp" - -namespace urde -{ - -static const char* VS = -"#version 330\n" -BOO_GLSL_BINDING_HEAD -"layout(location=0) in vec4 posIn;\n" -"layout(location=1) in vec4 normalIn;\n" -"layout(location=2) in vec4 binormalIn;\n" -"layout(location=3) in vec4 tangentIn;\n" -"layout(location=4) in vec4 colorIn;\n" -"\n" -"UBINDING0 uniform FluidPlaneUniform\n" -"{\n" -" mat4 mv;\n" -" mat4 mvNorm;\n" -" mat4 proj;\n" -" mat4 texMtxs[6];\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" vec4 mvPos;\n" -" vec4 mvNorm;\n" -" vec4 mvBinorm;\n" -" vec4 mvTangent;\n" -" vec4 color;\n" -" vec2 uvs[7];\n" -"};\n" -"\n" -"SBINDING(0) out VertToFrag vtf;\n" -"void main()\n" -"{\n" -" vec4 pos = vec4(posIn.xyz, 1.0);\n" -" vtf.mvPos = mv * pos;\n" -" gl_Position = proj * vtf.mvPos;\n" -" vtf.mvNorm = mvNorm * normalIn;\n" -" vtf.mvBinorm = mvNorm * binormalIn;\n" -" vtf.mvTangent = mvNorm * tangentIn;\n" -" vtf.color = vec4(colorIn.xyz, 1.0);\n" -" vtf.uvs[0] = (texMtxs[0] * pos).xy;\n" -" vtf.uvs[1] = (texMtxs[1] * pos).xy;\n" -" vtf.uvs[2] = (texMtxs[2] * pos).xy;\n" -"%s" // Additional TCGs here -"}\n"; - -static const char* TessVS = -"#version 330\n" -BOO_GLSL_BINDING_HEAD -"\n" -"layout(location=0) in vec4 posIn;\n" -"layout(location=1) in vec4 outerLevelsIn;\n" -"layout(location=2) in vec2 innerLevelsIn;\n" -"\n" -"struct VertToControl\n" -"{\n" -" vec4 minMaxPos;\n" -" vec4 outerLevels;\n" -" vec2 innerLevels;\n" -"};\n" -"\n" -"SBINDING(0) out VertToControl vtc;\n" -"\n" -"void main()\n" -"{\n" -" vtc.minMaxPos = posIn;\n" -" vtc.outerLevels = outerLevelsIn;\n" -" vtc.innerLevels = innerLevelsIn;\n" -"}\n"; - -static const char* TessCS = -"#version 330\n" -BOO_GLSL_BINDING_HEAD -"#extension GL_ARB_tessellation_shader: enable\n" -"layout(vertices = 1) out;\n" -"\n" -"struct VertToControl\n" -"{\n" -" vec4 minMaxPos;\n" -" vec4 outerLevels;\n" -" vec2 innerLevels;\n" -"};\n" -"\n" -"SBINDING(0) in VertToControl vtc[];\n" -"SBINDING(0) patch out vec4 minMaxPos;\n" -"\n" -"void main()\n" -"{\n" -" minMaxPos = vtc[gl_InvocationID].minMaxPos;\n" -" for (int i=0 ; i<4 ; ++i)\n" -" gl_TessLevelOuter[i] = vtc[gl_InvocationID].outerLevels[i];\n" -" for (int i=0 ; i<2 ; ++i)\n" -" gl_TessLevelInner[i] = vtc[gl_InvocationID].innerLevels[i];\n" -"}"; - -static const char* TessES = -"#version 330\n" -BOO_GLSL_BINDING_HEAD -"#extension GL_ARB_tessellation_shader: enable\n" -"layout(quads, equal_spacing) in;\n" -"\n" -"struct Ripple\n" -"{\n" -" vec4 center; // time, distFalloff\n" -" vec4 params; // amplitude, lookupPhase, lookupTime\n" -"};\n" -"\n" -"UBINDING0 uniform FluidPlaneUniform\n" -"{\n" -" mat4 mv;\n" -" mat4 mvNorm;\n" -" mat4 proj;\n" -" mat4 texMtxs[6];\n" -" Ripple ripples[20];\n" -" vec4 colorMul;\n" -" float rippleNormResolution;\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" vec4 mvPos;\n" -" vec4 mvNorm;\n" -" vec4 mvBinorm;\n" -" vec4 mvTangent;\n" -" vec4 color;\n" -" vec2 uvs[7];\n" -"};\n" -"\n" -"SBINDING(0) patch in vec4 minMaxPos;\n" -"SBINDING(0) out VertToFrag vtf;\n" -"\n" -"TBINDING%d uniform sampler2D RippleMap;\n" -"\n" -"const float PI_X2 = 6.283185307179586;\n" -"\n" -"void ApplyRipple(in Ripple ripple, in vec2 pos, inout float height)\n" -"{\n" -" float dist = length(ripple.center.xy - pos);\n" -" float rippleV = textureLod(RippleMap, vec2(dist * ripple.center.w, ripple.center.z), 0.0).r;\n" -" height += rippleV * ripple.params.x * sin((dist * ripple.params.y + ripple.params.z) * PI_X2);\n" -"}\n" -"\n" -"void main()\n" -"{\n" -" vec2 posIn = vec2(mix(minMaxPos.x, minMaxPos.z, gl_TessCoord.x),\n" -" mix(minMaxPos.y, minMaxPos.w, gl_TessCoord.y));\n" -" float height = 0.0;\n" -" float upHeight = 0.0;\n" -" float downHeight = 0.0;\n" -" float rightHeight = 0.0;\n" -" float leftHeight = 0.0;\n" -" for (int i=0 ; i<20 ; ++i)\n" -" {\n" -" ApplyRipple(ripples[i], posIn, height);\n" -" ApplyRipple(ripples[i], posIn + vec2(0.0, rippleNormResolution), upHeight);\n" -" ApplyRipple(ripples[i], posIn - vec2(0.0, rippleNormResolution), downHeight);\n" -" ApplyRipple(ripples[i], posIn + vec2(rippleNormResolution, 0.0), rightHeight);\n" -" ApplyRipple(ripples[i], posIn - vec2(rippleNormResolution, 0.0), leftHeight);\n" -" }\n" -" vec4 normalIn = vec4(normalize(vec3((leftHeight - rightHeight),\n" -" (downHeight - upHeight),\n" -" rippleNormResolution)), 1.0);\n" -" vec4 binormalIn = vec4(normalIn.x, normalIn.z, -normalIn.y, 1.0);\n" -" vec4 tangentIn = vec4(normalIn.z, normalIn.y, -normalIn.x, 1.0);\n" -" vec4 pos = vec4(posIn, height, 1.0);\n" -" vtf.mvPos = mv * pos;\n" -" gl_Position = proj * vtf.mvPos;\n" -" vtf.mvNorm = mvNorm * normalIn;\n" -" vtf.mvBinorm = mvNorm * binormalIn;\n" -" vtf.mvTangent = mvNorm * tangentIn;\n" -" vtf.color = max(height, 0.0) * colorMul;\n" -" vtf.color.a = 1.0;\n" -" vtf.uvs[0] = (texMtxs[0] * pos).xy;\n" -" vtf.uvs[1] = (texMtxs[1] * pos).xy;\n" -" vtf.uvs[2] = (texMtxs[2] * pos).xy;\n" -"%s\n" // Additional TCGs here -"}\n"; - -static const char* FS = -"#version 330\n" -BOO_GLSL_BINDING_HEAD -"\n" -"struct Light\n" -"{\n" -" vec4 pos;\n" -" vec4 dir;\n" -" vec4 color;\n" -" vec4 linAtt;\n" -" vec4 angAtt;\n" -"};\n" -"struct Fog\n" // Reappropriated for indirect texture scaling -"{\n" -" int mode;\n" -" vec4 color;\n" -" float indScale;\n" -" float start;\n" -"};\n" -"\n" -"UBINDING2 uniform LightingUniform\n" -"{\n" -" Light lights[" _XSTR(URDE_MAX_LIGHTS) "];\n" -" vec4 ambient;\n" -" vec4 kColor0;\n" -" vec4 kColor1;\n" -" vec4 kColor2;\n" -" vec4 kColor3;\n" -" Fog fog;\n" -"};\n" -"\n" -"vec4 LightingFunc(vec3 mvPosIn, vec3 mvNormIn)\n" -"{\n" -" vec4 ret = ambient;\n" -" \n" -" for (int i=0 ; i<" _XSTR(URDE_MAX_LIGHTS) " ; ++i)\n" -" {\n" -" vec3 delta = mvPosIn - lights[i].pos.xyz;\n" -" float dist = length(delta);\n" -" float angDot = clamp(dot(normalize(delta), lights[i].dir.xyz), 0.0, 1.0);\n" -" float att = 1.0 / (lights[i].linAtt[2] * dist * dist +\n" -" lights[i].linAtt[1] * dist +\n" -" lights[i].linAtt[0]);\n" -" float angAtt = lights[i].angAtt[2] * angDot * angDot +\n" -" lights[i].angAtt[1] * angDot +\n" -" lights[i].angAtt[0];\n" -" ret += lights[i].color * clamp(angAtt, 0.0, 1.0) * att * clamp(dot(normalize(-delta), mvNormIn), 0.0, 1.0);\n" -" }\n" -" \n" -" return ret;\n" -"}\n" -"\n" -"struct VertToFrag\n" -"{\n" -" vec4 mvPos;\n" -" vec4 mvNorm;\n" -" vec4 mvBinorm;\n" -" vec4 mvTangent;\n" -" vec4 color;\n" -" vec2 uvs[7];\n" -"};\n" -"\n" -"SBINDING(0) in VertToFrag vtf;\n" -"layout(location=0) out vec4 colorOut;\n" -"%s" // Textures here -"void main()\n" -"{\n" -" vec4 lighting = LightingFunc(vtf.mvPos.xyz, normalize(vtf.mvNorm.xyz));\n" -"%s" // Combiner expression here -"}\n"; - -static const char* FSDoor = -"#version 330\n" -BOO_GLSL_BINDING_HEAD -"\n" -"struct Light\n" -"{\n" -" vec4 pos;\n" -" vec4 dir;\n" -" vec4 color;\n" -" vec4 linAtt;\n" -" vec4 angAtt;\n" -"};\n" -"struct Fog\n" // Reappropriated for indirect texture scaling -"{\n" -" int mode;\n" -" vec4 color;\n" -" float indScale;\n" -" float start;\n" -"};\n" -"\n" -"UBINDING2 uniform LightingUniform\n" -"{\n" -" Light lights[" _XSTR(URDE_MAX_LIGHTS) "];\n" -" vec4 ambient;\n" -" vec4 kColor0;\n" -" vec4 kColor1;\n" -" vec4 kColor2;\n" -" vec4 kColor3;\n" -" Fog fog;\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" vec4 mvPos;\n" -" vec4 mvNorm;\n" -" vec4 mvBinorm;\n" -" vec4 mvTangent;\n" -" vec4 color;\n" -" vec2 uvs[7];\n" -"};\n" -"\n" -"SBINDING(0) in VertToFrag vtf;\n" -"layout(location=0) out vec4 colorOut;\n" -"%s" // Textures here -"void main()\n" -"{\n" -"%s" // Combiner expression here -"}\n"; - -static void _BuildFragShader(std::string& finalFS, int& nextTex, const char* texNames[8], - const SFluidPlaneShaderInfo& info) -{ - std::string textures; - std::string combiner; - int nextTCG = 3; - int bumpMapUv, envBumpMapUv, envMapUv, lightmapUv; - - if (info.m_hasPatternTex1) - { - texNames[nextTex] = "patternTex1"; - textures += hecl::Format("TBINDING%d uniform sampler2D patternTex1;\n", nextTex++); - } - if (info.m_hasPatternTex2) - { - texNames[nextTex] = "patternTex2"; - textures += hecl::Format("TBINDING%d uniform sampler2D patternTex2;\n", nextTex++); - } - if (info.m_hasColorTex) - { - texNames[nextTex] = "colorTex"; - textures += hecl::Format("TBINDING%d uniform sampler2D colorTex;\n", nextTex++); - } - if (info.m_hasBumpMap) - { - texNames[nextTex] = "bumpMap"; - textures += hecl::Format("TBINDING%d uniform sampler2D bumpMap;\n", nextTex++); - } - if (info.m_hasEnvMap) - { - texNames[nextTex] = "envMap"; - textures += hecl::Format("TBINDING%d uniform sampler2D envMap;\n", nextTex++); - } - if (info.m_hasEnvBumpMap) - { - texNames[nextTex] = "envBumpMap"; - textures += hecl::Format("TBINDING%d uniform sampler2D envBumpMap;\n", nextTex++); - } - if (info.m_hasLightmap) - { - texNames[nextTex] = "lightMap"; - textures += hecl::Format("TBINDING%d uniform sampler2D lightMap;\n", nextTex++); - } - - if (info.m_hasBumpMap) - { - bumpMapUv = nextTCG++; - } - if (info.m_hasEnvBumpMap) - { - envBumpMapUv = nextTCG++; - } - if (info.m_hasEnvMap) - { - envMapUv = nextTCG++; - } - if (info.m_hasLightmap) - { - lightmapUv = nextTCG; - } - - switch (info.m_type) - { - case EFluidType::NormalWater: - case EFluidType::PhazonFluid: - case EFluidType::Four: - if (info.m_hasLightmap) - { - combiner += hecl::Format(" vec4 lightMapTexel = texture(lightMap, vtf.uvs[%d]);\n", lightmapUv); - // 0: Tex4TCG, Tex4, doubleLightmapBlend ? NULL : GX_COLOR1A1 - // ZERO, TEX, KONST, doubleLightmapBlend ? ZERO : RAS - // Output reg 2 - // KColor 2 - if (info.m_doubleLightmapBlend) - { - // 1: Tex4TCG2, Tex4, GX_COLOR1A1 - // C2, TEX, KONST, RAS - // Output reg 2 - // KColor 3 - // Tex * K2 + Lighting - combiner += " lighting += mix(lightMapTexel * kColor2, lightMapTexel, kColor3);\n"; - } - else - { - // mix(Tex * K2, Tex, K3) + Lighting - combiner += " lighting += lightMapTexel * kColor2;\n"; - } - } - - // Next: Tex0TCG, Tex0, GX_COLOR1A1 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // Next: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // Next: Tex2TCG, Tex2, GX_COLOR1A1 - // ZERO, TEX, hasTex4 ? C2 : RAS, PREV - // Output reg prev - - // (Tex0 * kColor0 + Lighting) * Tex1 + VertColor + Tex2 * Lighting - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (texture(patternTex1, vtf.uvs[0]) * kColor0 + lighting) *\n" - " texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = lighting * texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - - if (info.m_hasColorTex && !info.m_hasEnvMap && info.m_hasEnvBumpMap) - { - // Make previous stage indirect, mtx0 - combiner += hecl::Format(" vec2 indUvs = (texture(envBumpMap, vtf.uvs[%d]).ra - vec2(0.5, 0.5)) *\n" - " vec2(fog.indScale, -fog.indScale);\n", envBumpMapUv); - combiner += " colorOut += texture(colorTex, indUvs + vtf.uvs[2]) * lighting;\n"; - } - else if (info.m_hasEnvMap) - { - // Next: envTCG, envTex, NULL - // PREV, TEX, KONST, ZERO - // Output reg prev - // KColor 1 - - // Make previous stage indirect, mtx0 - if (info.m_hasColorTex) - combiner += " colorOut += texture(colorTex, vtf.uvs[2]) * lighting;\n"; - combiner += hecl::Format(" vec2 indUvs = (texture(envBumpMap, vtf.uvs[%d]).ra - vec2(0.5, 0.5)) *\n" - " vec2(fog.indScale, -fog.indScale);\n", envBumpMapUv); - combiner += hecl::Format(" colorOut = mix(colorOut, texture(envMap, indUvs + vtf.uvs[%d]), kColor1);\n", - envMapUv); - } - else if (info.m_hasColorTex) - { - combiner += " colorOut += texture(colorTex, vtf.uvs[2]) * lighting;\n"; - } - - break; - - case EFluidType::PoisonWater: - if (info.m_hasLightmap) - { - combiner += hecl::Format(" vec4 lightMapTexel = texture(lightMap, vtf.uvs[%d]);\n", lightmapUv); - // 0: Tex4TCG, Tex4, doubleLightmapBlend ? NULL : GX_COLOR1A1 - // ZERO, TEX, KONST, doubleLightmapBlend ? ZERO : RAS - // Output reg 2 - // KColor 2 - if (info.m_doubleLightmapBlend) - { - // 1: Tex4TCG2, Tex4, GX_COLOR1A1 - // C2, TEX, KONST, RAS - // Output reg 2 - // KColor 3 - // Tex * K2 + Lighting - combiner += " lighting += mix(lightMapTexel * kColor2, lightMapTexel, kColor3);\n"; - } - else - { - // mix(Tex * K2, Tex, K3) + Lighting - combiner += " lighting += lightMapTexel * kColor2;\n"; - } - } - - // Next: Tex0TCG, Tex0, GX_COLOR1A1 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // Next: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // Next: Tex2TCG, Tex2, GX_COLOR1A1 - // ZERO, TEX, hasTex4 ? C2 : RAS, PREV - // Output reg prev - - // (Tex0 * kColor0 + Lighting) * Tex1 + VertColor + Tex2 * Lighting - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (texture(patternTex1, vtf.uvs[0]) * kColor0 + lighting) *\n" - " texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = lighting * texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - { - if (info.m_hasEnvBumpMap) - { - // Make previous stage indirect, mtx0 - combiner += hecl::Format(" vec2 indUvs = (texture(envBumpMap, vtf.uvs[%d]).ra - vec2(0.5, 0.5)) *\n" - " vec2(fog.indScale, -fog.indScale);\n", envBumpMapUv); - combiner += " colorOut += texture(colorTex, indUvs + vtf.uvs[2]) * lighting;\n"; - } - else - { - combiner += " colorOut += texture(colorTex, vtf.uvs[2]) * lighting;\n"; - } - } - - break; - - case EFluidType::Lava: - // 0: Tex0TCG, Tex0, GX_COLOR0A0 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // 1: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // 2: Tex2TCG, Tex2, NULL - // ZERO, TEX, ONE, PREV - // Output reg prev - - // (Tex0 * kColor0 + VertColor) * Tex1 + VertColor + Tex2 - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (texture(patternTex1, vtf.uvs[0]) * kColor0 + vtf.color) *\n" - " texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = vtf.color * texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - combiner += " colorOut += texture(colorTex, vtf.uvs[2]);\n"; - - if (info.m_hasBumpMap) - { - // 3: bumpMapTCG, bumpMap, NULL - // ZERO, TEX, ONE, HALF - // Output reg 0, no clamp, no bias - - // 4: bumpMapTCG2, bumpMap, NULL - // ZERO, TEX, ONE, C0 - // Output reg 0, subtract, clamp, no bias - - combiner += " vec3 lightVec = lights[3].pos.xyz - vtf.mvPos.xyz;\n" - " float lx = dot(vtf.mvTangent, lightVec);\n" - " float ly = dot(vtf.mvBinorm, lightVec);\n"; - combiner += hecl::Format(" vec4 emboss1 = texture(bumpMap, vtf.uvs[%d]) + vec4(0.5);\n" - " vec4 emboss2 = texture(bumpMap, vtf.uvs[%d] + vec2(lx, ly));\n", - bumpMapUv, bumpMapUv); - - // 5: NULL, NULL, NULL - // ZERO, PREV, C0, ZERO - // Output reg prev, scale 2, clamp - - // colorOut * clamp(emboss1 + 0.5 - emboss2, 0.0, 1.0) * 2.0 - combiner += "colorOut *= clamp((emboss1 + vec4(0.5) - emboss2) * vec4(2.0), vec4(0.0), vec4(1.0));\n"; - } - - break; - - case EFluidType::ThickLava: - // 0: Tex0TCG, Tex0, GX_COLOR0A0 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // 1: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // 2: Tex2TCG, Tex2, NULL - // ZERO, TEX, ONE, PREV - // Output reg prev - - // (Tex0 * kColor0 + VertColor) * Tex1 + VertColor + Tex2 - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (texture(patternTex1, vtf.uvs[0]) * kColor0 + vtf.color) *\n" - " texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = vtf.color * texture(patternTex2, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - combiner += " colorOut += texture(colorTex, vtf.uvs[2]);\n"; - - if (info.m_hasBumpMap) - { - // 3: bumpMapTCG, bumpMap, NULL - // ZERO, TEX, PREV, ZERO - // Output reg prev, scale 2 - combiner += hecl::Format(" vec4 emboss1 = texture(bumpMap, vtf.uvs[%d]) + vec4(0.5);\n", bumpMapUv); - combiner += "colorOut *= emboss1 * vec4(2.0);\n"; - } - - break; - } - - combiner += " colorOut.a = kColor0.a;\n"; - - char *finalFSs; - asprintf(&finalFSs, FS, textures.c_str(), combiner.c_str()); - finalFS = finalFSs; - free(finalFSs); -} - -static std::string _BuildAdditionalTCGs(const SFluidPlaneShaderInfo& info) -{ - std::string additionalTCGs; - int nextTCG = 3; - int nextMtx = 4; - - if (info.m_hasBumpMap) - { - additionalTCGs += hecl::Format(" vtf.uvs[%d] = (texMtxs[0] * pos).xy;\n", nextTCG++); - } - if (info.m_hasEnvBumpMap) - { - additionalTCGs += hecl::Format(" vtf.uvs[%d] = (texMtxs[3] * vec4(normalIn.xyz, 1.0)).xy;\n", nextTCG++); - } - if (info.m_hasEnvMap) - { - additionalTCGs += hecl::Format(" vtf.uvs[%d] = (texMtxs[%d] * pos).xy;\n", nextTCG++, nextMtx++); - } - if (info.m_hasLightmap) - { - additionalTCGs += hecl::Format(" vtf.uvs[%d] = (texMtxs[%d] * pos).xy;\n", nextTCG, nextMtx); - } - - return additionalTCGs; -} - -static void _BuildShader(std::string& finalVS, std::string& finalFS, int& nextTex, const char* texNames[8], - const SFluidPlaneShaderInfo& info) -{ - std::string additionalTCGs = _BuildAdditionalTCGs(info); - - char *finalVSs; - asprintf(&finalVSs, VS, additionalTCGs.c_str()); - finalVS = finalVSs; - free(finalVSs); - - _BuildFragShader(finalFS, nextTex, texNames, info); -} - -static void _BuildTessellationShader(std::string& finalTessES, int& nextTex, const char* texNames[8], - const SFluidPlaneShaderInfo& info) -{ - std::string additionalTCGs = _BuildAdditionalTCGs(info); - - texNames[nextTex] = "RippleMap"; - - char *finalESs; - asprintf(&finalESs, TessES, nextTex, additionalTCGs.c_str()); - finalTessES = finalESs; - free(finalESs); - - ++nextTex; -} - -static void _BuildShader(std::string& finalVS, std::string& finalFS, int& nextTex, const char* texNames[3], - const SFluidPlaneDoorShaderInfo& info) -{ - std::string additionalTCGs; - std::string textures; - std::string combiner; - - if (info.m_hasPatternTex1) - { - texNames[nextTex] = "patternTex1"; - textures += hecl::Format("TBINDING%d uniform sampler2D patternTex1;\n", nextTex++); - } - if (info.m_hasPatternTex2) - { - texNames[nextTex] = "patternTex2"; - textures += hecl::Format("TBINDING%d uniform sampler2D patternTex2;\n", nextTex++); - } - if (info.m_hasColorTex) - { - texNames[nextTex] = "colorTex"; - textures += hecl::Format("TBINDING%d uniform sampler2D colorTex;\n", nextTex++); - } - - // Tex0 * kColor0 * Tex1 + Tex2 - if (info.m_hasPatternTex1 && info.m_hasPatternTex2) - { - combiner += " colorOut = texture(patternTex1, vtf.uvs[0]) * kColor0 *\n" - " texture(patternTex2, vtf.uvs[1]);\n"; - } - else - { - combiner += " colorOut = vec4(0.0);\n"; - } - - if (info.m_hasColorTex) - { - combiner += " colorOut += texture(colorTex, vtf.uvs[2]);\n"; - } - - combiner += " colorOut.a = kColor0.a;\n"; - - char *finalVSs, *finalFSs; - asprintf(&finalVSs, VS, additionalTCGs.c_str()); - asprintf(&finalFSs, FSDoor, textures.c_str(), combiner.c_str()); - - finalVS = finalVSs; - finalFS = finalFSs; - - free(finalVSs); - free(finalFSs); -} - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::GLDataFactory::Context& ctx, const SFluidPlaneShaderInfo& info) -{ - int nextTex = 0; - const char* texNames[8] = {}; - std::string finalVS, finalFS; - _BuildShader(finalVS, finalFS, nextTex, texNames, info); - const char* uniNames[] = {"FluidPlaneUniform", "FluidPlaneUniform", "LightingUniform"}; - auto regular = ctx.newShaderPipeline(finalVS.c_str(), finalFS.c_str(), - size_t(nextTex), texNames, 3, uniNames, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - boo::ObjToken tessellation; - if (info.m_tessellation) - { - std::string finalTessES; - _BuildTessellationShader(finalTessES, nextTex, texNames, info); - tessellation = ctx.newTessellationShaderPipeline( - TessVS, finalFS.c_str(), TessCS, finalTessES.c_str(), - size_t(nextTex), texNames, 3, uniNames, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - 1, boo::ZTest::LEqual, false, true, false, boo::CullMode::None); - } - return {regular, tessellation}; -} - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::GLDataFactory::Context& ctx, const SFluidPlaneDoorShaderInfo& info) -{ - int nextTex = 0; - const char* texNames[3] = {}; - std::string finalVS, finalFS; - _BuildShader(finalVS, finalFS, nextTex, texNames, info); - const char* uniNames[] = {"FluidPlaneUniform", "FluidPlaneUniform", "LightingUniform"}; - return {ctx.newShaderPipeline(finalVS.c_str(), finalFS.c_str(), size_t(nextTex), texNames, 3, uniNames, - boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None), {}}; -} - -template <> -void CFluidPlaneShader::_Shutdown() {} - -#if BOO_HAS_VULKAN -static boo::ObjToken s_vtxFmt; -static boo::ObjToken s_vtxFmtTess; - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::VulkanDataFactory::Context& ctx, - const SFluidPlaneShaderInfo& info) -{ - if (!s_vtxFmt) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 0}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 1}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 2}, - {nullptr, nullptr, boo::VertexSemantic::Color} - }; - s_vtxFmt = ctx.newVertexFormat(5, elements); - } - - int nextTex = 0; - const char* texNames[8] = {}; - std::string finalVS, finalFS; - _BuildShader(finalVS, finalFS, nextTex, texNames, info); - auto regular = ctx.newShaderPipeline(finalVS.c_str(), finalFS.c_str(), s_vtxFmt, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - boo::ObjToken tessellation; - if (info.m_tessellation) - { - if (!s_vtxFmtTess) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::UV4, 0}, - {nullptr, nullptr, boo::VertexSemantic::UV4, 1} - }; - s_vtxFmtTess = ctx.newVertexFormat(3, elements); - } - - std::string finalTessES; - _BuildTessellationShader(finalTessES, nextTex, texNames, info); - tessellation = ctx.newTessellationShaderPipeline( - TessVS, finalFS.c_str(), TessCS, finalTessES.c_str(), s_vtxFmtTess, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - 1, boo::ZTest::LEqual, false, true, false, boo::CullMode::None); - } - return {regular, tessellation}; -} - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::VulkanDataFactory::Context& ctx, const SFluidPlaneDoorShaderInfo& info) -{ - if (!s_vtxFmt) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 0}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 1}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 2}, - {nullptr, nullptr, boo::VertexSemantic::Color} - }; - s_vtxFmt = ctx.newVertexFormat(5, elements); - } - - int nextTex = 0; - const char* texNames[3] = {}; - std::string finalVS, finalFS; - _BuildShader(finalVS, finalFS, nextTex, texNames, info); - auto regular = ctx.newShaderPipeline(finalVS.c_str(), finalFS.c_str(), s_vtxFmt, - boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - return {regular, {}}; -} - -template <> -void CFluidPlaneShader::_Shutdown() -{ - s_vtxFmt.reset(); - s_vtxFmtTess.reset(); -} - -#endif - -CFluidPlaneShader::BindingPair -CFluidPlaneShader::BuildBinding(boo::GLDataFactory::Context& ctx, const ShaderPair& pipeline) -{ - boo::VertexElementDescriptor elements[] = - { - {m_vbo.get(), nullptr, boo::VertexSemantic::Position4}, - {m_vbo.get(), nullptr, boo::VertexSemantic::Normal4, 0}, - {m_vbo.get(), nullptr, boo::VertexSemantic::Normal4, 1}, - {m_vbo.get(), nullptr, boo::VertexSemantic::Normal4, 2}, - {m_vbo.get(), nullptr, boo::VertexSemantic::Color} - }; - boo::ObjToken vtxFmt = ctx.newVertexFormat(5, elements); - boo::ObjToken ubufs[] = { m_uniBuf.get(), m_uniBuf.get(), m_uniBuf.get() }; - boo::PipelineStage ubufStages[] = { boo::PipelineStage::Vertex, boo::PipelineStage::Vertex, - boo::PipelineStage::Fragment }; - size_t ubufOffs[] = {0, 0, 1280}; - size_t ubufSizes[] = {1280, 1280, sizeof(CModelShaders::LightingUniform)}; - size_t texCount = 0; - boo::ObjToken texs[8]; - if (m_patternTex1) - texs[texCount++] = m_patternTex1->GetBooTexture(); - if (m_patternTex2) - texs[texCount++] = m_patternTex2->GetBooTexture(); - if (m_colorTex) - texs[texCount++] = m_colorTex->GetBooTexture(); - if (m_bumpMap) - texs[texCount++] = m_bumpMap->GetBooTexture(); - if (m_envMap) - texs[texCount++] = m_envMap->GetBooTexture(); - if (m_envBumpMap) - texs[texCount++] = m_envBumpMap->GetBooTexture(); - if (m_lightmap) - texs[texCount++] = m_lightmap->GetBooTexture(); - auto regular = ctx.newShaderDataBinding(pipeline.m_regular, vtxFmt, m_vbo.get(), nullptr, nullptr, 3, - ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - boo::ObjToken tessellation; - if (pipeline.m_tessellation) - { - boo::VertexElementDescriptor tessElements[] = - { - {m_pvbo.get(), nullptr, boo::VertexSemantic::Position4}, - {m_pvbo.get(), nullptr, boo::VertexSemantic::UV4, 0}, - {m_pvbo.get(), nullptr, boo::VertexSemantic::UV4, 1} - }; - boo::ObjToken vtxFmtTess = ctx.newVertexFormat(3, tessElements); - - texs[texCount++] = m_rippleMap.get(); - tessellation = ctx.newShaderDataBinding(pipeline.m_tessellation, vtxFmtTess, m_pvbo.get(), nullptr, nullptr, 3, - ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - } - return {regular, tessellation}; -} - -#if BOO_HAS_VULKAN -CFluidPlaneShader::BindingPair -CFluidPlaneShader::BuildBinding(boo::VulkanDataFactory::Context& ctx, const ShaderPair& pipeline) -{ - boo::ObjToken ubufs[] = { m_uniBuf.get(), m_uniBuf.get(), m_uniBuf.get() }; - boo::PipelineStage ubufStages[] = { boo::PipelineStage::Vertex, boo::PipelineStage::Vertex, - boo::PipelineStage::Fragment }; - size_t ubufOffs[] = {0, 0, 1280}; - size_t ubufSizes[] = {1280, 1280, sizeof(CModelShaders::LightingUniform)}; - size_t texCount = 0; - boo::ObjToken texs[8] = {}; - if (m_patternTex1) - texs[texCount++] = m_patternTex1->GetBooTexture(); - if (m_patternTex2) - texs[texCount++] = m_patternTex2->GetBooTexture(); - if (m_colorTex) - texs[texCount++] = m_colorTex->GetBooTexture(); - if (m_bumpMap) - texs[texCount++] = m_bumpMap->GetBooTexture(); - if (m_envMap) - texs[texCount++] = m_envMap->GetBooTexture(); - if (m_envBumpMap) - texs[texCount++] = m_envBumpMap->GetBooTexture(); - if (m_lightmap) - texs[texCount++] = m_lightmap->GetBooTexture(); - auto regular = ctx.newShaderDataBinding(pipeline.m_regular, s_vtxFmt, m_vbo.get(), nullptr, nullptr, - 3, ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - boo::ObjToken tessellation; - if (pipeline.m_tessellation) - { - texs[texCount++] = m_rippleMap.get(); - tessellation = ctx.newShaderDataBinding(pipeline.m_tessellation, s_vtxFmtTess, m_pvbo.get(), nullptr, nullptr, - 3, ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - } - return {regular, tessellation}; -} -#endif - -} diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShaderHLSL.cpp b/Runtime/Graphics/Shaders/CFluidPlaneShaderHLSL.cpp deleted file mode 100644 index 45e417346..000000000 --- a/Runtime/Graphics/Shaders/CFluidPlaneShaderHLSL.cpp +++ /dev/null @@ -1,791 +0,0 @@ -#include "CFluidPlaneShader.hpp" - -namespace urde -{ - -static boo::ObjToken s_vtxFmt; -static boo::ObjToken s_vtxFmtTess; - -static const char* VS = -"struct VertData\n" -"{\n" -" float4 posIn : POSITION;\n" -" float4 normalIn : NORMAL0;\n" -" float4 binormalIn : NORMAL1;\n" -" float4 tangentIn : NORMAL2;\n" -" float4 colorIn : COLOR;\n" -"};\n" -"\n" -"cbuffer FluidPlaneUniform : register(b0)\n" -"{\n" -" float4x4 mv;\n" -" float4x4 mvNorm;\n" -" float4x4 proj;\n" -" float4x4 texMtxs[6];\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" float4 pos : SV_Position;\n" -" float4 mvPos : POSITION;\n" -" float4 mvNorm : NORMAL;\n" -" float4 mvBinorm : BINORMAL;\n" -" float4 mvTangent : TANGENT;\n" -" float4 color : COLOR;\n" -" float2 uvs[7] : UV;\n" -"};\n" -"\n" -"VertToFrag main(in VertData v)\n" -"{\n" -" VertToFrag vtf;\n" -" float4 pos = float4(v.posIn.xyz, 1.0);\n" -" float4 normalIn = v.normalIn;\n" -" vtf.mvPos = mul(mv, pos);\n" -" vtf.pos = mul(proj, vtf.mvPos);\n" -" vtf.mvNorm = mul(mvNorm, v.normalIn);\n" -" vtf.mvBinorm = mul(mvNorm, v.binormalIn);\n" -" vtf.mvTangent = mul(mvNorm, v.tangentIn);\n" -" vtf.color = float4(v.colorIn.xyz, 1.0);\n" -" vtf.uvs[0] = mul(texMtxs[0], pos).xy;\n" -" vtf.uvs[1] = mul(texMtxs[1], pos).xy;\n" -" vtf.uvs[2] = mul(texMtxs[2], pos).xy;\n" -"%s" // Additional TCGs here -" return vtf;\n" -"}\n"; - -static const char* TessVS = -"struct VertData\n" -"{\n" -" float4 posIn : POSITION;\n" -" float4 outerLevelsIn : UV0;\n" -" float2 innerLevelsIn : UV1;\n" -"};\n" -"\n" -"struct VertToControl\n" -"{\n" -" float4 minMaxPos : POSITION;\n" -" float4 outerLevels : OUTERLEVELS;\n" -" float2 innerLevels : INNERLEVELS;\n" -"};\n" -"\n" -"VertToControl main(in VertData v)\n" -"{\n" -" VertToControl vtc;\n" -" vtc.minMaxPos = v.posIn;\n" -" vtc.outerLevels = v.outerLevelsIn;\n" -" vtc.innerLevels = v.innerLevelsIn;\n" -" return vtc;\n" -"}\n"; - -static const char* TessCS = -"struct VertToControl\n" -"{\n" -" float4 minMaxPos : POSITION;\n" -" float4 outerLevels : OUTERLEVELS;\n" -" float2 innerLevels : INNERLEVELS;\n" -"};\n" -"\n" -"struct ControlToEvaluation\n" -"{\n" -" float4 minMaxPos : POSITION;\n" -" float outerLevels[4] : SV_TessFactor;\n" -" float innerLevels[2] : SV_InsideTessFactor;\n" -"};\n" -"\n" -"struct ControlPoint\n" -"{};\n" -"\n" -"ControlToEvaluation patchmain(InputPatch vtc, uint id : SV_PrimitiveID)\n" -"{\n" -" ControlToEvaluation cte;\n" -" cte.minMaxPos = vtc[id].minMaxPos;\n" -" for (int i=0 ; i<4 ; ++i)\n" -" cte.outerLevels[i] = vtc[id].outerLevels[i];\n" -" for (int i=0 ; i<2 ; ++i)\n" -" cte.innerLevels[i] = vtc[id].innerLevels[i];\n" -" return cte;\n" -"}\n" -"\n" -"[domain(\"quad\")]\n" -"[partitioning(\"integer\")]\n" -"[outputtopology(\"triangle_cw\")]\n" -"[outputcontrolpoints(1)]\n" -"[patchconstantfunc(\"patchmain\")]\n" -"ControlPoint main(InputPatch vtc, uint i : SV_OutputControlPointID, uint id : SV_PrimitiveID)\n" -"{\n" -" ControlPoint pt;\n" -" return pt;\n" -"}\n"; - -static const char* TessES = -"struct Ripple\n" -"{\n" -" float4 center; // time, distFalloff\n" -" float4 params; // amplitude, lookupPhase, lookupTime\n" -"};\n" -"\n" -"cbuffer FluidPlaneUniform : register(b0)\n" -"{\n" -" float4x4 mv;\n" -" float4x4 mvNorm;\n" -" float4x4 proj;\n" -" float4x4 texMtxs[6];\n" -" Ripple ripples[20];\n" -" float4 colorMul;\n" -" float rippleNormResolution;\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" float4 pos : SV_Position;\n" -" float4 mvPos : POSITION;\n" -" float4 mvNorm : NORMAL;\n" -" float4 mvBinorm : BINORMAL;\n" -" float4 mvTangent : TANGENT;\n" -" float4 color : COLOR;\n" -" float2 uvs[7] : UV;\n" -"};\n" -"\n" -"struct ControlToEvaluation\n" -"{\n" -" float4 minMaxPos : POSITION;\n" -" float outerLevels[4] : SV_TessFactor;\n" -" float innerLevels[2] : SV_InsideTessFactor;\n" -"};\n" -"\n" -"struct ControlPoint\n" -"{};\n" -"\n" -"Texture2D RippleMap : register(t%d);\n" -"SamplerState samp : register(s2);\n" -"\n" -"static const float PI_X2 = 6.283185307179586;\n" -"\n" -"static void ApplyRipple(in Ripple ripple, in float2 pos, inout float height)\n" -"{\n" -" float dist = length(ripple.center.xy - pos);\n" -" float rippleV = RippleMap.SampleLevel(samp, float2(dist * ripple.center.w, ripple.center.z), 0.0).r;\n" -" height += rippleV * ripple.params.x * sin((dist * ripple.params.y + ripple.params.z) * PI_X2);\n" -"}\n" -"\n" -"[domain(\"quad\")]\n" -"VertToFrag main(in ControlToEvaluation cte, in float2 TessCoord : SV_DomainLocation,\n" -" const OutputPatch bezpatch)\n" -"{\n" -" float2 posIn = float2(lerp(cte.minMaxPos.x, cte.minMaxPos.z, TessCoord.x),\n" -" lerp(cte.minMaxPos.y, cte.minMaxPos.w, TessCoord.y));\n" -" float height = 0.0;\n" -" float upHeight = 0.0;\n" -" float downHeight = 0.0;\n" -" float rightHeight = 0.0;\n" -" float leftHeight = 0.0;\n" -" for (int i=0 ; i<20 ; ++i)\n" -" {\n" -" ApplyRipple(ripples[i], posIn, height);\n" -" ApplyRipple(ripples[i], posIn + float2(0.0, rippleNormResolution), upHeight);\n" -" ApplyRipple(ripples[i], posIn - float2(0.0, rippleNormResolution), downHeight);\n" -" ApplyRipple(ripples[i], posIn + float2(rippleNormResolution, 0.0), rightHeight);\n" -" ApplyRipple(ripples[i], posIn - float2(rippleNormResolution, 0.0), leftHeight);\n" -" }\n" -" float4 normalIn = float4(normalize(float3((leftHeight - rightHeight),\n" -" (downHeight - upHeight),\n" -" rippleNormResolution)), 1.0);\n" -" float4 binormalIn = float4(normalIn.x, normalIn.z, -normalIn.y, 1.0);\n" -" float4 tangentIn = float4(normalIn.z, normalIn.y, -normalIn.x, 1.0);\n" -" float4 pos = float4(posIn, height, 1.0);\n" -" VertToFrag vtf;\n" -" vtf.mvPos = mul(mv, pos);\n" -" vtf.pos = mul(proj, vtf.mvPos);\n" -" vtf.mvNorm = mul(mvNorm, normalIn);\n" -" vtf.mvBinorm = mul(mvNorm, binormalIn);\n" -" vtf.mvTangent = mul(mvNorm, tangentIn);\n" -" vtf.color = max(height, 0.0) * colorMul;\n" -" vtf.color.a = 1.0;\n" -" vtf.uvs[0] = mul(texMtxs[0], pos).xy;\n" -" vtf.uvs[1] = mul(texMtxs[1], pos).xy;\n" -" vtf.uvs[2] = mul(texMtxs[2], pos).xy;\n" -"%s\n" // Additional TCGs here -" return vtf;\n" -"}\n"; - -static const char* FS = -"struct Light\n" -"{\n" -" float4 pos;\n" -" float4 dir;\n" -" float4 color;\n" -" float4 linAtt;\n" -" float4 angAtt;\n" -"};\n" -"struct Fog\n" // Reappropriated for indirect texture scaling -"{\n" -" int mode;\n" -" float4 color;\n" -" float indScale;\n" -" float start;\n" -"};\n" -"\n" -"cbuffer LightingUniform : register(b2)\n" -"{\n" -" Light lights[" _XSTR(URDE_MAX_LIGHTS) "];\n" -" float4 ambient;\n" -" float4 kColor0;\n" -" float4 kColor1;\n" -" float4 kColor2;\n" -" float4 kColor3;\n" -" Fog fog;\n" -"};\n" -"\n" -"static float4 LightingFunc(float3 mvPosIn, float3 mvNormIn)\n" -"{\n" -" float4 ret = ambient;\n" -" \n" -" for (int i=0 ; i<" _XSTR(URDE_MAX_LIGHTS) " ; ++i)\n" -" {\n" -" float3 delta = mvPosIn - lights[i].pos.xyz;\n" -" float dist = length(delta);\n" -" float angDot = clamp(dot(normalize(delta), lights[i].dir.xyz), 0.0, 1.0);\n" -" float att = 1.0 / (lights[i].linAtt[2] * dist * dist +\n" -" lights[i].linAtt[1] * dist +\n" -" lights[i].linAtt[0]);\n" -" float angAtt = lights[i].angAtt[2] * angDot * angDot +\n" -" lights[i].angAtt[1] * angDot +\n" -" lights[i].angAtt[0];\n" -" ret += lights[i].color * clamp(angAtt, 0.0, 1.0) * att * clamp(dot(normalize(-delta), mvNormIn), 0.0, 1.0);\n" -" }\n" -" \n" -" return ret;\n" -"}\n" -"\n" -"struct VertToFrag\n" -"{\n" -" float4 pos : SV_Position;\n" -" float4 mvPos : POSITION;\n" -" float4 mvNorm : NORMAL;\n" -" float4 mvBinorm : BINORMAL;\n" -" float4 mvTangent : TANGENT;\n" -" float4 color : COLOR;\n" -" float2 uvs[7] : UV;\n" -"};\n" -"\n" -"SamplerState samp : register(s0);\n" -"%s" // Textures here -"float4 main(in VertToFrag vtf) : SV_Target0\n" -"{\n" -" float4 lighting = LightingFunc(vtf.mvPos.xyz, normalize(vtf.mvNorm.xyz));\n" -" float4 colorOut;\n" -"%s" // Combiner expression here -" return colorOut;\n" -"}\n"; - -static const char* FSDoor = -"struct Light\n" -"{\n" -" float4 pos;\n" -" float4 dir;\n" -" float4 color;\n" -" float4 linAtt;\n" -" float4 angAtt;\n" -"};\n" -"struct Fog\n" // Reappropriated for indirect texture scaling -"{\n" -" int mode;\n" -" float4 color;\n" -" float indScale;\n" -" float start;\n" -"};\n" -"\n" -"cbuffer LightingUniform : register(b2)\n" -"{\n" -" Light lights[" _XSTR(URDE_MAX_LIGHTS) "];\n" -" float4 ambient;\n" -" float4 kColor0;\n" -" float4 kColor1;\n" -" float4 kColor2;\n" -" float4 kColor3;\n" -" Fog fog;\n" -"};\n" -"struct VertToFrag\n" -"{\n" -" float4 pos : SV_Position;\n" -" float4 mvPos : POSITION;\n" -" float4 mvNorm : NORMAL;\n" -" float4 mvBinorm : BINORMAL;\n" -" float4 mvTangent : TANGENT;\n" -" float4 color : COLOR;\n" -" float2 uvs[7] : UV;\n" -"};\n" -"\n" -"SamplerState samp : register(s0);\n" -"%s" // Textures here -"float4 main(in VertToFrag vtf) : SV_Target0\n" -"{\n" -" float4 colorOut;\n" -"%s" // Combiner expression here -" return colorOut;\n" -"}\n"; - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::D3DDataFactory::Context& ctx, const SFluidPlaneShaderInfo& info) -{ - if (!s_vtxFmt) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 0}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 1}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 2}, - {nullptr, nullptr, boo::VertexSemantic::Color} - }; - s_vtxFmt = ctx.newVertexFormat(5, elements); - } - - std::string additionalTCGs; - std::string textures; - std::string combiner; - int nextTex = 0; - int nextTCG = 3; - int nextMtx = 4; - int bumpMapUv, envBumpMapUv, envMapUv, lightmapUv; - - if (info.m_hasPatternTex1) - textures += hecl::Format("Texture2D patternTex1 : register(t%d);\n", nextTex++); - if (info.m_hasPatternTex2) - textures += hecl::Format("Texture2D patternTex2 : register(t%d);\n", nextTex++); - if (info.m_hasColorTex) - textures += hecl::Format("Texture2D colorTex : register(t%d);\n", nextTex++); - if (info.m_hasBumpMap) - textures += hecl::Format("Texture2D bumpMap : register(t%d);\n", nextTex++); - if (info.m_hasEnvMap) - textures += hecl::Format("Texture2D envMap : register(t%d);\n", nextTex++); - if (info.m_hasEnvBumpMap) - textures += hecl::Format("Texture2D envBumpMap : register(t%d);\n", nextTex++); - if (info.m_hasLightmap) - textures += hecl::Format("Texture2D lightMap : register(t%d);\n", nextTex++); - - if (info.m_hasBumpMap) - { - bumpMapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uvs[%d] = mul(texMtxs[0], pos).xy;\n", nextTCG++); - } - if (info.m_hasEnvBumpMap) - { - envBumpMapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uvs[%d] = mul(texMtxs[3], float4(normalIn.xyz, 1.0)).xy;\n", nextTCG++); - } - if (info.m_hasEnvMap) - { - envMapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uvs[%d] = mul(texMtxs[%d], pos).xy;\n", nextTCG++, nextMtx++); - } - if (info.m_hasLightmap) - { - lightmapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uvs[%d] = mul(texMtxs[%d], pos).xy;\n", nextTCG++, nextMtx++); - } - - switch (info.m_type) - { - case EFluidType::NormalWater: - case EFluidType::PhazonFluid: - case EFluidType::Four: - if (info.m_hasLightmap) - { - combiner += hecl::Format(" float4 lightMapTexel = lightMap.Sample(samp, vtf.uvs[%d]);\n", lightmapUv); - // 0: Tex4TCG, Tex4, doubleLightmapBlend ? NULL : GX_COLOR1A1 - // ZERO, TEX, KONST, doubleLightmapBlend ? ZERO : RAS - // Output reg 2 - // KColor 2 - if (info.m_doubleLightmapBlend) - { - // 1: Tex4TCG2, Tex4, GX_COLOR1A1 - // C2, TEX, KONST, RAS - // Output reg 2 - // KColor 3 - // Tex * K2 + Lighting - combiner += " lighting += lerp(lightMapTexel * kColor2, lightMapTexel, kColor3);\n"; - } - else - { - // mix(Tex * K2, Tex, K3) + Lighting - combiner += " lighting += lightMapTexel * kColor2;\n"; - } - } - - // Next: Tex0TCG, Tex0, GX_COLOR1A1 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // Next: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // Next: Tex2TCG, Tex2, GX_COLOR1A1 - // ZERO, TEX, hasTex4 ? C2 : RAS, PREV - // Output reg prev - - // (Tex0 * kColor0 + Lighting) * Tex1 + VertColor + Tex2 * Lighting - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.Sample(samp, vtf.uvs[0]) * kColor0 + lighting) *\n" - " patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = lighting * patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - - if (info.m_hasColorTex && !info.m_hasEnvMap && info.m_hasEnvBumpMap) - { - // Make previous stage indirect, mtx0 - combiner += hecl::Format(" float2 indUvs = (envBumpMap.Sample(samp, vtf.uvs[%d]).ra - float2(0.5, 0.5)) *\n" - " float2(fog.indScale, -fog.indScale);\n", envBumpMapUv); - combiner += " colorOut += colorTex.Sample(samp, indUvs + vtf.uvs[2]) * lighting;\n"; - } - else if (info.m_hasEnvMap) - { - // Next: envTCG, envTex, NULL - // PREV, TEX, KONST, ZERO - // Output reg prev - // KColor 1 - - // Make previous stage indirect, mtx0 - if (info.m_hasColorTex) - combiner += " colorOut += colorTex.Sample(samp, vtf.uvs[2]) * lighting;\n"; - combiner += hecl::Format(" float2 indUvs = (envBumpMap.Sample(samp, vtf.uvs[%d]).ra - float2(0.5, 0.5)) *\n" - " float2(fog.indScale, -fog.indScale);\n", envBumpMapUv); - combiner += hecl::Format(" colorOut = lerp(colorOut, envMap.Sample(samp, indUvs + vtf.uvs[%d]), kColor1);\n", - envMapUv); - } - else if (info.m_hasColorTex) - { - combiner += " colorOut += colorTex.Sample(samp, vtf.uvs[2]) * lighting;\n"; - } - - break; - - case EFluidType::PoisonWater: - if (info.m_hasLightmap) - { - combiner += hecl::Format(" float4 lightMapTexel = lightMap.Sample(samp, vtf.uvs[%d]);\n", lightmapUv); - // 0: Tex4TCG, Tex4, doubleLightmapBlend ? NULL : GX_COLOR1A1 - // ZERO, TEX, KONST, doubleLightmapBlend ? ZERO : RAS - // Output reg 2 - // KColor 2 - if (info.m_doubleLightmapBlend) - { - // 1: Tex4TCG2, Tex4, GX_COLOR1A1 - // C2, TEX, KONST, RAS - // Output reg 2 - // KColor 3 - // Tex * K2 + Lighting - combiner += " lighting += lerp(lightMapTexel * kColor2, lightMapTexel, kColor3);\n"; - } - else - { - // mix(Tex * K2, Tex, K3) + Lighting - combiner += " lighting += lightMapTexel * kColor2;\n"; - } - } - - // Next: Tex0TCG, Tex0, GX_COLOR1A1 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // Next: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // Next: Tex2TCG, Tex2, GX_COLOR1A1 - // ZERO, TEX, hasTex4 ? C2 : RAS, PREV - // Output reg prev - - // (Tex0 * kColor0 + Lighting) * Tex1 + VertColor + Tex2 * Lighting - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.Sample(samp, vtf.uvs[0]) * kColor0 + lighting) *\n" - " patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = lighting * patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - { - if (info.m_hasEnvBumpMap) - { - // Make previous stage indirect, mtx0 - combiner += hecl::Format(" float2 indUvs = (envBumpMap.Sample(samp, vtf.uvs[%d]).ra - float2(0.5, 0.5)) *\n" - " float2(fog.indScale, -fog.indScale);\n", envBumpMapUv); - combiner += " colorOut += colorTex.Sample(samp, indUvs + vtf.uvs[2]) * lighting;\n"; - } - else - { - combiner += " colorOut += colorTex.Sample(samp, vtf.uvs[2]) * lighting;\n"; - } - } - - break; - - case EFluidType::Lava: - // 0: Tex0TCG, Tex0, GX_COLOR0A0 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // 1: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // 2: Tex2TCG, Tex2, NULL - // ZERO, TEX, ONE, PREV - // Output reg prev - - // (Tex0 * kColor0 + VertColor) * Tex1 + VertColor + Tex2 - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.Sample(samp, vtf.uvs[0]) * kColor0 + vtf.color) *\n" - " patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = vtf.color * patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - combiner += " colorOut += colorTex.Sample(samp, vtf.uvs[2]);\n"; - - if (info.m_hasBumpMap) - { - // 3: bumpMapTCG, bumpMap, NULL - // ZERO, TEX, ONE, HALF - // Output reg 0, no clamp, no bias - - // 4: bumpMapTCG2, bumpMap, NULL - // ZERO, TEX, ONE, C0 - // Output reg 0, subtract, clamp, no bias - - combiner += " float3 lightVec = lights[3].pos.xyz - vtf.mvPos.xyz;\n" - " float lx = dot(vtf.mvTangent.xyz, lightVec);\n" - " float ly = dot(vtf.mvBinorm.xyz, lightVec);\n"; - combiner += hecl::Format(" float4 emboss1 = bumpMap.Sample(samp, vtf.uvs[%d]) + float4(0.5);\n" - " float4 emboss2 = bumpMap.Sample(samp, vtf.uvs[%d] + float2(lx, ly));\n", - bumpMapUv, bumpMapUv); - - // 5: NULL, NULL, NULL - // ZERO, PREV, C0, ZERO - // Output reg prev, scale 2, clamp - - // colorOut * clamp(emboss1 + 0.5 - emboss2, 0.0, 1.0) * 2.0 - combiner += "colorOut *= clamp((emboss1 + float4(0.5) - emboss2) * float4(2.0), float4(0.0), float4(1.0));\n"; - } - - break; - - case EFluidType::ThickLava: - // 0: Tex0TCG, Tex0, GX_COLOR0A0 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // 1: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // 2: Tex2TCG, Tex2, NULL - // ZERO, TEX, ONE, PREV - // Output reg prev - - // (Tex0 * kColor0 + VertColor) * Tex1 + VertColor + Tex2 - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.Sample(samp, vtf.uvs[0]) * kColor0 + vtf.color) *\n" - " patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - else - combiner += " colorOut = vtf.color * patternTex2.Sample(samp, vtf.uvs[1]) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - combiner += " colorOut += colorTex.Sample(samp, vtf.uvs[2]);\n"; - - if (info.m_hasBumpMap) - { - // 3: bumpMapTCG, bumpMap, NULL - // ZERO, TEX, PREV, ZERO - // Output reg prev, scale 2 - combiner += hecl::Format(" float4 emboss1 = bumpMap.Sample(samp, vtf.uvs[%d]) + float4(0.5);\n", bumpMapUv); - combiner += "colorOut *= emboss1 * float4(2.0);\n"; - } - - break; - } - - combiner += " colorOut.a = kColor0.a;\n"; - - char *finalVS, *finalFS; - asprintf(&finalVS, VS, additionalTCGs.c_str()); - asprintf(&finalFS, FS, textures.c_str(), combiner.c_str()); - - auto regular = ctx.newShaderPipeline(finalVS, finalFS, nullptr, nullptr, nullptr, s_vtxFmt, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - - boo::ObjToken tessellation; - if (info.m_tessellation) - { - if (!s_vtxFmtTess) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::UV4, 0}, - {nullptr, nullptr, boo::VertexSemantic::UV4, 1} - }; - s_vtxFmtTess = ctx.newVertexFormat(3, elements); - } - - char *finalESs; - asprintf(&finalESs, TessES, nextTex, additionalTCGs.c_str()); - - tessellation = ctx.newTessellationShaderPipeline( - TessVS, finalFS, TessCS, finalESs, - nullptr, nullptr, nullptr, nullptr, nullptr, s_vtxFmtTess, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - 1, boo::ZTest::LEqual, false, true, false, boo::CullMode::None); - - free(finalESs); - } - - free(finalVS); - free(finalFS); - - return {regular, tessellation}; -} - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::D3DDataFactory::Context& ctx, const SFluidPlaneDoorShaderInfo& info) -{ - if (!s_vtxFmt) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 0}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 1}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 2}, - {nullptr, nullptr, boo::VertexSemantic::Color} - }; - s_vtxFmt = ctx.newVertexFormat(5, elements); - } - - std::string additionalTCGs; - std::string textures; - std::string combiner; - int nextTex = 0; - - if (info.m_hasPatternTex1) - textures += hecl::Format("Texture2D patternTex1 : register(t%d);\n", nextTex++); - if (info.m_hasPatternTex2) - textures += hecl::Format("Texture2D patternTex2 : register(t%d);\n", nextTex++); - if (info.m_hasColorTex) - textures += hecl::Format("Texture2D colorTex : register(t%d);\n", nextTex++); - - // Tex0 * kColor0 * Tex1 + Tex2 - if (info.m_hasPatternTex1 && info.m_hasPatternTex2) - { - combiner += " colorOut = patternTex1.Sample(samp, vtf.uvs[0]) * kColor0 *\n" - " patternTex2.Sample(samp, vtf.uvs[1]);\n"; - } - else - { - combiner += " colorOut = float4(0.0);\n"; - } - - if (info.m_hasColorTex) - { - combiner += " colorOut += colorTex.Sample(samp, vtf.uvs[2]);\n"; - } - - combiner += " colorOut.a = kColor0.a;\n"; - - char *finalVS, *finalFS; - asprintf(&finalVS, VS, additionalTCGs.c_str()); - asprintf(&finalFS, FSDoor, textures.c_str(), combiner.c_str()); - - auto ret = ctx.newShaderPipeline(finalVS, finalFS, nullptr, nullptr, nullptr, s_vtxFmt, - boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - - free(finalVS); - free(finalFS); - - return {ret, {}}; -} - -template <> -void CFluidPlaneShader::_Shutdown() -{ - s_vtxFmt.reset(); - s_vtxFmtTess.reset(); -} - -CFluidPlaneShader::BindingPair -CFluidPlaneShader::BuildBinding(boo::D3DDataFactory::Context& ctx, const ShaderPair& pipeline) -{ - boo::ObjToken ubufs[] = { m_uniBuf.get(), m_uniBuf.get(), m_uniBuf.get() }; - boo::PipelineStage ubufStages[] = { boo::PipelineStage::Vertex, boo::PipelineStage::Vertex, - boo::PipelineStage::Fragment }; - size_t ubufOffs[] = {0, 0, 1280}; - size_t ubufSizes[] = {1280, 1280, sizeof(CModelShaders::LightingUniform)}; - size_t texCount = 0; - boo::ObjToken texs[8] = {}; - if (m_patternTex1) - texs[texCount++] = m_patternTex1->GetBooTexture(); - if (m_patternTex2) - texs[texCount++] = m_patternTex2->GetBooTexture(); - if (m_colorTex) - texs[texCount++] = m_colorTex->GetBooTexture(); - if (m_bumpMap) - texs[texCount++] = m_bumpMap->GetBooTexture(); - if (m_envMap) - texs[texCount++] = m_envMap->GetBooTexture(); - if (m_envBumpMap) - texs[texCount++] = m_envBumpMap->GetBooTexture(); - if (m_lightmap) - texs[texCount++] = m_lightmap->GetBooTexture(); - auto regular = ctx.newShaderDataBinding(pipeline.m_regular, s_vtxFmt, m_vbo.get(), nullptr, nullptr, 3, - ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - boo::ObjToken tessellation; - if (pipeline.m_tessellation) - { - texs[texCount++] = m_rippleMap.get(); - tessellation = ctx.newShaderDataBinding(pipeline.m_tessellation, s_vtxFmtTess, m_pvbo.get(), nullptr, nullptr, - 3, ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - } - return {regular, tessellation}; -} - -} diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShaderMetal.cpp b/Runtime/Graphics/Shaders/CFluidPlaneShaderMetal.cpp deleted file mode 100644 index 2d28b9284..000000000 --- a/Runtime/Graphics/Shaders/CFluidPlaneShaderMetal.cpp +++ /dev/null @@ -1,799 +0,0 @@ -#include "CFluidPlaneShader.hpp" - -namespace urde -{ - -static boo::ObjToken s_vtxFmt; -static boo::ObjToken s_tessVtxFmt; - -static const char* VS = -"#include \n" -"using namespace metal;\n" -"struct VertData\n" -"{\n" -" float4 posIn [[ attribute(0) ]];\n" -" float4 normalIn [[ attribute(1) ]];\n" -" float4 binormalIn [[ attribute(2) ]];\n" -" float4 tangentIn [[ attribute(3) ]];\n" -" float4 colorIn [[ attribute(4) ]];\n" -"};\n" -"\n" -"struct FluidPlaneUniform\n" -"{\n" -" float4x4 mv;\n" -" float4x4 mvNorm;\n" -" float4x4 proj;\n" -" float4x4 texMtxs[6];\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" float4 pos [[ position ]];\n" -" float4 mvPos;\n" -" float4 mvNorm;\n" -" float4 mvBinorm;\n" -" float4 mvTangent;\n" -" float4 color;\n" -" float2 uv0;\n" -" float2 uv1;\n" -" float2 uv2;\n" -" float2 uv3;\n" -" float2 uv4;\n" -" float2 uv5;\n" -" float2 uv6;\n" -"};\n" -"\n" -"vertex VertToFrag vmain(VertData v [[ stage_in ]],\n" -" constant FluidPlaneUniform& fu [[ buffer(2) ]])\n" -"{\n" -" VertToFrag vtf;\n" -" float4 pos = float4(v.posIn.xyz, 1.0);\n" -" float4 normalIn = v.normalIn;\n" -" vtf.mvPos = fu.mv * pos;\n" -" vtf.pos = fu.proj * vtf.mvPos;\n" -" vtf.mvNorm = fu.mvNorm * v.normalIn;\n" -" vtf.mvBinorm = fu.mvNorm * v.binormalIn;\n" -" vtf.mvTangent = fu.mvNorm * v.tangentIn;\n" -" vtf.color = v.colorIn;\n" -" vtf.uv0 = (fu.texMtxs[0] * pos).xy;\n" -" vtf.uv1 = (fu.texMtxs[1] * pos).xy;\n" -" vtf.uv2 = (fu.texMtxs[2] * pos).xy;\n" -"%s" // Additional TCGs here -" return vtf;\n" -"}\n"; - -static const char* TessCS = -"#include \n" -"using namespace metal;\n" -"struct VertData\n" -"{\n" -" float4 minMaxPos [[ attribute(0) ]];\n" -" float4 outerLevelsIn [[ attribute(1) ]];\n" -" float2 innerLevelsIn [[ attribute(2) ]];\n" -"};\n" -"\n" -"struct KernelPatchInfo {\n" -" uint numPatches; // total number of patches to process.\n" -" // we need this because this value may\n" -" // not be a multiple of threadgroup size.\n" -" ushort numPatchesInThreadGroup; // number of patches processed by a\n" -" // thread-group\n" -" ushort numControlPointsPerPatch;\n" -"};\n" -"\n" -"kernel void\n" -"cmain(VertData v [[ stage_in ]],\n" -" constant KernelPatchInfo& patchInfo [[ buffer(2) ]],\n" -" device MTLQuadTessellationFactorsHalf* tessellationFactorBuffer [[ buffer(3) ]],\n" -" ushort lID [[ thread_position_in_threadgroup ]],\n" -" ushort groupID [[ threadgroup_position_in_grid ]])\n" -"{\n" -" uint patchGroupID = groupID * patchInfo.numPatchesInThreadGroup;\n" -"\n" -" // execute the per-patch hull function\n" -" if (lID < patchInfo.numPatchesInThreadGroup)\n" -" {\n" -" uint patchID = patchGroupID + lID;\n" -" device MTLQuadTessellationFactorsHalf& patchOut = tessellationFactorBuffer[patchID];\n" -" for (int i=0 ; i<4 ; ++i)\n" -" patchOut.edgeTessellationFactor[i] = v.outerLevelsIn[i];\n" -" for (int i=0 ; i<2 ; ++i)\n" -" patchOut.insideTessellationFactor[i] = v.innerLevelsIn[i];\n" -" }\n" -"}\n"; - -static const char* TessES = -"#include \n" -"using namespace metal;\n" -"struct Ripple\n" -"{\n" -" float4 center; // time, distFalloff\n" -" float4 params; // amplitude, lookupPhase, lookupTime\n" -"};\n" -"\n" -"struct FluidPlaneUniform\n" -"{\n" -" float4x4 mv;\n" -" float4x4 mvNorm;\n" -" float4x4 proj;\n" -" float4x4 texMtxs[6];\n" -" Ripple ripples[20];\n" -" float4 colorMul;\n" -" float rippleNormResolution;\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" float4 pos [[ position ]];\n" -" float4 mvPos;\n" -" float4 mvNorm;\n" -" float4 mvBinorm;\n" -" float4 mvTangent;\n" -" float4 color;\n" -" float2 uv0;\n" -" float2 uv1;\n" -" float2 uv2;\n" -" float2 uv3;\n" -" float2 uv4;\n" -" float2 uv5;\n" -" float2 uv6;\n" -"};\n" -"\n" -"struct VertData\n" -"{\n" -" float4 minMaxPos [[ attribute(0) ]];\n" -" float4 outerLevelsIn [[ attribute(1) ]];\n" -" float2 innerLevelsIn [[ attribute(2) ]];\n" -"};\n" -"\n" -"#define PI_X2 6.283185307179586\n" -"\n" -"static void ApplyRipple(constant Ripple& ripple, float2 pos, thread float& height,\n" -" sampler samp, texture2d RippleMap)\n" -"{\n" -" float dist = length(ripple.center.xy - pos);\n" -" float rippleV = RippleMap.sample(samp, float2(dist * ripple.center.w, ripple.center.z), level(0.0)).r;\n" -" height += rippleV * ripple.params.x * sin((dist * ripple.params.y + ripple.params.z) * PI_X2);\n" -"}\n" -"\n" -"[[ patch(quad, 1) ]]\n" -"vertex VertToFrag emain(VertData v [[ stage_in ]], float2 TessCoord [[ position_in_patch ]],\n" -" constant FluidPlaneUniform& fu [[ buffer(2) ]],\n" -" sampler samp [[ sampler(2) ]],\n" -" texture2d RippleMap [[ texture(%d) ]])\n" -"{\n" -" float2 posIn = float2(mix(v.minMaxPos.x, v.minMaxPos.z, TessCoord.x),\n" -" mix(v.minMaxPos.y, v.minMaxPos.w, TessCoord.y));\n" -" float height = 0.0;\n" -" float upHeight = 0.0;\n" -" float downHeight = 0.0;\n" -" float rightHeight = 0.0;\n" -" float leftHeight = 0.0;\n" -" for (int i=0 ; i<20 ; ++i)\n" -" {\n" -" ApplyRipple(fu.ripples[i], posIn, height, samp, RippleMap);\n" -" ApplyRipple(fu.ripples[i], posIn + float2(0.0, fu.rippleNormResolution), upHeight, samp, RippleMap);\n" -" ApplyRipple(fu.ripples[i], posIn - float2(0.0, fu.rippleNormResolution), downHeight, samp, RippleMap);\n" -" ApplyRipple(fu.ripples[i], posIn + float2(fu.rippleNormResolution, 0.0), rightHeight, samp, RippleMap);\n" -" ApplyRipple(fu.ripples[i], posIn - float2(fu.rippleNormResolution, 0.0), leftHeight, samp, RippleMap);\n" -" }\n" -" float4 normalIn = float4(normalize(float3((leftHeight - rightHeight),\n" -" (downHeight - upHeight),\n" -" fu.rippleNormResolution)), 1.0);\n" -" float4 binormalIn = float4(normalIn.x, normalIn.z, -normalIn.y, 1.0);\n" -" float4 tangentIn = float4(normalIn.z, normalIn.y, -normalIn.x, 1.0);\n" -" float4 pos = float4(posIn, height, 1.0);\n" -" VertToFrag vtf;\n" -" vtf.mvPos = (fu.mv * pos);\n" -" vtf.pos = (fu.proj * vtf.mvPos);\n" -" vtf.mvNorm = (fu.mvNorm * normalIn);\n" -" vtf.mvBinorm = (fu.mvNorm * binormalIn);\n" -" vtf.mvTangent = (fu.mvNorm * tangentIn);\n" -" vtf.color = max(height, 0.0) * fu.colorMul;\n" -" vtf.color.a = 1.0;\n" -" vtf.uv0 = (fu.texMtxs[0] * pos).xy;\n" -" vtf.uv1 = (fu.texMtxs[1] * pos).xy;\n" -" vtf.uv2 = (fu.texMtxs[2] * pos).xy;\n" -"%s\n" // Additional TCGs here -" return vtf;\n" -"}\n"; - -static const char* FS = -"#include \n" -"using namespace metal;\n" -"\n" -"struct Light\n" -"{\n" -" float4 pos;\n" -" float4 dir;\n" -" float4 color;\n" -" float4 linAtt;\n" -" float4 angAtt;\n" -"};\n" -"struct Fog\n" // Reappropriated for indirect texture scaling -"{\n" -" int mode;\n" -" float4 color;\n" -" float indScale;\n" -" float start;\n" -"};\n" -"\n" -"struct LightingUniform\n" -"{\n" -" Light lights[" _XSTR(URDE_MAX_LIGHTS) "];\n" -" float4 ambient;\n" -" float4 kColor0;\n" -" float4 kColor1;\n" -" float4 kColor2;\n" -" float4 kColor3;\n" -" Fog fog;\n" -"};\n" -"\n" -"static float4 LightingFunc(constant LightingUniform& lu, float3 mvPosIn, float3 mvNormIn)\n" -"{\n" -" float4 ret = lu.ambient;\n" -" \n" -" for (int i=0 ; i<" _XSTR(URDE_MAX_LIGHTS) " ; ++i)\n" -" {\n" -" float3 delta = mvPosIn - lu.lights[i].pos.xyz;\n" -" float dist = length(delta);\n" -" float angDot = clamp(dot(normalize(delta), lu.lights[i].dir.xyz), 0.0, 1.0);\n" -" float att = 1.0 / (lu.lights[i].linAtt[2] * dist * dist +\n" -" lu.lights[i].linAtt[1] * dist +\n" -" lu.lights[i].linAtt[0]);\n" -" float angAtt = lu.lights[i].angAtt[2] * angDot * angDot +\n" -" lu.lights[i].angAtt[1] * angDot +\n" -" lu.lights[i].angAtt[0];\n" -" ret += lu.lights[i].color * clamp(angAtt, 0.0, 1.0) * att * clamp(dot(normalize(-delta), mvNormIn), 0.0, 1.0);\n" -" }\n" -" \n" -" return ret;\n" -"}\n" -"\n" -"struct VertToFrag\n" -"{\n" -" float4 pos [[ position ]];\n" -" float4 mvPos;\n" -" float4 mvNorm;\n" -" float4 mvBinorm;\n" -" float4 mvTangent;\n" -" float4 color;\n" -" float2 uv0;\n" -" float2 uv1;\n" -" float2 uv2;\n" -" float2 uv3;\n" -" float2 uv4;\n" -" float2 uv5;\n" -" float2 uv6;\n" -"};\n" -"\n" -"fragment float4 fmain(VertToFrag vtf [[ stage_in ]],\n" -" sampler samp [[ sampler(0) ]],\n" -" constant LightingUniform& lu [[ buffer(4) ]]%s)\n" // Textures here -"{\n" -" float4 lighting = LightingFunc(lu, vtf.mvPos.xyz, normalize(vtf.mvNorm.xyz));\n" -" float4 colorOut;\n" -"%s" // Combiner expression here -" return colorOut;\n" -"}\n"; - -static const char* FSDoor = -"#include \n" -"using namespace metal;\n" -"\n" -"struct Light\n" -"{\n" -" float4 pos;\n" -" float4 dir;\n" -" float4 color;\n" -" float4 linAtt;\n" -" float4 angAtt;\n" -"};\n" -"struct Fog\n" // Reappropriated for indirect texture scaling -"{\n" -" int mode;\n" -" float4 color;\n" -" float indScale;\n" -" float start;\n" -"};\n" -"\n" -"struct LightingUniform\n" -"{\n" -" Light lights[" _XSTR(URDE_MAX_LIGHTS) "];\n" -" float4 ambient;\n" -" float4 kColor0;\n" -" float4 kColor1;\n" -" float4 kColor2;\n" -" float4 kColor3;\n" -" Fog fog;\n" -"};\n" -"\n" -"struct VertToFrag\n" -"{\n" -" float4 pos [[ position ]];\n" -" float4 mvPos;\n" -" float4 mvNorm;\n" -" float4 mvBinorm;\n" -" float4 mvTangent;\n" -" float4 color;\n" -" float2 uv0;\n" -" float2 uv1;\n" -" float2 uv2;\n" -" float2 uv3;\n" -" float2 uv4;\n" -" float2 uv5;\n" -" float2 uv6;\n" -"};\n" -"\n" -"fragment float4 fmain(VertToFrag vtf [[ stage_in ]],\n" -" sampler samp [[ sampler(0) ]],\n" -" constant LightingUniform& lu [[ buffer(4) ]]%s)\n" // Textures here -"{\n" -" float4 colorOut;\n" -"%s" // Combiner expression here -" return colorOut;\n" -"}\n"; - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::MetalDataFactory::Context& ctx, const SFluidPlaneShaderInfo& info) -{ - if (!s_vtxFmt) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 0}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 1}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 2}, - {nullptr, nullptr, boo::VertexSemantic::Color} - }; - s_vtxFmt = ctx.newVertexFormat(5, elements); - } - - std::string additionalTCGs; - std::string textures; - std::string combiner; - int nextTex = 0; - int nextTCG = 3; - int nextMtx = 4; - int bumpMapUv, envBumpMapUv, envMapUv, lightmapUv; - - if (info.m_hasPatternTex1) - textures += hecl::Format(",\ntexture2d patternTex1 [[ texture(%d) ]]", nextTex++); - if (info.m_hasPatternTex2) - textures += hecl::Format(",\ntexture2d patternTex2 [[ texture(%d) ]]", nextTex++); - if (info.m_hasColorTex) - textures += hecl::Format(",\ntexture2d colorTex [[ texture(%d) ]]", nextTex++); - if (info.m_hasBumpMap) - textures += hecl::Format(",\ntexture2d bumpMap [[ texture(%d) ]]", nextTex++); - if (info.m_hasEnvMap) - textures += hecl::Format(",\ntexture2d envMap [[ texture(%d) ]]", nextTex++); - if (info.m_hasEnvBumpMap) - textures += hecl::Format(",\ntexture2d envBumpMap [[ texture(%d) ]]", nextTex++); - if (info.m_hasLightmap) - textures += hecl::Format(",\ntexture2d lightMap [[ texture(%d) ]]", nextTex++); - - if (info.m_hasBumpMap) - { - bumpMapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uv%d = (fu.texMtxs[0] * pos).xy;\n", nextTCG++); - } - if (info.m_hasEnvBumpMap) - { - envBumpMapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uv%d = (fu.texMtxs[3] * float4(normalIn.xyz, 1.0)).xy;\n", nextTCG++); - } - if (info.m_hasEnvMap) - { - envMapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uv%d = (fu.texMtxs[%d] * pos).xy;\n", nextTCG++, nextMtx++); - } - if (info.m_hasLightmap) - { - lightmapUv = nextTCG; - additionalTCGs += hecl::Format(" vtf.uv%d = (fu.texMtxs[%d] * pos).xy;\n", nextTCG++, nextMtx++); - } - - switch (info.m_type) - { - case EFluidType::NormalWater: - case EFluidType::PhazonFluid: - case EFluidType::Four: - if (info.m_hasLightmap) - { - combiner += hecl::Format(" float4 lightMapTexel = lightMap.sample(samp, vtf.uv%d);\n", lightmapUv); - // 0: Tex4TCG, Tex4, doubleLightmapBlend ? NULL : GX_COLOR1A1 - // ZERO, TEX, KONST, doubleLightmapBlend ? ZERO : RAS - // Output reg 2 - // KColor 2 - if (info.m_doubleLightmapBlend) - { - // 1: Tex4TCG2, Tex4, GX_COLOR1A1 - // C2, TEX, KONST, RAS - // Output reg 2 - // KColor 3 - // Tex * K2 + Lighting - combiner += " lighting += mix(lightMapTexel * lu.kColor2, lightMapTexel, lu.kColor3);\n"; - } - else - { - // mix(Tex * K2, Tex, K3) + Lighting - combiner += " lighting += lightMapTexel * lu.kColor2;\n"; - } - } - - // Next: Tex0TCG, Tex0, GX_COLOR1A1 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // Next: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // Next: Tex2TCG, Tex2, GX_COLOR1A1 - // ZERO, TEX, hasTex4 ? C2 : RAS, PREV - // Output reg prev - - // (Tex0 * kColor0 + Lighting) * Tex1 + VertColor + Tex2 * Lighting - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.sample(samp, vtf.uv0) * lu.kColor0 + lighting) *\n" - " patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - else - combiner += " colorOut = lighting * patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - - if (info.m_hasColorTex && !info.m_hasEnvMap && info.m_hasEnvBumpMap) - { - // Make previous stage indirect, mtx0 - combiner += hecl::Format(" float2 indUvs = (envBumpMap.sample(samp, vtf.uv%d).ra - float2(0.5, 0.5)) *\n" - " float2(lu.fog.indScale, -lu.fog.indScale);\n", envBumpMapUv); - combiner += " colorOut += colorTex.sample(samp, indUvs + vtf.uv2) * lighting;\n"; - } - else if (info.m_hasEnvMap) - { - // Next: envTCG, envTex, NULL - // PREV, TEX, KONST, ZERO - // Output reg prev - // KColor 1 - - // Make previous stage indirect, mtx0 - if (info.m_hasColorTex) - combiner += " colorOut += colorTex.sample(samp, vtf.uv2) * lighting;\n"; - combiner += hecl::Format(" float2 indUvs = (envBumpMap.sample(samp, vtf.uv%d).ra - float2(0.5, 0.5)) *\n" - " float2(lu.fog.indScale, -lu.fog.indScale);\n", envBumpMapUv); - combiner += hecl::Format(" colorOut = mix(colorOut, envMap.sample(samp, indUvs + vtf.uv%d), lu.kColor1);\n", - envMapUv); - } - else if (info.m_hasColorTex) - { - combiner += " colorOut += colorTex.sample(samp, vtf.uv2) * lighting;\n"; - } - - break; - - case EFluidType::PoisonWater: - if (info.m_hasLightmap) - { - combiner += hecl::Format(" float4 lightMapTexel = lightMap.sample(samp, vtf.uv%d);\n", lightmapUv); - // 0: Tex4TCG, Tex4, doubleLightmapBlend ? NULL : GX_COLOR1A1 - // ZERO, TEX, KONST, doubleLightmapBlend ? ZERO : RAS - // Output reg 2 - // KColor 2 - if (info.m_doubleLightmapBlend) - { - // 1: Tex4TCG2, Tex4, GX_COLOR1A1 - // C2, TEX, KONST, RAS - // Output reg 2 - // KColor 3 - // Tex * K2 + Lighting - combiner += " lighting += mix(lightMapTexel * lu.kColor2, lightMapTexel, lu.kColor3);\n"; - } - else - { - // mix(Tex * K2, Tex, K3) + Lighting - combiner += " lighting += lightMapTexel * lu.kColor2;\n"; - } - } - - // Next: Tex0TCG, Tex0, GX_COLOR1A1 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // Next: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // Next: Tex2TCG, Tex2, GX_COLOR1A1 - // ZERO, TEX, hasTex4 ? C2 : RAS, PREV - // Output reg prev - - // (Tex0 * kColor0 + Lighting) * Tex1 + VertColor + Tex2 * Lighting - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.sample(samp, vtf.uv0) * lu.kColor0 + lighting) *\n" - " patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - else - combiner += " colorOut = lighting * patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - { - if (info.m_hasEnvBumpMap) - { - // Make previous stage indirect, mtx0 - combiner += hecl::Format(" float2 indUvs = (envBumpMap.sample(samp, vtf.uv%d).ra - float2(0.5, 0.5)) *\n" - " float2(lu.fog.indScale, -lu.fog.indScale);\n", envBumpMapUv); - combiner += " colorOut += colorTex.sample(samp, indUvs + vtf.uv2) * lighting;\n"; - } - else - { - combiner += " colorOut += colorTex.sample(samp, vtf.uv2) * lighting;\n"; - } - } - - break; - - case EFluidType::Lava: - // 0: Tex0TCG, Tex0, GX_COLOR0A0 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // 1: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // 2: Tex2TCG, Tex2, NULL - // ZERO, TEX, ONE, PREV - // Output reg prev - - // (Tex0 * kColor0 + VertColor) * Tex1 + VertColor + Tex2 - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.sample(samp, vtf.uv0) * lu.kColor0 + vtf.color) *\n" - " patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - else - combiner += " colorOut = vtf.color * patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - combiner += " colorOut += colorTex.sample(samp, vtf.uv2);\n"; - - if (info.m_hasBumpMap) - { - // 3: bumpMapTCG, bumpMap, NULL - // ZERO, TEX, ONE, HALF - // Output reg 0, no clamp, no bias - - // 4: bumpMapTCG2, bumpMap, NULL - // ZERO, TEX, ONE, C0 - // Output reg 0, subtract, clamp, no bias - - combiner += " float3 lightVec = lights[3].pos.xyz - vtf.mvPos.xyz;\n" - " float lx = dot(vtf.mvTangent.xyz, lightVec);\n" - " float ly = dot(vtf.mvBinorm.xyz, lightVec);\n"; - combiner += hecl::Format(" float4 emboss1 = bumpMap.sample(samp, vtf.uv%d) + float4(0.5);\n" - " float4 emboss2 = bumpMap.sample(samp, vtf.uv%d + float2(lx, ly));\n", - bumpMapUv, bumpMapUv); - - // 5: NULL, NULL, NULL - // ZERO, PREV, C0, ZERO - // Output reg prev, scale 2, clamp - - // colorOut * clamp(emboss1 + 0.5 - emboss2, 0.0, 1.0) * 2.0 - combiner += "colorOut *= clamp((emboss1 + float4(0.5) - emboss2) * float4(2.0), float4(0.0), float4(1.0));\n"; - } - - break; - - case EFluidType::ThickLava: - // 0: Tex0TCG, Tex0, GX_COLOR0A0 - // ZERO, TEX, KONST, RAS - // Output reg prev - // KColor 0 - - // 1: Tex1TCG, Tex1, GX_COLOR0A0 - // ZERO, TEX, PREV, RAS - // Output reg prev - - // 2: Tex2TCG, Tex2, NULL - // ZERO, TEX, ONE, PREV - // Output reg prev - - // (Tex0 * kColor0 + VertColor) * Tex1 + VertColor + Tex2 - if (info.m_hasPatternTex2) - { - if (info.m_hasPatternTex1) - combiner += " colorOut = (patternTex1.sample(samp, vtf.uv0) * lu.kColor0 + vtf.color) *\n" - " patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - else - combiner += " colorOut = vtf.color * patternTex2.sample(samp, vtf.uv1) + vtf.color;\n"; - } - else - { - combiner += " colorOut = vtf.color;\n"; - } - - if (info.m_hasColorTex) - combiner += " colorOut += colorTex.sample(samp, vtf.uv2);\n"; - - if (info.m_hasBumpMap) - { - // 3: bumpMapTCG, bumpMap, NULL - // ZERO, TEX, PREV, ZERO - // Output reg prev, scale 2 - combiner += hecl::Format(" float4 emboss1 = bumpMap.sample(samp, vtf.uv%d) + float4(0.5);\n", bumpMapUv); - combiner += "colorOut *= emboss1 * float4(2.0);\n"; - } - - break; - } - - combiner += " colorOut.a = lu.kColor0.a;\n"; - - char *finalVS, *finalFS; - asprintf(&finalVS, VS, additionalTCGs.c_str()); - asprintf(&finalFS, FS, textures.c_str(), combiner.c_str()); - - auto regular = ctx.newShaderPipeline(finalVS, finalFS, nullptr, nullptr, s_vtxFmt, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - - boo::ObjToken tessellation; - if (info.m_tessellation) - { - if (!s_tessVtxFmt) - { - boo::VertexElementDescriptor tessElements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::UV4, 0}, - {nullptr, nullptr, boo::VertexSemantic::UV4, 1}, - }; - s_tessVtxFmt = ctx.newVertexFormat(3, tessElements); - } - - char *finalES; - asprintf(&finalES, TessES, nextTex, additionalTCGs.c_str()); - - tessellation = ctx.newTessellationShaderPipeline(TessCS, finalFS, finalES, nullptr, nullptr, nullptr, s_tessVtxFmt, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::SrcAlpha, - info.m_additive ? boo::BlendFactor::One : boo::BlendFactor::InvSrcAlpha, - 1, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - - free(finalES); - } - - free(finalVS); - free(finalFS); - - return {regular, tessellation}; -} - -CFluidPlaneShader::ShaderPair -CFluidPlaneShader::BuildShader(boo::MetalDataFactory::Context& ctx, const SFluidPlaneDoorShaderInfo& info) -{ - if (!s_vtxFmt) - { - boo::VertexElementDescriptor elements[] = - { - {nullptr, nullptr, boo::VertexSemantic::Position4}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 0}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 1}, - {nullptr, nullptr, boo::VertexSemantic::Normal4, 2}, - {nullptr, nullptr, boo::VertexSemantic::Color} - }; - s_vtxFmt = ctx.newVertexFormat(5, elements); - } - - std::string additionalTCGs; - std::string textures; - std::string combiner; - int nextTex = 0; - - if (info.m_hasPatternTex1) - textures += hecl::Format(",\ntexture2d patternTex1 [[ texture(%d) ]]", nextTex++); - if (info.m_hasPatternTex2) - textures += hecl::Format(",\ntexture2d patternTex2 [[ texture(%d) ]]", nextTex++); - if (info.m_hasColorTex) - textures += hecl::Format(",\ntexture2d colorTex [[ texture(%d) ]]", nextTex++); - - // Tex0 * kColor0 * Tex1 + Tex2 - if (info.m_hasPatternTex1 && info.m_hasPatternTex2) - { - combiner += " colorOut = patternTex1.sample(samp, vtf.uv0) * lu.kColor0 *\n" - " patternTex2.sample(samp, vtf.uv1);\n"; - } - else - { - combiner += " colorOut = float4(0.0);\n"; - } - - if (info.m_hasColorTex) - { - combiner += " colorOut += colorTex.sample(samp, vtf.uv2);\n"; - } - - combiner += " colorOut.a = lu.kColor0.a;\n"; - - char *finalVS, *finalFS; - asprintf(&finalVS, VS, additionalTCGs.c_str()); - asprintf(&finalFS, FSDoor, textures.c_str(), combiner.c_str()); - - auto ret = ctx.newShaderPipeline(finalVS, finalFS, nullptr, nullptr, s_vtxFmt, - boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, boo::ZTest::LEqual, false, true, false, - boo::CullMode::None); - - free(finalVS); - free(finalFS); - - return {ret, {}}; -} - -template <> -void CFluidPlaneShader::_Shutdown() -{ - s_vtxFmt.reset(); - s_tessVtxFmt.reset(); -} - -CFluidPlaneShader::BindingPair -CFluidPlaneShader::BuildBinding(boo::MetalDataFactory::Context& ctx, const ShaderPair& pipeline) -{ - boo::ObjToken ubufs[] = { m_uniBuf.get(), m_uniBuf.get(), m_uniBuf.get() }; - boo::PipelineStage ubufStages[] = { boo::PipelineStage::Vertex, boo::PipelineStage::Vertex, - boo::PipelineStage::Fragment }; - size_t ubufOffs[] = {0, 0, 1280}; - size_t ubufSizes[] = {1280, 1280, sizeof(CModelShaders::LightingUniform)}; - size_t texCount = 0; - boo::ObjToken texs[8]; - if (m_patternTex1) - texs[texCount++] = m_patternTex1->GetBooTexture(); - if (m_patternTex2) - texs[texCount++] = m_patternTex2->GetBooTexture(); - if (m_colorTex) - texs[texCount++] = m_colorTex->GetBooTexture(); - if (m_bumpMap) - texs[texCount++] = m_bumpMap->GetBooTexture(); - if (m_envMap) - texs[texCount++] = m_envMap->GetBooTexture(); - if (m_envBumpMap) - texs[texCount++] = m_envBumpMap->GetBooTexture(); - if (m_lightmap) - texs[texCount++] = m_lightmap->GetBooTexture(); - auto regular = ctx.newShaderDataBinding(pipeline.m_regular, s_vtxFmt, m_vbo.get(), nullptr, nullptr, 3, - ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - boo::ObjToken tessellation; - if (pipeline.m_tessellation) - { - texs[texCount++] = m_rippleMap.get(); - tessellation = ctx.newShaderDataBinding(pipeline.m_tessellation, s_tessVtxFmt, m_pvbo.get(), nullptr, nullptr, 3, - ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs, nullptr, nullptr); - } - return {regular, tessellation}; -} - -} diff --git a/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp b/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp index 536acc0bd..003d98229 100644 --- a/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp +++ b/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFOGVOLUMEFILTER_HPP__ -#define __URDE_CFOGVOLUMEFILTER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -26,4 +25,3 @@ public: } -#endif // __URDE_CFOGVOLUMEFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp index 9d30a938f..9a79cc576 100644 --- a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp +++ b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFOGVOLUMEPLANESHADER_HPP__ -#define __URDE_CFOGVOLUMEPLANESHADER_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "zeus/CMatrix4f.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CFOGVOLUMEPLANESHADER_HPP__ diff --git a/Runtime/Graphics/Shaders/CLineRendererShaders.hpp b/Runtime/Graphics/Shaders/CLineRendererShaders.hpp index 4bee04a49..62d331c24 100644 --- a/Runtime/Graphics/Shaders/CLineRendererShaders.hpp +++ b/Runtime/Graphics/Shaders/CLineRendererShaders.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CLINERENDERERSHADERS_HPP__ -#define __URDE_CLINERENDERERSHADERS_HPP__ +#pragma once #include "Graphics/CGraphics.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp" @@ -34,4 +33,3 @@ public: } -#endif // __URDE_CLINERENDERERSHADERS_HPP__ diff --git a/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp b/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp index b9d3dafb1..8b67bf755 100644 --- a/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp +++ b/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAPSURFACESHADER_HPP__ -#define __URDE_CMAPSURFACESHADER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp" @@ -32,4 +31,3 @@ public: } -#endif // __URDE_CMAPSURFACESHADER_HPP__ diff --git a/Runtime/Graphics/Shaders/CModelShaders.hpp b/Runtime/Graphics/Shaders/CModelShaders.hpp index 78a77eff7..d4faa316a 100644 --- a/Runtime/Graphics/Shaders/CModelShaders.hpp +++ b/Runtime/Graphics/Shaders/CModelShaders.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMODELSHADERS_HPP__ -#define __URDE_CMODELSHADERS_HPP__ +#pragma once #include "hecl/Runtime.hpp" #include "hecl/Backend/Backend.hpp" @@ -94,4 +93,3 @@ private: } -#endif // __URDE_CMODELSHADERS_HPP__ diff --git a/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp b/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp index a903e11f4..48d1c059e 100644 --- a/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp +++ b/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLESWOOSHSHADERS_HPP__ -#define __URDE_CPARTICLESWOOSHSHADERS_HPP__ +#pragma once #include "Graphics/CGraphics.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CPARTICLESWOOSHSHADERS_HPP__ diff --git a/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp b/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp index c17067bc3..a1bc093e6 100644 --- a/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp +++ b/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPHAZONSUITFILTER_HPP__ -#define __URDE_CPHAZONSUITFILTER_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "zeus/CColor.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CPHAZONSUITFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CRadarPaintShader.hpp b/Runtime/Graphics/Shaders/CRadarPaintShader.hpp index 444e2c9f3..b6350d44e 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShader.hpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRADARPAINTSHADER_HPP__ -#define __URDE_CRADARPAINTSHADER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -34,4 +33,3 @@ public: } -#endif // __URDE_CRADARPAINTSHADER_HPP__ diff --git a/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp b/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp index b2d5196d1..af9fe7777 100644 --- a/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp +++ b/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRANDOMSTATICFILTER_HPP__ -#define __URDE_CRANDOMSTATICFILTER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CRANDOMSTATICFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CScanLinesFilter.hpp b/Runtime/Graphics/Shaders/CScanLinesFilter.hpp index 40a013cbc..3215ee751 100644 --- a/Runtime/Graphics/Shaders/CScanLinesFilter.hpp +++ b/Runtime/Graphics/Shaders/CScanLinesFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCANLINESFILTER_HPP__ -#define __URDE_CSCANLINESFILTER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -48,4 +47,3 @@ public: } -#endif // __URDE_CSCANLINESFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp b/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp index 3dab376cf..bab72077d 100644 --- a/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp +++ b/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSPACEWARPFILTER_HPP__ -#define __URDE_CSPACEWARPFILTER_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "RetroTypes.hpp" @@ -37,4 +36,3 @@ public: } -#endif // __URDE_CSPACEWARPFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CTextSupportShader.hpp b/Runtime/Graphics/Shaders/CTextSupportShader.hpp index 57c814684..3d2587f40 100644 --- a/Runtime/Graphics/Shaders/CTextSupportShader.hpp +++ b/Runtime/Graphics/Shaders/CTextSupportShader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEXTSUPPORTSHADER_HPP__ -#define __URDE_CTEXTSUPPORTSHADER_HPP__ +#pragma once #include "GuiSys/CGuiWidget.hpp" #include "hecl/VertexBufferPool.hpp" @@ -109,4 +108,3 @@ public: } -#endif // __URDE_CTEXTSUPPORTSHADER_HPP__ diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp b/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp index 23040b968..7c980b4f7 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEXTUREDQUADFILTER_HPP__ -#define __URDE_CTEXTUREDQUADFILTER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -72,4 +71,3 @@ public: } -#endif // __URDE_CTEXTUREDQUADFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CThermalColdFilter.hpp b/Runtime/Graphics/Shaders/CThermalColdFilter.hpp index d4f3de681..d617f42cf 100644 --- a/Runtime/Graphics/Shaders/CThermalColdFilter.hpp +++ b/Runtime/Graphics/Shaders/CThermalColdFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTHERMALCOLDFILTER_HPP__ -#define __URDE_CTHERMALCOLDFILTER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CMatrix4f.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CTHERMALCOLDFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CThermalHotFilter.hpp b/Runtime/Graphics/Shaders/CThermalHotFilter.hpp index 93145cb5a..c57468bcf 100644 --- a/Runtime/Graphics/Shaders/CThermalHotFilter.hpp +++ b/Runtime/Graphics/Shaders/CThermalHotFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTHERMALHOTFILTER_HPP__ -#define __URDE_CTHERMALHOTFILTER_HPP__ +#pragma once #include "zeus/CMatrix4f.hpp" #include "zeus/CColor.hpp" @@ -31,4 +30,3 @@ public: } -#endif // __URDE_CTHERMALHOTFILTER_HPP__ diff --git a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp index c86cb5385..56b95dc0e 100644 --- a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp +++ b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CWORLDSHADOWSHADER_HPP -#define URDE_CWORLDSHADOWSHADER_HPP +#pragma once #include "CColoredQuadFilter.hpp" #include "CTexturedQuadFilter.hpp" @@ -42,4 +41,3 @@ public: } -#endif // URDE_CWORLDSHADOWSHADER_HPP diff --git a/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp b/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp index 96285eab6..fb3b903f8 100644 --- a/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp +++ b/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CXRAYBLURFILTER_HPP__ -#define __URDE_CXRAYBLURFILTER_HPP__ +#pragma once #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "zeus/CMatrix4f.hpp" @@ -32,4 +31,3 @@ public: } -#endif // __URDE_CXRAYBLURFILTER_HPP__ diff --git a/Runtime/GuiSys/CAuiEnergyBarT01.hpp b/Runtime/GuiSys/CAuiEnergyBarT01.hpp index 4aa7a8eae..499866823 100644 --- a/Runtime/GuiSys/CAuiEnergyBarT01.hpp +++ b/Runtime/GuiSys/CAuiEnergyBarT01.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUIENERGYBAR_HPP__ -#define __URDE_CAUIENERGYBAR_HPP__ +#pragma once #include "CGuiWidget.hpp" #include "CToken.hpp" @@ -67,4 +66,3 @@ public: } -#endif // __URDE_CAUIENERGYBAR_HPP__ diff --git a/Runtime/GuiSys/CAuiImagePane.hpp b/Runtime/GuiSys/CAuiImagePane.hpp index 53a311357..1217581a6 100644 --- a/Runtime/GuiSys/CAuiImagePane.hpp +++ b/Runtime/GuiSys/CAuiImagePane.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUIIMAGEPANE_HPP__ -#define __URDE_CAUIIMAGEPANE_HPP__ +#pragma once #include "CGuiWidget.hpp" #include "CToken.hpp" @@ -54,4 +53,3 @@ public: }; } -#endif // __URDE_CAUIIMAGEPANE_HPP__ diff --git a/Runtime/GuiSys/CAuiMeter.hpp b/Runtime/GuiSys/CAuiMeter.hpp index 89a461303..901bdd542 100644 --- a/Runtime/GuiSys/CAuiMeter.hpp +++ b/Runtime/GuiSys/CAuiMeter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUIMETER_HPP__ -#define __URDE_CAUIMETER_HPP__ +#pragma once #include "CGuiGroup.hpp" @@ -33,4 +32,3 @@ public: } -#endif // __URDE_CAUIMETER_HPP__ diff --git a/Runtime/GuiSys/CCompoundTargetReticle.hpp b/Runtime/GuiSys/CCompoundTargetReticle.hpp index 76e2f49b9..ad490cb5c 100644 --- a/Runtime/GuiSys/CCompoundTargetReticle.hpp +++ b/Runtime/GuiSys/CCompoundTargetReticle.hpp @@ -1,5 +1,4 @@ -#ifndef __CCOMPOUNDTARGETRETICLE_HPP__ -#define __CCOMPOUNDTARGETRETICLE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CQuaternion.hpp" @@ -186,4 +185,3 @@ public: }; } -#endif // __CCOMPOUNDTARGETRETICLE_HPP__ diff --git a/Runtime/GuiSys/CConsoleOutputWindow.hpp b/Runtime/GuiSys/CConsoleOutputWindow.hpp index acfe77ef5..ca190461f 100644 --- a/Runtime/GuiSys/CConsoleOutputWindow.hpp +++ b/Runtime/GuiSys/CConsoleOutputWindow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCONSOLEOUTPUTWINDOW_HPP__ -#define __URDE_CCONSOLEOUTPUTWINDOW_HPP__ +#pragma once #include "CIOWin.hpp" @@ -16,4 +15,3 @@ public: } -#endif // __URDE_CCONSOLEOUTPUTWINDOW_HPP__ diff --git a/Runtime/GuiSys/CDrawStringOptions.hpp b/Runtime/GuiSys/CDrawStringOptions.hpp index 413d3a32e..194eeb28a 100644 --- a/Runtime/GuiSys/CDrawStringOptions.hpp +++ b/Runtime/GuiSys/CDrawStringOptions.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDRAWSTRINGOPTIONS_HPP__ -#define __URDE_CDRAWSTRINGOPTIONS_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -28,4 +27,3 @@ public: } -#endif // __URDE_CDRAWSTRINGOPTIONS_HPP__ diff --git a/Runtime/GuiSys/CErrorOutputWindow.hpp b/Runtime/GuiSys/CErrorOutputWindow.hpp index 98ec2a627..e3cbaad10 100644 --- a/Runtime/GuiSys/CErrorOutputWindow.hpp +++ b/Runtime/GuiSys/CErrorOutputWindow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CERROROUTPUTWINDOW_HPP__ -#define __URDE_CERROROUTPUTWINDOW_HPP__ +#pragma once #include "CIOWin.hpp" #include "RetroTypes.hpp" @@ -40,4 +39,3 @@ public: } -#endif // __URDE_CERROROUTPUTWINDOW_HPP__ diff --git a/Runtime/GuiSys/CFontImageDef.hpp b/Runtime/GuiSys/CFontImageDef.hpp index c2ed78bd2..8e379204b 100644 --- a/Runtime/GuiSys/CFontImageDef.hpp +++ b/Runtime/GuiSys/CFontImageDef.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFONTIMAGEDEF_HPP__ -#define __URDE_CFONTIMAGEDEF_HPP__ +#pragma once #include #include "CToken.hpp" @@ -26,4 +25,3 @@ public: } -#endif // __URDE_CFONTIMAGEDEF_HPP__ diff --git a/Runtime/GuiSys/CFontRenderState.hpp b/Runtime/GuiSys/CFontRenderState.hpp index 9553b9093..b7db8a705 100644 --- a/Runtime/GuiSys/CFontRenderState.hpp +++ b/Runtime/GuiSys/CFontRenderState.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFONTRENDERSTATE_HPP__ -#define __URDE_CFONTRENDERSTATE_HPP__ +#pragma once #include "CGuiTextSupport.hpp" #include "CSaveableState.hpp" @@ -39,4 +38,3 @@ public: } -#endif // __URDE_CFONTRENDERSTATE_HPP__ diff --git a/Runtime/GuiSys/CGuiCamera.hpp b/Runtime/GuiSys/CGuiCamera.hpp index c91bdf085..51d4e6439 100644 --- a/Runtime/GuiSys/CGuiCamera.hpp +++ b/Runtime/GuiSys/CGuiCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUICAMERA_HPP__ -#define __URDE_CGUICAMERA_HPP__ +#pragma once #include "CGuiWidget.hpp" @@ -65,4 +64,3 @@ public: } -#endif // __URDE_CGUICAMERA_HPP__ diff --git a/Runtime/GuiSys/CGuiCompoundWidget.hpp b/Runtime/GuiSys/CGuiCompoundWidget.hpp index 803305c92..f5aa973c5 100644 --- a/Runtime/GuiSys/CGuiCompoundWidget.hpp +++ b/Runtime/GuiSys/CGuiCompoundWidget.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUICOMPOUNDWIDGET_HPP__ -#define __URDE_CGUICOMPOUNDWIDGET_HPP__ +#pragma once #include "CGuiWidget.hpp" @@ -19,4 +18,3 @@ public: } -#endif // __URDE_CGUICOMPOUNDWIDGET_HPP__ diff --git a/Runtime/GuiSys/CGuiFrame.hpp b/Runtime/GuiSys/CGuiFrame.hpp index 753d5c74c..ba966847c 100644 --- a/Runtime/GuiSys/CGuiFrame.hpp +++ b/Runtime/GuiSys/CGuiFrame.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIFRAME_HPP__ -#define __URDE_CGUIFRAME_HPP__ +#pragma once #include "CGuiWidget.hpp" #include "CGuiHeadWidget.hpp" @@ -86,4 +85,3 @@ std::unique_ptr RGuiFrameFactoryInGame(const SObjectTag& tag, CInputStream } -#endif // __URDE_CGUIFRAME_HPP__ diff --git a/Runtime/GuiSys/CGuiGroup.hpp b/Runtime/GuiSys/CGuiGroup.hpp index c4ad6a285..79927b739 100644 --- a/Runtime/GuiSys/CGuiGroup.hpp +++ b/Runtime/GuiSys/CGuiGroup.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIGROUP_HPP__ -#define __URDE_CGUIGROUP_HPP__ +#pragma once #include "CGuiCompoundWidget.hpp" @@ -26,4 +25,3 @@ public: } -#endif // __URDE_CGUIGROUP_HPP__ diff --git a/Runtime/GuiSys/CGuiHeadWidget.hpp b/Runtime/GuiSys/CGuiHeadWidget.hpp index a92d73931..ba5adf3a7 100644 --- a/Runtime/GuiSys/CGuiHeadWidget.hpp +++ b/Runtime/GuiSys/CGuiHeadWidget.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIHEADWIDGET_HPP__ -#define __URDE_CGUIHEADWIDGET_HPP__ +#pragma once #include "CGuiWidget.hpp" @@ -19,4 +18,3 @@ public: } -#endif // __URDE_CGUIHEADWIDGET_HPP__ diff --git a/Runtime/GuiSys/CGuiLight.hpp b/Runtime/GuiSys/CGuiLight.hpp index 3a447e2aa..93b815690 100644 --- a/Runtime/GuiSys/CGuiLight.hpp +++ b/Runtime/GuiSys/CGuiLight.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUILIGHT_HPP__ -#define __URDE_CGUILIGHT_HPP__ +#pragma once #include "CGuiWidget.hpp" #include "Graphics/CLight.hpp" @@ -47,4 +46,3 @@ public: } -#endif // __URDE_CGUILIGHT_HPP__ diff --git a/Runtime/GuiSys/CGuiModel.hpp b/Runtime/GuiSys/CGuiModel.hpp index 906e07e20..fa6e0de38 100644 --- a/Runtime/GuiSys/CGuiModel.hpp +++ b/Runtime/GuiSys/CGuiModel.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIMODEL_HPP__ -#define __URDE_CGUIMODEL_HPP__ +#pragma once #include "CGuiWidget.hpp" #include "CToken.hpp" @@ -28,4 +27,3 @@ public: } -#endif // __URDE_CGUIMODEL_HPP__ diff --git a/Runtime/GuiSys/CGuiObject.hpp b/Runtime/GuiSys/CGuiObject.hpp index f7877338f..afde00bce 100644 --- a/Runtime/GuiSys/CGuiObject.hpp +++ b/Runtime/GuiSys/CGuiObject.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIOBJECT_HPP__ -#define __URDE_CGUIOBJECT_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -48,4 +47,3 @@ public: } -#endif // __URDE_CGUIOBJECT_HPP__ diff --git a/Runtime/GuiSys/CGuiPane.hpp b/Runtime/GuiSys/CGuiPane.hpp index c64e0703b..46f70236b 100644 --- a/Runtime/GuiSys/CGuiPane.hpp +++ b/Runtime/GuiSys/CGuiPane.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIPANE_HPP__ -#define __URDE_CGUIPANE_HPP__ +#pragma once #include "CGuiWidget.hpp" #include "specter/View.hpp" @@ -33,4 +32,3 @@ public: } -#endif // __URDE_CGUIPANE_HPP__ diff --git a/Runtime/GuiSys/CGuiSliderGroup.hpp b/Runtime/GuiSys/CGuiSliderGroup.hpp index 60aaa9019..1718ae9fc 100644 --- a/Runtime/GuiSys/CGuiSliderGroup.hpp +++ b/Runtime/GuiSys/CGuiSliderGroup.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUISLIDERGROUP_HPP__ -#define __URDE_CGUISLIDERGROUP_HPP__ +#pragma once #include "CGuiCompoundWidget.hpp" #include @@ -61,4 +60,3 @@ public: } -#endif // __URDE_CGUISLIDERGROUP_HPP__ diff --git a/Runtime/GuiSys/CGuiSys.hpp b/Runtime/GuiSys/CGuiSys.hpp index 1677bb624..328c5741a 100644 --- a/Runtime/GuiSys/CGuiSys.hpp +++ b/Runtime/GuiSys/CGuiSys.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUISYS_HPP__ -#define __URDE_CGUISYS_HPP__ +#pragma once #include "hecl/hecl.hpp" #include @@ -61,4 +60,3 @@ extern CTextParser* g_TextParser; } -#endif // __URDE_CGUISYS_HPP__ diff --git a/Runtime/GuiSys/CGuiTableGroup.hpp b/Runtime/GuiSys/CGuiTableGroup.hpp index 76324e9d5..57cb1d6a3 100644 --- a/Runtime/GuiSys/CGuiTableGroup.hpp +++ b/Runtime/GuiSys/CGuiTableGroup.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUITABLEGROUP_HPP__ -#define __URDE_CGUITABLEGROUP_HPP__ +#pragma once #include "CGuiCompoundWidget.hpp" @@ -105,4 +104,3 @@ public: } -#endif // __URDE_CGUITABLEGROUP_HPP__ diff --git a/Runtime/GuiSys/CGuiTextPane.hpp b/Runtime/GuiSys/CGuiTextPane.hpp index e1270cff6..26e81bb3e 100644 --- a/Runtime/GuiSys/CGuiTextPane.hpp +++ b/Runtime/GuiSys/CGuiTextPane.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUITEXTPANE_HPP__ -#define __URDE_CGUITEXTPANE_HPP__ +#pragma once #include "CGuiPane.hpp" #include "CGuiTextSupport.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CGUITEXTPANE_HPP__ diff --git a/Runtime/GuiSys/CGuiTextSupport.hpp b/Runtime/GuiSys/CGuiTextSupport.hpp index a60c75a37..1c037e81e 100644 --- a/Runtime/GuiSys/CGuiTextSupport.hpp +++ b/Runtime/GuiSys/CGuiTextSupport.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUITEXTSUPPORT_HPP__ -#define __URDE_CGUITEXTSUPPORT_HPP__ +#pragma once #include "zeus/CColor.hpp" #include "RetroTypes.hpp" @@ -147,4 +146,3 @@ public: } -#endif // __URDE_CGUITEXTSUPPORT_HPP__ diff --git a/Runtime/GuiSys/CGuiWidget.hpp b/Runtime/GuiSys/CGuiWidget.hpp index 20e0ef589..92ce03543 100644 --- a/Runtime/GuiSys/CGuiWidget.hpp +++ b/Runtime/GuiSys/CGuiWidget.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIWIDGET_HPP__ -#define __URDE_CGUIWIDGET_HPP__ +#pragma once #include "IOStreams.hpp" #include "CGuiObject.hpp" @@ -141,4 +140,3 @@ public: } -#endif // __URDE_CGUIWIDGET_HPP__ diff --git a/Runtime/GuiSys/CGuiWidgetDrawParms.hpp b/Runtime/GuiSys/CGuiWidgetDrawParms.hpp index b81e7122f..02efe19ff 100644 --- a/Runtime/GuiSys/CGuiWidgetDrawParms.hpp +++ b/Runtime/GuiSys/CGuiWidgetDrawParms.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIWIDGETDRAWPARMS_HPP__ -#define __URDE_CGUIWIDGETDRAWPARMS_HPP__ +#pragma once #include "zeus/CVector3f.hpp" @@ -19,4 +18,3 @@ struct CGuiWidgetDrawParms } -#endif // __URDE_CGUIWIDGETDRAWPARMS_HPP__ diff --git a/Runtime/GuiSys/CGuiWidgetIdDB.hpp b/Runtime/GuiSys/CGuiWidgetIdDB.hpp index 6ce9b7b76..5eba91134 100644 --- a/Runtime/GuiSys/CGuiWidgetIdDB.hpp +++ b/Runtime/GuiSys/CGuiWidgetIdDB.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUIWIDGETIDDB_HPP__ -#define __URDE_CGUIWIDGETIDDB_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -20,4 +19,3 @@ public: } -#endif // __URDE_CGUIWIDGETIDDB_HPP__ diff --git a/Runtime/GuiSys/CHudBallInterface.hpp b/Runtime/GuiSys/CHudBallInterface.hpp index bda75f0a4..f28871665 100644 --- a/Runtime/GuiSys/CHudBallInterface.hpp +++ b/Runtime/GuiSys/CHudBallInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDBALLINTERFACE_HPP__ -#define __URDE_CHUDBALLINTERFACE_HPP__ +#pragma once #include "rstl.hpp" #include "zeus/CVector3f.hpp" @@ -37,4 +36,3 @@ public: } -#endif // __URDE_CHUDBALLINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudBossEnergyInterface.hpp b/Runtime/GuiSys/CHudBossEnergyInterface.hpp index 266f42b9e..56aff1306 100644 --- a/Runtime/GuiSys/CHudBossEnergyInterface.hpp +++ b/Runtime/GuiSys/CHudBossEnergyInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDBOSSENERGYINTERFACE_HPP__ -#define __URDE_CHUDBOSSENERGYINTERFACE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -32,4 +31,3 @@ public: } -#endif // __URDE_CHUDBOSSENERGYINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudDecoInterface.hpp b/Runtime/GuiSys/CHudDecoInterface.hpp index a3802d0bf..3bfe3c9f4 100644 --- a/Runtime/GuiSys/CHudDecoInterface.hpp +++ b/Runtime/GuiSys/CHudDecoInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDDECOINTERFACE_HPP__ -#define __URDE_CHUDDECOINTERFACE_HPP__ +#pragma once #include "zeus/CMatrix3f.hpp" #include "zeus/CQuaternion.hpp" @@ -191,4 +190,3 @@ public: } -#endif // __URDE_CHUDDECOINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudEnergyInterface.hpp b/Runtime/GuiSys/CHudEnergyInterface.hpp index 246afda4d..feb21d7be 100644 --- a/Runtime/GuiSys/CHudEnergyInterface.hpp +++ b/Runtime/GuiSys/CHudEnergyInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDENERGYINTERFACE_HPP__ -#define __URDE_CHUDENERGYINTERFACE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CHudInterface.hpp" @@ -54,4 +53,3 @@ public: } -#endif // __URDE_CHUDENERGYINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudFreeLookInterface.hpp b/Runtime/GuiSys/CHudFreeLookInterface.hpp index ba3fba388..1969a4d86 100644 --- a/Runtime/GuiSys/CHudFreeLookInterface.hpp +++ b/Runtime/GuiSys/CHudFreeLookInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDFREELOOKINTERFACE_HPP__ -#define __URDE_CHUDFREELOOKINTERFACE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CHudInterface.hpp" @@ -85,4 +84,3 @@ public: } -#endif // __URDE_CHUDFREELOOKINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudHelmetInterface.hpp b/Runtime/GuiSys/CHudHelmetInterface.hpp index b708b9e3f..492ad8015 100644 --- a/Runtime/GuiSys/CHudHelmetInterface.hpp +++ b/Runtime/GuiSys/CHudHelmetInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDHELMETINTERFACE_HPP__ -#define __URDE_CHUDHELMETINTERFACE_HPP__ +#pragma once #include "zeus/CMatrix3f.hpp" #include "RetroTypes.hpp" @@ -46,4 +45,3 @@ public: } -#endif // __URDE_CHUDHELMETINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudInterface.hpp b/Runtime/GuiSys/CHudInterface.hpp index e8d5bbf43..743df8490 100644 --- a/Runtime/GuiSys/CHudInterface.hpp +++ b/Runtime/GuiSys/CHudInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDINTERFACE_HPP__ -#define __URDE_CHUDINTERFACE_HPP__ +#pragma once namespace urde { @@ -15,4 +14,3 @@ enum class EHudType } -#endif // __URDE_CHUDINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudMissileInterface.hpp b/Runtime/GuiSys/CHudMissileInterface.hpp index 0535f86d3..72102e8e3 100644 --- a/Runtime/GuiSys/CHudMissileInterface.hpp +++ b/Runtime/GuiSys/CHudMissileInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDMISSILEINTERFACE_HPP__ -#define __URDE_CHUDMISSILEINTERFACE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CHudInterface.hpp" @@ -73,4 +72,3 @@ public: } -#endif // __URDE_CHUDMISSILEINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudRadarInterface.hpp b/Runtime/GuiSys/CHudRadarInterface.hpp index 659889dfe..fff365651 100644 --- a/Runtime/GuiSys/CHudRadarInterface.hpp +++ b/Runtime/GuiSys/CHudRadarInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDRADARINTERFACE_HPP__ -#define __URDE_CHUDRADARINTERFACE_HPP__ +#pragma once #include "CToken.hpp" #include "Graphics/CTexture.hpp" @@ -46,4 +45,3 @@ public: } -#endif // __URDE_CHUDRADARINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudThreatInterface.hpp b/Runtime/GuiSys/CHudThreatInterface.hpp index 39732fcb4..a00e8b364 100644 --- a/Runtime/GuiSys/CHudThreatInterface.hpp +++ b/Runtime/GuiSys/CHudThreatInterface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDTHREATINTERFACE_HPP__ -#define __URDE_CHUDTHREATINTERFACE_HPP__ +#pragma once #include "CHudInterface.hpp" #include "RetroTypes.hpp" @@ -56,4 +55,3 @@ public: } -#endif // __URDE_CHUDTHREATINTERFACE_HPP__ diff --git a/Runtime/GuiSys/CHudVisorBeamMenu.hpp b/Runtime/GuiSys/CHudVisorBeamMenu.hpp index 0914d3d6a..31d6b1a3c 100644 --- a/Runtime/GuiSys/CHudVisorBeamMenu.hpp +++ b/Runtime/GuiSys/CHudVisorBeamMenu.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDVISORBEAMMENU_HPP__ -#define __URDE_CHUDVISORBEAMMENU_HPP__ +#pragma once #include "RetroTypes.hpp" #include @@ -70,4 +69,3 @@ public: } -#endif // __URDE_CHUDVISORBEAMMENU_HPP__ diff --git a/Runtime/GuiSys/CInstruction.hpp b/Runtime/GuiSys/CInstruction.hpp index 82d25ae0c..4b03d97f3 100644 --- a/Runtime/GuiSys/CInstruction.hpp +++ b/Runtime/GuiSys/CInstruction.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINSTRUCTION_HPP__ -#define __URDE_CINSTRUCTION_HPP__ +#pragma once #include "CToken.hpp" #include "CGuiTextSupport.hpp" @@ -202,4 +201,3 @@ public: } -#endif // __URDE_CINSTRUCTION_HPP__ diff --git a/Runtime/GuiSys/COrbitPointMarker.hpp b/Runtime/GuiSys/COrbitPointMarker.hpp index 20b8c01c3..cb4495549 100644 --- a/Runtime/GuiSys/COrbitPointMarker.hpp +++ b/Runtime/GuiSys/COrbitPointMarker.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CORBITPOINTMARKER_HPP__ -#define __URDE_CORBITPOINTMARKER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -27,4 +26,3 @@ public: void Draw(const CStateManager& mgr) const; }; } -#endif // __URDE_CORBITPOINTMARKER_HPP__ diff --git a/Runtime/GuiSys/CRasterFont.hpp b/Runtime/GuiSys/CRasterFont.hpp index f477c0523..e66ab78ab 100644 --- a/Runtime/GuiSys/CRasterFont.hpp +++ b/Runtime/GuiSys/CRasterFont.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRASTERFONT_HPP__ -#define __URDE_CRASTERFONT_HPP__ +#pragma once #include "IOStreams.hpp" #include "CToken.hpp" @@ -163,4 +162,3 @@ std::unique_ptr FRasterFontFactory(const SObjectTag& tag, CInputStream& in CObjectReference* selfRef); } -#endif // __URDE_CRASTERFONT_HPP__ diff --git a/Runtime/GuiSys/CSaveableState.hpp b/Runtime/GuiSys/CSaveableState.hpp index 68c40c831..976cba669 100644 --- a/Runtime/GuiSys/CSaveableState.hpp +++ b/Runtime/GuiSys/CSaveableState.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSAVEABLESTATE_HPP__ -#define __URDE_CSAVEABLESTATE_HPP__ +#pragma once #include "CGuiTextSupport.hpp" #include "CDrawStringOptions.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CSAVEABLESTATE_HPP__ diff --git a/Runtime/GuiSys/CScanDisplay.hpp b/Runtime/GuiSys/CScanDisplay.hpp index 60cbcbb2b..7cc3297cf 100644 --- a/Runtime/GuiSys/CScanDisplay.hpp +++ b/Runtime/GuiSys/CScanDisplay.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCANDISPLAY_HPP__ -#define __URDE_CSCANDISPLAY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CColor.hpp" @@ -107,4 +106,3 @@ public: }; } -#endif // __URDE_CSCANDISPLAY_HPP__ diff --git a/Runtime/GuiSys/CSplashScreen.hpp b/Runtime/GuiSys/CSplashScreen.hpp index f1ce1a5d3..df8cc61e4 100644 --- a/Runtime/GuiSys/CSplashScreen.hpp +++ b/Runtime/GuiSys/CSplashScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSPLASHSCREEN_HPP__ -#define __URDE_CSPLASHSCREEN_HPP__ +#pragma once #include "CIOWin.hpp" #include "CToken.hpp" @@ -40,4 +39,3 @@ public: } -#endif // __URDE_CSPLASHSCREEN_HPP__ diff --git a/Runtime/GuiSys/CStringTable.hpp b/Runtime/GuiSys/CStringTable.hpp index d817a36c9..3ac94b1a0 100644 --- a/Runtime/GuiSys/CStringTable.hpp +++ b/Runtime/GuiSys/CStringTable.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSTRINGTABLE_HPP__ -#define __URDE_CSTRINGTABLE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "IFactory.hpp" @@ -25,4 +24,3 @@ public: CFactoryFnReturn FStringTableFactory(const SObjectTag&, CInputStream&, const CVParamTransfer&, CObjectReference* selfRef); } -#endif // __URDE_CSTRINGTABLE_HPP__ diff --git a/Runtime/GuiSys/CTargetingManager.hpp b/Runtime/GuiSys/CTargetingManager.hpp index 31b588347..b83d88d1c 100644 --- a/Runtime/GuiSys/CTargetingManager.hpp +++ b/Runtime/GuiSys/CTargetingManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTARGETINGMANAGER_HPP__ -#define __URDE_CTARGETINGMANAGER_HPP__ +#pragma once #include "CCompoundTargetReticle.hpp" #include "COrbitPointMarker.hpp" @@ -21,4 +20,3 @@ public: }; } -#endif // __URDE_CTARGETINGMANAGER_HPP__ diff --git a/Runtime/GuiSys/CTextExecuteBuffer.hpp b/Runtime/GuiSys/CTextExecuteBuffer.hpp index 8b8c17312..11573c650 100644 --- a/Runtime/GuiSys/CTextExecuteBuffer.hpp +++ b/Runtime/GuiSys/CTextExecuteBuffer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEXTEXECUTEBUFFER_HPP__ -#define __URDE_CTEXTEXECUTEBUFFER_HPP__ +#pragma once #include "CSaveableState.hpp" #include "CGuiTextSupport.hpp" @@ -76,4 +75,3 @@ public: } -#endif // __URDE_CTEXTEXECUTEBUFFER_HPP__ diff --git a/Runtime/GuiSys/CTextParser.hpp b/Runtime/GuiSys/CTextParser.hpp index 917dc221b..055a36355 100644 --- a/Runtime/GuiSys/CTextParser.hpp +++ b/Runtime/GuiSys/CTextParser.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEXTPARSER_HPP__ -#define __URDE_CTEXTPARSER_HPP__ +#pragma once #include "CGuiTextSupport.hpp" @@ -34,4 +33,3 @@ public: } -#endif // __URDE_CTEXTPARSER_HPP__ diff --git a/Runtime/GuiSys/CTextRenderBuffer.hpp b/Runtime/GuiSys/CTextRenderBuffer.hpp index 296ea6595..5522b1976 100644 --- a/Runtime/GuiSys/CTextRenderBuffer.hpp +++ b/Runtime/GuiSys/CTextRenderBuffer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEXTRENDERBUFFER_HPP__ -#define __URDE_CTEXTRENDERBUFFER_HPP__ +#pragma once #include "zeus/CColor.hpp" #include "zeus/CVector2i.hpp" @@ -142,4 +141,3 @@ public: } -#endif // __URDE_CTEXTRENDERBUFFER_HPP__ diff --git a/Runtime/GuiSys/CWordBreakTables.hpp b/Runtime/GuiSys/CWordBreakTables.hpp index 0be6383fb..32acccf7d 100644 --- a/Runtime/GuiSys/CWordBreakTables.hpp +++ b/Runtime/GuiSys/CWordBreakTables.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWORDBREAKTABLES_HPP__ -#define __URDE_CWORDBREAKTABLES_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -15,4 +14,3 @@ public: } -#endif // __URDE_CWORDBREAKTABLES_HPP__ diff --git a/Runtime/IFactory.hpp b/Runtime/IFactory.hpp index f53d5164e..4dc3f6178 100644 --- a/Runtime/IFactory.hpp +++ b/Runtime/IFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IFACTORY_HPP__ -#define __URDE_IFACTORY_HPP__ +#pragma once #include #include @@ -56,4 +55,3 @@ public: } -#endif // __URDE_IFACTORY_HPP__ diff --git a/Runtime/IMain.hpp b/Runtime/IMain.hpp index 4d4211514..96d7fffae 100644 --- a/Runtime/IMain.hpp +++ b/Runtime/IMain.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IMAIN_HPP__ -#define __URDE_IMAIN_HPP__ +#pragma once #include "boo/boo.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp" #include "hecl/Runtime.hpp" @@ -55,4 +54,3 @@ public: }; } -#endif // __URDE_IMAIN_HPP__ diff --git a/Runtime/IOStreams.hpp b/Runtime/IOStreams.hpp index fe96ddd8d..cfd0e83b9 100644 --- a/Runtime/IOStreams.hpp +++ b/Runtime/IOStreams.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IOSTREAMS_HPP__ -#define __URDE_IOSTREAMS_HPP__ +#pragma once #include "GCNTypes.hpp" #include @@ -72,4 +71,3 @@ public: } -#endif // __URDE_IOSTREAMS_HPP__ diff --git a/Runtime/IObj.hpp b/Runtime/IObj.hpp index 31b12ad2d..38d82b287 100644 --- a/Runtime/IObj.hpp +++ b/Runtime/IObj.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IOBJ_HPP__ -#define __URDE_IOBJ_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -36,4 +35,3 @@ public: } -#endif // __URDE_IOBJ_HPP__ diff --git a/Runtime/IObjFactory.hpp b/Runtime/IObjFactory.hpp index 7e6d44038..eee203c1a 100644 --- a/Runtime/IObjFactory.hpp +++ b/Runtime/IObjFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IOBJFACTORY_HPP__ -#define __URDE_IOBJFACTORY_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -15,4 +14,3 @@ public: } -#endif // __URDE_IOBJFACTORY_HPP__ diff --git a/Runtime/IObjectStore.hpp b/Runtime/IObjectStore.hpp index 4250a9dae..61b7d0e1c 100644 --- a/Runtime/IObjectStore.hpp +++ b/Runtime/IObjectStore.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IOBJECTSTORE_HPP__ -#define __URDE_IOBJECTSTORE_HPP__ +#pragma once #include @@ -27,4 +26,3 @@ public: } -#endif // __URDE_IOBJECTSTORE_HPP__ diff --git a/Runtime/IRuntimeMain.hpp b/Runtime/IRuntimeMain.hpp index c11f1b474..9411434ee 100644 --- a/Runtime/IRuntimeMain.hpp +++ b/Runtime/IRuntimeMain.hpp @@ -1,5 +1,4 @@ -#ifndef IRUNTIMEMAIN_HPP -#define IRUNTIMEMAIN_HPP +#pragma once namespace urde { @@ -11,4 +10,3 @@ struct IRuntimeMain }; } -#endif // IRUNTIMEMAIN_HPP diff --git a/Runtime/ITweak.hpp b/Runtime/ITweak.hpp index ffb8bade8..e963d6047 100644 --- a/Runtime/ITweak.hpp +++ b/Runtime/ITweak.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_ITWEAK_HPP__ -#define __URDE_ITWEAK_HPP__ +#pragma once namespace urde { @@ -10,4 +9,3 @@ public: }; } -#endif // __URDE_ITWEAK_HPP__ diff --git a/Runtime/IVParamObj.hpp b/Runtime/IVParamObj.hpp index f0246b2b0..98ac82f88 100644 --- a/Runtime/IVParamObj.hpp +++ b/Runtime/IVParamObj.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IVPARAMOBJ_HPP__ -#define __URDE_IVPARAMOBJ_HPP__ +#pragma once #include #include "IObj.hpp" @@ -40,4 +39,3 @@ public: } -#endif // __URDE_IVPARAMOBJ_HPP__ diff --git a/Runtime/Input/CFinalInput.hpp b/Runtime/Input/CFinalInput.hpp index 86eca47bf..fbdc9fe6b 100644 --- a/Runtime/Input/CFinalInput.hpp +++ b/Runtime/Input/CFinalInput.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFINALINPUT_HPP__ -#define __URDE_CFINALINPUT_HPP__ +#pragma once #include "../RetroTypes.hpp" #include "CKeyboardMouseController.hpp" @@ -155,4 +154,3 @@ struct CFinalInput } -#endif // __URDE_CFINALINPUT_HPP__ diff --git a/Runtime/Input/CInputGenerator.hpp b/Runtime/Input/CInputGenerator.hpp index 82b0a7174..6e1bef186 100644 --- a/Runtime/Input/CInputGenerator.hpp +++ b/Runtime/Input/CInputGenerator.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINPUTGENERATOR_HPP__ -#define __URDE_CINPUTGENERATOR_HPP__ +#pragma once #include #include @@ -244,4 +243,3 @@ public: } -#endif // __URDE_CINPUTGENERATOR_HPP__ diff --git a/Runtime/Input/CKeyboardMouseController.hpp b/Runtime/Input/CKeyboardMouseController.hpp index 42269072e..2c5e6f016 100644 --- a/Runtime/Input/CKeyboardMouseController.hpp +++ b/Runtime/Input/CKeyboardMouseController.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CKEYBOARDMOUSECONTROLLER_HPP__ -#define __URDE_CKEYBOARDMOUSECONTROLLER_HPP__ +#pragma once #include @@ -18,4 +17,3 @@ struct CKeyboardMouseControllerData } -#endif // __URDE_CKEYBOARDMOUSECONTROLLER_HPP__ diff --git a/Runtime/Input/CRumbleGenerator.hpp b/Runtime/Input/CRumbleGenerator.hpp index 68fbe8b0f..de50e9a17 100644 --- a/Runtime/Input/CRumbleGenerator.hpp +++ b/Runtime/Input/CRumbleGenerator.hpp @@ -1,5 +1,4 @@ -#ifndef CRUMBLEGENERATOR_HPP -#define CRUMBLEGENERATOR_HPP +#pragma once #include "CRumbleVoice.hpp" #include "CInputGenerator.hpp" @@ -25,4 +24,3 @@ public: }; } -#endif // CRUMBLEGENERATOR_HPP diff --git a/Runtime/Input/CRumbleManager.hpp b/Runtime/Input/CRumbleManager.hpp index 9cdcaa4a0..d8e06d40e 100644 --- a/Runtime/Input/CRumbleManager.hpp +++ b/Runtime/Input/CRumbleManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRUMBLEMANAGER_HPP__ -#define __URDE_CRUMBLEMANAGER_HPP__ +#pragma once #include "CRumbleGenerator.hpp" #include "zeus/CVector3f.hpp" @@ -26,4 +25,3 @@ public: }; } -#endif // __URDE_CRUMBLEMANAGER_HPP__ diff --git a/Runtime/Input/CRumbleVoice.hpp b/Runtime/Input/CRumbleVoice.hpp index 12fd876e0..3757297d0 100644 --- a/Runtime/Input/CRumbleVoice.hpp +++ b/Runtime/Input/CRumbleVoice.hpp @@ -1,5 +1,4 @@ -#ifndef CRUMBLEVOICE_HPP -#define CRUMBLEVOICE_HPP +#pragma once #include "RetroTypes.hpp" @@ -111,4 +110,3 @@ public: }; } -#endif // CRUMBLEVOICE_HPP diff --git a/Runtime/Input/ControlMapper.hpp b/Runtime/Input/ControlMapper.hpp index bdbcb45cc..4a110d4a6 100644 --- a/Runtime/Input/ControlMapper.hpp +++ b/Runtime/Input/ControlMapper.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCONTROLMAPPER_HPP__ -#define __URDE_CCONTROLMAPPER_HPP__ +#pragma once namespace urde { @@ -116,4 +115,3 @@ public: } -#endif // __URDE_CCONTROLMAPPER_HPP__ diff --git a/Runtime/Input/IController.hpp b/Runtime/Input/IController.hpp index 808e74d55..bb6507ee6 100644 --- a/Runtime/Input/IController.hpp +++ b/Runtime/Input/IController.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_ICONTROLLER_HPP__ -#define __URDE_ICONTROLLER_HPP__ +#pragma once #include "../RetroTypes.hpp" @@ -21,4 +20,3 @@ public: } -#endif // __URDE_ICONTROLLER_HPP__ diff --git a/Runtime/Input/RumbleFxTable.hpp b/Runtime/Input/RumbleFxTable.hpp index 332afff91..87ef159dc 100644 --- a/Runtime/Input/RumbleFxTable.hpp +++ b/Runtime/Input/RumbleFxTable.hpp @@ -1,5 +1,4 @@ -#ifndef RUMBLEFXTABLE_HPP -#define RUMBLEFXTABLE_HPP +#pragma once #include "CRumbleVoice.hpp" @@ -10,4 +9,3 @@ extern const SAdsrData RumbleFxTable[]; } -#endif // RUMBLEFXTABLE_HPP diff --git a/Runtime/MP1/CArtifactDoll.hpp b/Runtime/MP1/CArtifactDoll.hpp index 474d4c654..b70a7b38c 100644 --- a/Runtime/MP1/CArtifactDoll.hpp +++ b/Runtime/MP1/CArtifactDoll.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CARTIFACTDOLL_HPP__ -#define __URDE_CARTIFACTDOLL_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Character/CActorLights.hpp" @@ -36,4 +35,3 @@ public: } } -#endif // __URDE_CARTIFACTDOLL_HPP__ diff --git a/Runtime/MP1/CAudioStateWin.hpp b/Runtime/MP1/CAudioStateWin.hpp index e1749cdf9..2e597279f 100644 --- a/Runtime/MP1/CAudioStateWin.hpp +++ b/Runtime/MP1/CAudioStateWin.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CAUDIOSTATEWIN_HPP__ -#define __URDE_MP1_CAUDIOSTATEWIN_HPP__ +#pragma once #include "../CIOWin.hpp" @@ -14,4 +13,3 @@ public: } -#endif // __URDE_MP1_CAUDIOSTATEWIN_HPP__ diff --git a/Runtime/MP1/CAutoSave.hpp b/Runtime/MP1/CAutoSave.hpp index ec4e070d9..b35450e4d 100644 --- a/Runtime/MP1/CAutoSave.hpp +++ b/Runtime/MP1/CAutoSave.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUTOSAVE_HPP__ -#define __URDE_CAUTOSAVE_HPP__ +#pragma once #include "CIOWin.hpp" @@ -13,4 +12,3 @@ public: CAutoSave(); }; } -#endif // __URDE_CAUTOSAVE_HPP__ diff --git a/Runtime/MP1/CCredits.hpp b/Runtime/MP1/CCredits.hpp index 85778ee1a..c30204181 100644 --- a/Runtime/MP1/CCredits.hpp +++ b/Runtime/MP1/CCredits.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CCREDITS_HPP__ -#define __URDE_MP1_CCREDITS_HPP__ +#pragma once #include "CIOWin.hpp" @@ -17,4 +16,3 @@ public: } -#endif // __URDE_MP1_CCREDITS_HPP__ diff --git a/Runtime/MP1/CFaceplateDecoration.hpp b/Runtime/MP1/CFaceplateDecoration.hpp index fcc66a326..d0837b745 100644 --- a/Runtime/MP1/CFaceplateDecoration.hpp +++ b/Runtime/MP1/CFaceplateDecoration.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFACEPLATEDECORATION_HPP__ -#define __URDE_CFACEPLATEDECORATION_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Graphics/Shaders/CTexturedQuadFilter.hpp" @@ -26,4 +25,3 @@ public: } } -#endif // __URDE_CFACEPLATEDECORATION_HPP__ diff --git a/Runtime/MP1/CFrontEndUI.hpp b/Runtime/MP1/CFrontEndUI.hpp index e8c5a037e..5f1ad6991 100644 --- a/Runtime/MP1/CFrontEndUI.hpp +++ b/Runtime/MP1/CFrontEndUI.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFRONTENDUI_HPP__ -#define __URDE_CFRONTENDUI_HPP__ +#pragma once #include "CIOWin.hpp" #include "CGameDebug.hpp" @@ -467,4 +466,3 @@ public: } } -#endif // __URDE_CFRONTENDUI_HPP__ diff --git a/Runtime/MP1/CFrontEndUITouchBar.hpp b/Runtime/MP1/CFrontEndUITouchBar.hpp index 81fde3640..1a495961c 100644 --- a/Runtime/MP1/CFrontEndUITouchBar.hpp +++ b/Runtime/MP1/CFrontEndUITouchBar.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFRONTENDUITOUCHBAR_HPP__ -#define __URDE_CFRONTENDUITOUCHBAR_HPP__ +#pragma once #include @@ -69,4 +68,3 @@ std::unique_ptr NewFrontEndUITouchBar(); } -#endif // __URDE_CFRONTENDUITOUCHBAR_HPP__ diff --git a/Runtime/MP1/CGBASupport.hpp b/Runtime/MP1/CGBASupport.hpp index fb0405df7..69bad1bed 100644 --- a/Runtime/MP1/CGBASupport.hpp +++ b/Runtime/MP1/CGBASupport.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGBASUPPORT_HPP__ -#define __URDE_CGBASUPPORT_HPP__ +#pragma once #include "CDvdFile.hpp" @@ -53,4 +52,3 @@ public: } -#endif // __URDE_CGBASUPPORT_HPP__ diff --git a/Runtime/MP1/CGameCubeDoll.hpp b/Runtime/MP1/CGameCubeDoll.hpp index 63fcf1876..54edb65e2 100644 --- a/Runtime/MP1/CGameCubeDoll.hpp +++ b/Runtime/MP1/CGameCubeDoll.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMECUBEDOLL_HPP__ -#define __URDE_CGAMECUBEDOLL_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Character/CActorLights.hpp" @@ -32,4 +31,3 @@ public: } } -#endif // __URDE_CGAMECUBEDOLL_HPP__ diff --git a/Runtime/MP1/CInGameGuiManager.hpp b/Runtime/MP1/CInGameGuiManager.hpp index cdf0ad126..7d7c2e997 100644 --- a/Runtime/MP1/CInGameGuiManager.hpp +++ b/Runtime/MP1/CInGameGuiManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINGAMEGUIMANAGER_HPP__ -#define __URDE_CINGAMEGUIMANAGER_HPP__ +#pragma once #include "CToken.hpp" #include "CRandom16.hpp" @@ -150,4 +149,3 @@ public: } } -#endif // __URDE_CINGAMEGUIMANAGER_HPP__ diff --git a/Runtime/MP1/CInGameGuiManagerCommon.hpp b/Runtime/MP1/CInGameGuiManagerCommon.hpp index 2186189c3..6b6832e86 100644 --- a/Runtime/MP1/CInGameGuiManagerCommon.hpp +++ b/Runtime/MP1/CInGameGuiManagerCommon.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINGAMEGUIMANAGERCOMMON_HPP__ -#define __URDE_CINGAMEGUIMANAGERCOMMON_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -19,4 +18,3 @@ enum class EInGameGuiState } -#endif // __URDE_CINGAMEGUIMANAGERCOMMON_HPP__ diff --git a/Runtime/MP1/CInGameTweakManager.hpp b/Runtime/MP1/CInGameTweakManager.hpp index 01402f6eb..7c6c8e014 100644 --- a/Runtime/MP1/CInGameTweakManager.hpp +++ b/Runtime/MP1/CInGameTweakManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINGAMETWEAKMANAGER_HPP__ -#define __URDE_CINGAMETWEAKMANAGER_HPP__ +#pragma once #include "CInGameTweakManagerBase.hpp" @@ -14,4 +13,3 @@ public: } -#endif // __URDE_CINGAMETWEAKMANAGER_HPP__ diff --git a/Runtime/MP1/CInventoryScreen.hpp b/Runtime/MP1/CInventoryScreen.hpp index cf43ce0d2..9d3fba955 100644 --- a/Runtime/MP1/CInventoryScreen.hpp +++ b/Runtime/MP1/CInventoryScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINVENTORYSCREEN_HPP__ -#define __URDE_CINVENTORYSCREEN_HPP__ +#pragma once #include "CInGameGuiManager.hpp" #include "CPauseScreenBase.hpp" @@ -61,4 +60,3 @@ public: } } -#endif // __URDE_CINVENTORYSCREEN_HPP__ diff --git a/Runtime/MP1/CLogBookScreen.hpp b/Runtime/MP1/CLogBookScreen.hpp index 3808e13c4..37613a009 100644 --- a/Runtime/MP1/CLogBookScreen.hpp +++ b/Runtime/MP1/CLogBookScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CLOGBOOKSCREEN_HPP__ -#define __URDE_CLOGBOOKSCREEN_HPP__ +#pragma once #include "CInGameGuiManager.hpp" #include "CPauseScreenBase.hpp" @@ -70,4 +69,3 @@ public: } -#endif // __URDE_CLOGBOOKSCREEN_HPP__ diff --git a/Runtime/MP1/CMFGame.hpp b/Runtime/MP1/CMFGame.hpp index ae0dcebd6..ceb22e9ea 100644 --- a/Runtime/MP1/CMFGame.hpp +++ b/Runtime/MP1/CMFGame.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMFGAME_HPP__ -#define __URDE_CMFGAME_HPP__ +#pragma once #include "CMFGameBase.hpp" #include "CInGameGuiManager.hpp" @@ -91,4 +90,3 @@ public: } } -#endif // __URDE_CMFGAME_HPP__ diff --git a/Runtime/MP1/CMainFlow.hpp b/Runtime/MP1/CMainFlow.hpp index eea81ec4d..164644262 100644 --- a/Runtime/MP1/CMainFlow.hpp +++ b/Runtime/MP1/CMainFlow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMAINFLOW_HPP__ -#define __URDE_CMAINFLOW_HPP__ +#pragma once #include "CMainFlowBase.hpp" @@ -25,4 +24,3 @@ public: } -#endif // __URDE_CMAINFLOW_HPP__ diff --git a/Runtime/MP1/CMemoryCardDriver.hpp b/Runtime/MP1/CMemoryCardDriver.hpp index 3b7f68d99..f1ad73c20 100644 --- a/Runtime/MP1/CMemoryCardDriver.hpp +++ b/Runtime/MP1/CMemoryCardDriver.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMEMORYCARDDRIVER_HPP__ -#define __URDE_CMEMORYCARDDRIVER_HPP__ +#pragma once #include "CMemoryCardSys.hpp" #include "CGameState.hpp" @@ -211,4 +210,3 @@ public: } -#endif // __URDE_CMEMORYCARDDRIVER_HPP__ diff --git a/Runtime/MP1/CMessageScreen.hpp b/Runtime/MP1/CMessageScreen.hpp index 15118b129..e5ac19764 100644 --- a/Runtime/MP1/CMessageScreen.hpp +++ b/Runtime/MP1/CMessageScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMESSAGESCREEN_HPP__ -#define __URDE_CMESSAGESCREEN_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -49,4 +48,3 @@ public: } } -#endif // __URDE_CMESSAGESCREEN_HPP__ diff --git a/Runtime/MP1/COptionsScreen.hpp b/Runtime/MP1/COptionsScreen.hpp index 31766d2fa..917175237 100644 --- a/Runtime/MP1/COptionsScreen.hpp +++ b/Runtime/MP1/COptionsScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_COPTIONSSCREEN_HPP__ -#define __URDE_COPTIONSSCREEN_HPP__ +#pragma once #include "CInGameGuiManager.hpp" #include "CPauseScreenBase.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_COPTIONSSCREEN_HPP__ diff --git a/Runtime/MP1/CPauseScreen.hpp b/Runtime/MP1/CPauseScreen.hpp index 84b7cdfdd..25b9a31f5 100644 --- a/Runtime/MP1/CPauseScreen.hpp +++ b/Runtime/MP1/CPauseScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPAUSESCREEN_HPP__ -#define __URDE_CPAUSESCREEN_HPP__ +#pragma once #include "CInGameGuiManager.hpp" #include "Editor/ProjectResourceFactoryBase.hpp" @@ -79,4 +78,3 @@ public: } } -#endif // __URDE_CPAUSESCREEN_HPP__ diff --git a/Runtime/MP1/CPauseScreenBase.hpp b/Runtime/MP1/CPauseScreenBase.hpp index 435b533cc..c8a6321d8 100644 --- a/Runtime/MP1/CPauseScreenBase.hpp +++ b/Runtime/MP1/CPauseScreenBase.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPAUSESCREENBASE_HPP__ -#define __URDE_CPAUSESCREENBASE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -136,4 +135,3 @@ public: } } -#endif // __URDE_CPAUSESCREENBASE_HPP__ diff --git a/Runtime/MP1/CPauseScreenBlur.hpp b/Runtime/MP1/CPauseScreenBlur.hpp index 7add844df..bfd10b62c 100644 --- a/Runtime/MP1/CPauseScreenBlur.hpp +++ b/Runtime/MP1/CPauseScreenBlur.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPAUSESCREENBLUR_HPP__ -#define __URDE_CPAUSESCREENBLUR_HPP__ +#pragma once #include "CInGameGuiManagerCommon.hpp" #include "CToken.hpp" @@ -59,4 +58,3 @@ public: } } -#endif // __URDE_CPAUSESCREENBLUR_HPP__ diff --git a/Runtime/MP1/CPlayMovie.hpp b/Runtime/MP1/CPlayMovie.hpp index 45b1a24a2..515d12fa0 100644 --- a/Runtime/MP1/CPlayMovie.hpp +++ b/Runtime/MP1/CPlayMovie.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYMOVIE_HPP__ -#define __URDE_CPLAYMOVIE_HPP__ +#pragma once #include "CPlayMovieBase.hpp" #include "RetroTypes.hpp" @@ -41,4 +40,3 @@ public: } -#endif // __URDE_CPLAYMOVIE_HPP__ diff --git a/Runtime/MP1/CPlayerVisor.hpp b/Runtime/MP1/CPlayerVisor.hpp index 40cef8c0e..2247be6f4 100644 --- a/Runtime/MP1/CPlayerVisor.hpp +++ b/Runtime/MP1/CPlayerVisor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYERVISOR_HPP__ -#define __URDE_CPLAYERVISOR_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Camera/CCameraFilter.hpp" @@ -102,4 +101,3 @@ public: } } -#endif // __URDE_CPLAYERVISOR_HPP__ diff --git a/Runtime/MP1/CPreFrontEnd.hpp b/Runtime/MP1/CPreFrontEnd.hpp index 020973c42..bcac54ff8 100644 --- a/Runtime/MP1/CPreFrontEnd.hpp +++ b/Runtime/MP1/CPreFrontEnd.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CPREFRONTEND_HPP__ -#define __URDE_MP1_CPREFRONTEND_HPP__ +#pragma once #include "CIOWin.hpp" @@ -16,4 +15,3 @@ public: } -#endif // __URDE_MP1_CPREFRONTEND_HPP__ diff --git a/Runtime/MP1/CQuitGameScreen.hpp b/Runtime/MP1/CQuitGameScreen.hpp index f9ed96bcb..610ac2a57 100644 --- a/Runtime/MP1/CQuitGameScreen.hpp +++ b/Runtime/MP1/CQuitGameScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CQUITGAMESCREEN_HPP__ -#define __URDE_CQUITGAMESCREEN_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -53,4 +52,3 @@ public: } } -#endif // __URDE_CQUITGAMESCREEN_HPP__ diff --git a/Runtime/MP1/CSamusDoll.hpp b/Runtime/MP1/CSamusDoll.hpp index 74482d370..1c113814d 100644 --- a/Runtime/MP1/CSamusDoll.hpp +++ b/Runtime/MP1/CSamusDoll.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSAMUSDOLL_HPP__ -#define __URDE_CSAMUSDOLL_HPP__ +#pragma once #include "CPlayerState.hpp" #include "CToken.hpp" @@ -113,4 +112,3 @@ public: } } -#endif // __URDE_CSAMUSDOLL_HPP__ diff --git a/Runtime/MP1/CSamusFaceReflection.hpp b/Runtime/MP1/CSamusFaceReflection.hpp index 0e6606563..b7d0d993e 100644 --- a/Runtime/MP1/CSamusFaceReflection.hpp +++ b/Runtime/MP1/CSamusFaceReflection.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSAMUSFACEREFLECTION_HPP__ -#define __URDE_CSAMUSFACEREFLECTION_HPP__ +#pragma once #include "Character/CModelData.hpp" #include "Character/CActorLights.hpp" @@ -24,4 +23,3 @@ public: } -#endif // __URDE_CSAMUSFACEREFLECTION_HPP__ diff --git a/Runtime/MP1/CSamusHud.hpp b/Runtime/MP1/CSamusHud.hpp index c3eafda95..94a10ce11 100644 --- a/Runtime/MP1/CSamusHud.hpp +++ b/Runtime/MP1/CSamusHud.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSAMUSHUD_HPP__ -#define __URDE_CSAMUSHUD_HPP__ +#pragma once #include "CInGameGuiManager.hpp" #include "GuiSys/CTargetingManager.hpp" @@ -272,4 +271,3 @@ public: } } -#endif // __URDE_CSAMUSHUD_HPP__ diff --git a/Runtime/MP1/CSaveGameScreen.hpp b/Runtime/MP1/CSaveGameScreen.hpp index 774b02761..23b599846 100644 --- a/Runtime/MP1/CSaveGameScreen.hpp +++ b/Runtime/MP1/CSaveGameScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSAVEUI_HPP__ -#define __URDE_CSAVEUI_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -122,4 +121,3 @@ public: } } -#endif // __URDE_CSAVEUI_HPP__ diff --git a/Runtime/MP1/CSaveGameScreenTouchBar.hpp b/Runtime/MP1/CSaveGameScreenTouchBar.hpp index d5f29a343..263218c65 100644 --- a/Runtime/MP1/CSaveGameScreenTouchBar.hpp +++ b/Runtime/MP1/CSaveGameScreenTouchBar.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSAVEUITOUCHBAR_HPP__ -#define __URDE_CSAVEUITOUCHBAR_HPP__ +#pragma once #include #include @@ -22,4 +21,3 @@ std::unique_ptr NewSaveUITouchBar(); } -#endif // __URDE_CSAVEUITOUCHBAR_HPP__ diff --git a/Runtime/MP1/CSlideShow.hpp b/Runtime/MP1/CSlideShow.hpp index 5840e92d9..dc5147f25 100644 --- a/Runtime/MP1/CSlideShow.hpp +++ b/Runtime/MP1/CSlideShow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CSLIDESHOW_HPP__ -#define __URDE_MP1_CSLIDESHOW_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CIOWin.hpp" @@ -132,4 +131,3 @@ public: } -#endif // __URDE_MP1_CSLIDESHOW_HPP__ diff --git a/Runtime/MP1/CSplashScreen.hpp b/Runtime/MP1/CSplashScreen.hpp index cf0468e46..f3100a03c 100644 --- a/Runtime/MP1/CSplashScreen.hpp +++ b/Runtime/MP1/CSplashScreen.hpp @@ -1,5 +1,4 @@ -#ifndef __CSPLASHSCREEN_HPP__ -#define __CSPLASHSCREEN_HPP__ +#pragma once #include "CIOWin.hpp" #include "CToken.hpp" @@ -34,4 +33,3 @@ public: }; } -#endif // __CSPLASHSCREEN_HPP__ diff --git a/Runtime/MP1/CStateSetterFlow.hpp b/Runtime/MP1/CStateSetterFlow.hpp index b2cb1e5aa..7908b6fcf 100644 --- a/Runtime/MP1/CStateSetterFlow.hpp +++ b/Runtime/MP1/CStateSetterFlow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CSTATESETTERFLOW_HPP__ -#define __URDE_MP1_CSTATESETTERFLOW_HPP__ +#pragma once #include "CIOWin.hpp" @@ -15,4 +14,3 @@ public: } -#endif // __URDE_MP1_CSTATESETTERFLOW_HPP__ diff --git a/Runtime/MP1/CTweaks.hpp b/Runtime/MP1/CTweaks.hpp index 2d8bc7bf7..24dbed7f1 100644 --- a/Runtime/MP1/CTweaks.hpp +++ b/Runtime/MP1/CTweaks.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTWEAKS_HPP__ -#define __URDE_CTWEAKS_HPP__ +#pragma once #include "RetroTypes.hpp" namespace hecl @@ -23,4 +22,3 @@ public: } } -#endif // __URDE_CTWEAKS_HPP__ diff --git a/Runtime/MP1/MP1.hpp b/Runtime/MP1/MP1.hpp index 77e1eea40..6f1ee975c 100644 --- a/Runtime/MP1/MP1.hpp +++ b/Runtime/MP1/MP1.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_HPP__ -#define __URDE_MP1_HPP__ +#pragma once #define MP1_USE_BOO 0 @@ -342,4 +341,3 @@ public: } } -#endif // __URDE_MP1_HPP__ diff --git a/Runtime/MP1/MP1OriginalIDs.hpp b/Runtime/MP1/MP1OriginalIDs.hpp index 305ef2d6b..d1ee2d9b3 100644 --- a/Runtime/MP1/MP1OriginalIDs.hpp +++ b/Runtime/MP1/MP1OriginalIDs.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_MP1ORIGINALIDS_HPP -#define URDE_MP1ORIGINALIDS_HPP +#pragma once #include "RetroTypes.hpp" #include "IFactory.hpp" @@ -24,4 +23,3 @@ CFactoryFnReturn FMP1OriginalIDsFactory(const SObjectTag& tag, CInputStream& in, } -#endif // URDE_MP1ORIGINALIDS_HPP diff --git a/Runtime/MP1/World/CActorContraption.hpp b/Runtime/MP1/World/CActorContraption.hpp index c5516d21c..be2d58bcf 100644 --- a/Runtime/MP1/World/CActorContraption.hpp +++ b/Runtime/MP1/World/CActorContraption.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CACTORCONTRAPTION_HPP__ -#define __URDE_MP1_CACTORCONTRAPTION_HPP__ +#pragma once #include "World/CScriptActor.hpp" #include "World/CDamageInfo.hpp" @@ -31,4 +30,3 @@ public: } } -#endif // __URDE_MP1_CACTORCONTRAPTION_HPP__ diff --git a/Runtime/MP1/World/CBabygoth.hpp b/Runtime/MP1/World/CBabygoth.hpp index 83f0caa37..dd20e65a9 100644 --- a/Runtime/MP1/World/CBabygoth.hpp +++ b/Runtime/MP1/World/CBabygoth.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CBABYGOTH_HPP__ -#define __URDE_MP1_CBABYGOTH_HPP__ +#pragma once #include "World/CPatterned.hpp" @@ -48,4 +47,3 @@ public: }; } -#endif // __URDE_MP1_CBABYGOTH_HPP__ diff --git a/Runtime/MP1/World/CBeetle.hpp b/Runtime/MP1/World/CBeetle.hpp index a6a0454d9..ba9d0ee5c 100644 --- a/Runtime/MP1/World/CBeetle.hpp +++ b/Runtime/MP1/World/CBeetle.hpp @@ -1,5 +1,4 @@ -#ifndef CBEETLE_HPP -#define CBEETLE_HPP +#pragma once #include "World/CPatterned.hpp" @@ -30,4 +29,3 @@ public: } } -#endif // CBEETLE_HPP diff --git a/Runtime/MP1/World/CFlaahgraProjectile.hpp b/Runtime/MP1/World/CFlaahgraProjectile.hpp index 42394f039..2a89e1ce3 100644 --- a/Runtime/MP1/World/CFlaahgraProjectile.hpp +++ b/Runtime/MP1/World/CFlaahgraProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CFLAAHGRAPROJECTILE_HPP -#define URDE_CFLAAHGRAPROJECTILE_HPP +#pragma once #include "Weapon/CEnergyProjectile.hpp" @@ -16,4 +15,3 @@ public: } -#endif // URDE_CFLAAHGRAPROJECTILE_HPP diff --git a/Runtime/MP1/World/CMetaree.hpp b/Runtime/MP1/World/CMetaree.hpp index 024bc3c23..09dbc209f 100644 --- a/Runtime/MP1/World/CMetaree.hpp +++ b/Runtime/MP1/World/CMetaree.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CMETAREE_HPP -#define URDE_CMETAREE_HPP +#pragma once #include "World/CPatterned.hpp" #include "World/CDamageInfo.hpp" @@ -50,4 +49,3 @@ public: }; } -#endif //URDE_CMETAREE_HPP diff --git a/Runtime/MP1/World/CMetroid.hpp b/Runtime/MP1/World/CMetroid.hpp index 96bf28bf6..85669071e 100644 --- a/Runtime/MP1/World/CMetroid.hpp +++ b/Runtime/MP1/World/CMetroid.hpp @@ -1,5 +1,4 @@ -#ifndef CMETROID_HPP -#define CMETROID_HPP +#pragma once #include "World/CPatterned.hpp" #include "World/CAnimationParameters.hpp" @@ -37,4 +36,3 @@ public: } -#endif // CMETROID_HPP diff --git a/Runtime/MP1/World/CMetroidBeta.hpp b/Runtime/MP1/World/CMetroidBeta.hpp index b58ee1b74..cbc7c2339 100644 --- a/Runtime/MP1/World/CMetroidBeta.hpp +++ b/Runtime/MP1/World/CMetroidBeta.hpp @@ -1,5 +1,4 @@ -#ifndef CMETROIDBETA_HPP -#define CMETROIDBETA_HPP +#pragma once #include "World/CPatterned.hpp" #include "CMetroid.hpp" @@ -20,4 +19,3 @@ public: } -#endif // CMETROIDBETA_HPP diff --git a/Runtime/MP1/World/CMetroidPrimeExo.hpp b/Runtime/MP1/World/CMetroidPrimeExo.hpp index d3761affb..99cbf4a60 100644 --- a/Runtime/MP1/World/CMetroidPrimeExo.hpp +++ b/Runtime/MP1/World/CMetroidPrimeExo.hpp @@ -1,5 +1,4 @@ -#ifndef CMETROIDPRIMEEXO_HPP -#define CMETROIDPRIMEEXO_HPP +#pragma once #include "World/CPatterned.hpp" #include "World/CPatternedInfo.hpp" @@ -119,4 +118,3 @@ public: } } -#endif // CMETROIDPRIMEEXO_HPP diff --git a/Runtime/MP1/World/CMetroidPrimeProjectile.hpp b/Runtime/MP1/World/CMetroidPrimeProjectile.hpp index 6e7df74cd..c7ddd2270 100644 --- a/Runtime/MP1/World/CMetroidPrimeProjectile.hpp +++ b/Runtime/MP1/World/CMetroidPrimeProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CMETROIDPRIMEPROJECTILE_HPP -#define URDE_CMETROIDPRIMEPROJECTILE_HPP +#pragma once #include "Weapon/CEnergyProjectile.hpp" @@ -36,4 +35,3 @@ public: } -#endif // URDE_CMETROIDPRIMEPROJECTILE_HPP diff --git a/Runtime/MP1/World/CMetroidPrimeRelay.hpp b/Runtime/MP1/World/CMetroidPrimeRelay.hpp index 41ea29afb..1dcb43796 100644 --- a/Runtime/MP1/World/CMetroidPrimeRelay.hpp +++ b/Runtime/MP1/World/CMetroidPrimeRelay.hpp @@ -1,5 +1,4 @@ -#ifndef CMETROIDPRIMERELAY_HPP -#define CMETROIDPRIMERELAY_HPP +#pragma once #include "World/CEntity.hpp" #include "CMetroidPrimeExo.hpp" @@ -38,4 +37,3 @@ public: } -#endif // CMETROIDPRIMERELAY_HPP diff --git a/Runtime/MP1/World/CNewIntroBoss.hpp b/Runtime/MP1/World/CNewIntroBoss.hpp index 2bea24899..f90a56814 100644 --- a/Runtime/MP1/World/CNewIntroBoss.hpp +++ b/Runtime/MP1/World/CNewIntroBoss.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CNEWINTROBOSS_HPP__ -#define __URDE_MP1_CNEWINTROBOSS_HPP__ +#pragma once #include "World/CPatterned.hpp" @@ -25,4 +24,3 @@ public: } } -#endif // __URDE_MP1_CNEWINTROBOSS_HPP__ diff --git a/Runtime/MP1/World/CParasite.hpp b/Runtime/MP1/World/CParasite.hpp index 1835d79fc..5e223f830 100644 --- a/Runtime/MP1/World/CParasite.hpp +++ b/Runtime/MP1/World/CParasite.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CPARASITE_HPP__ -#define __URDE_MP1_CPARASITE_HPP__ +#pragma once #include "World/CWallWalker.hpp" #include "Collision/CCollisionActorManager.hpp" @@ -115,4 +114,3 @@ public: void AlignToFloor(CStateManager&, float, const zeus::CVector3f&, float); }; } -#endif // __URDE_MP1_CPARASITE_HPP__ diff --git a/Runtime/MP1/World/CPuddleToadGamma.hpp b/Runtime/MP1/World/CPuddleToadGamma.hpp index 9404d28f3..b08babf9c 100644 --- a/Runtime/MP1/World/CPuddleToadGamma.hpp +++ b/Runtime/MP1/World/CPuddleToadGamma.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CPUDDLETOADGAMMA_HPP__ -#define __URDE_MP1_CPUDDLETOADGAMMA_HPP__ +#pragma once #include "World/CPatterned.hpp" @@ -18,4 +17,3 @@ public: } -#endif // __URDE_MP1_CPUDDLETOADGAMMA_HPP__ diff --git a/Runtime/MP1/World/CRidley.hpp b/Runtime/MP1/World/CRidley.hpp index d6a02b3a3..5a50881f4 100644 --- a/Runtime/MP1/World/CRidley.hpp +++ b/Runtime/MP1/World/CRidley.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CRIDLEY_HPP__ -#define __URDE_MP1_CRIDLEY_HPP__ +#pragma once #include "Camera/CCameraShakeData.hpp" #include "Weapon/CBeamInfo.hpp" @@ -70,4 +69,3 @@ public: }; } } -#endif // __URDE_MP1_CRIDLEY_HPP__ diff --git a/Runtime/MP1/World/CSeedling.hpp b/Runtime/MP1/World/CSeedling.hpp index 70b584393..f703ccd91 100644 --- a/Runtime/MP1/World/CSeedling.hpp +++ b/Runtime/MP1/World/CSeedling.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CSEEDLING_HPP__ -#define __URDE_MP1_CSEEDLING_HPP__ +#pragma once #include "World/CWallWalker.hpp" @@ -20,4 +19,3 @@ public: }; } } -#endif // __URDE_MP1_CSEEDLING_HPP__ diff --git a/Runtime/MP1/World/CSpacePirate.hpp b/Runtime/MP1/World/CSpacePirate.hpp index 6df62bbe7..35ad21d8c 100644 --- a/Runtime/MP1/World/CSpacePirate.hpp +++ b/Runtime/MP1/World/CSpacePirate.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CSPACEPIRATE_HPP__ -#define __URDE_MP1_CSPACEPIRATE_HPP__ +#pragma once #include "World/CPatterned.hpp" #include "Weapon/CProjectileInfo.hpp" @@ -80,4 +79,3 @@ public: void Accept(IVisitor &visitor); }; } -#endif // __URDE_MP1_CSPACEPIRATE_HPP__ diff --git a/Runtime/MP1/World/CThardusRockProjectile.hpp b/Runtime/MP1/World/CThardusRockProjectile.hpp index 957f508f7..306b252b9 100644 --- a/Runtime/MP1/World/CThardusRockProjectile.hpp +++ b/Runtime/MP1/World/CThardusRockProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_MP1_CTHARDUSROCKPROJECTILE_HPP__ -#define __URDE_MP1_CTHARDUSROCKPROJECTILE_HPP__ +#pragma once #include "World/CPatterned.hpp" @@ -17,4 +16,3 @@ public: } -#endif // __URDE_MP1_CTHARDUSROCKPROJECTILE_HPP__ diff --git a/Runtime/MP1/World/CWarWasp.hpp b/Runtime/MP1/World/CWarWasp.hpp index 797eb4aa4..e6e407c2c 100644 --- a/Runtime/MP1/World/CWarWasp.hpp +++ b/Runtime/MP1/World/CWarWasp.hpp @@ -1,5 +1,4 @@ -#ifndef CWARWASP_HPP -#define CWARWASP_HPP +#pragma once #include "World/CPatterned.hpp" @@ -22,4 +21,3 @@ public: } } -#endif // CWARWASP_HPP diff --git a/Runtime/MkCastTo.py b/Runtime/MkCastTo.py index cc8a36be7..f08014a98 100644 --- a/Runtime/MkCastTo.py +++ b/Runtime/MkCastTo.py @@ -86,8 +86,7 @@ def getqualified(tp): headerf = open('TCastTo.hpp', 'w') sourcef = open('TCastTo.cpp', 'w') -headerf.write('''#ifndef __TCASTTO_HPP__ -#define __TCASTTO_HPP__ +headerf.write('''#pragma once namespace urde { @@ -153,8 +152,6 @@ public: }; } - -#endif // __TCASTTO_HPP__ ''') headerf.close() diff --git a/Runtime/Particle/CColorElement.hpp b/Runtime/Particle/CColorElement.hpp index 92323b5ed..43e5e9337 100644 --- a/Runtime/Particle/CColorElement.hpp +++ b/Runtime/Particle/CColorElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CCOLORELEMENT_HPP__ -#define __URDE_CCOLORELEMENT_HPP__ +#pragma once #include "IElement.hpp" @@ -101,4 +100,3 @@ public: }; } -#endif // __URDE_CCOLORELEMENT_HPP__ diff --git a/Runtime/Particle/CDecal.hpp b/Runtime/Particle/CDecal.hpp index 3bc8724ac..2f6c80cdf 100644 --- a/Runtime/Particle/CDecal.hpp +++ b/Runtime/Particle/CDecal.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDECAL_HPP__ -#define __URDE_CDECAL_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -72,4 +71,3 @@ public: }; } -#endif // __URDE_CDECAL_HPP__ diff --git a/Runtime/Particle/CDecalDataFactory.hpp b/Runtime/Particle/CDecalDataFactory.hpp index 612316c4f..b19052c69 100644 --- a/Runtime/Particle/CDecalDataFactory.hpp +++ b/Runtime/Particle/CDecalDataFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDECALDATAFACTORY_HPP__ -#define __URDE_CDECALDATAFACTORY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -25,4 +24,3 @@ public: CFactoryFnReturn FDecalDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference*); } -#endif // __URDE_CDECALDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CDecalDescription.hpp b/Runtime/Particle/CDecalDescription.hpp index 5775042f3..8704c95fb 100644 --- a/Runtime/Particle/CDecalDescription.hpp +++ b/Runtime/Particle/CDecalDescription.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDECALDESCRIPTION_HPP__ -#define __URDE_CDECALDESCRIPTION_HPP__ +#pragma once #include "CRealElement.hpp" #include "CIntElement.hpp" @@ -40,4 +39,3 @@ public: }; } -#endif // __URDE_CDECALDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CDecalManager.hpp b/Runtime/Particle/CDecalManager.hpp index fafa981fd..d88628eeb 100644 --- a/Runtime/Particle/CDecalManager.hpp +++ b/Runtime/Particle/CDecalManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDECALMANAGER_HPP__ -#define __URDE_CDECALMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "rstl.hpp" @@ -45,4 +44,3 @@ public: } -#endif // __URDE_CDECALMANAGER_HPP__ diff --git a/Runtime/Particle/CElectricDescription.hpp b/Runtime/Particle/CElectricDescription.hpp index ef93a81bc..6db0dc851 100644 --- a/Runtime/Particle/CElectricDescription.hpp +++ b/Runtime/Particle/CElectricDescription.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CELECTRICDESCRIPTION_HPP__ -#define __URDE_CELECTRICDESCRIPTION_HPP__ +#pragma once #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -37,4 +36,3 @@ public: }; } -#endif // __URDE_CELECTRICDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CElementGen.hpp b/Runtime/Particle/CElementGen.hpp index c317cb100..3d4b919e0 100644 --- a/Runtime/Particle/CElementGen.hpp +++ b/Runtime/Particle/CElementGen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CELEMENTGEN_HPP__ -#define __URDE_CELEMENTGEN_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CTransform.hpp" @@ -248,4 +247,3 @@ ENABLE_BITWISE_ENUM(CElementGen::EOptionalSystemFlags) } -#endif // __URDE_CELEMENTGEN_HPP__ diff --git a/Runtime/Particle/CEmitterElement.hpp b/Runtime/Particle/CEmitterElement.hpp index 1e46f6923..c2a896bd2 100644 --- a/Runtime/Particle/CEmitterElement.hpp +++ b/Runtime/Particle/CEmitterElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CEMITTERELEMENT_HPP__ -#define __URDE_CEMITTERELEMENT_HPP__ +#pragma once #include "IElement.hpp" @@ -52,4 +51,3 @@ public: } -#endif // __URDE_CEMITTERELEMENT_HPP__ diff --git a/Runtime/Particle/CFlameWarp.hpp b/Runtime/Particle/CFlameWarp.hpp index 9ff4b5957..f8af860d8 100644 --- a/Runtime/Particle/CFlameWarp.hpp +++ b/Runtime/Particle/CFlameWarp.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLAMEWARP_HPP__ -#define __URDE_CFLAMEWARP_HPP__ +#pragma once #include "CWarp.hpp" @@ -39,4 +38,3 @@ public: }; } -#endif // __URDE_CFLAMEWARP_HPP__ diff --git a/Runtime/Particle/CGenDescription.hpp b/Runtime/Particle/CGenDescription.hpp index 88922c08e..d3488e047 100644 --- a/Runtime/Particle/CGenDescription.hpp +++ b/Runtime/Particle/CGenDescription.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGENDESCRIPTION_HPP__ -#define __URDE_CGENDESCRIPTION_HPP__ +#pragma once #include #include "CRealElement.hpp" @@ -112,4 +111,3 @@ public: } -#endif // __URDE_CGENDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CIntElement.hpp b/Runtime/Particle/CIntElement.hpp index 33333bbb0..3eb2bd9c7 100644 --- a/Runtime/Particle/CIntElement.hpp +++ b/Runtime/Particle/CIntElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CINTELEMENT_HPP__ -#define __URDE_CINTELEMENT_HPP__ +#pragma once #include "IElement.hpp" @@ -215,4 +214,3 @@ public: } -#endif // __URDE_CINTELEMENT_HPP__ diff --git a/Runtime/Particle/CModVectorElement.hpp b/Runtime/Particle/CModVectorElement.hpp index 6c4a93fb0..771fb6cb8 100644 --- a/Runtime/Particle/CModVectorElement.hpp +++ b/Runtime/Particle/CModVectorElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMODVECTORELEMENT_HPP__ -#define __URDE_CMODVECTORELEMENT_HPP__ +#pragma once #include "IElement.hpp" @@ -169,4 +168,3 @@ public: } -#endif // __URDE_CMODVECTORELEMENT_HPP__ diff --git a/Runtime/Particle/CParticleDataFactory.hpp b/Runtime/Particle/CParticleDataFactory.hpp index b90ac2b03..e150aebb3 100644 --- a/Runtime/Particle/CParticleDataFactory.hpp +++ b/Runtime/Particle/CParticleDataFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEDATAFACTORY_HPP__ -#define __URDE_CPARTICLEDATAFACTORY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -106,4 +105,3 @@ CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in, const } -#endif // __URDE_CPARTICLEDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CParticleElectric.hpp b/Runtime/Particle/CParticleElectric.hpp index 41307dfa3..84d9ed48d 100644 --- a/Runtime/Particle/CParticleElectric.hpp +++ b/Runtime/Particle/CParticleElectric.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEELECTRIC_HPP__ -#define __URDE_CPARTICLEELECTRIC_HPP__ +#pragma once #include "CParticleGen.hpp" #include "CToken.hpp" @@ -144,4 +143,3 @@ public: } -#endif // __URDE_CPARTICLEELECTRIC_HPP__ diff --git a/Runtime/Particle/CParticleElectricDataFactory.hpp b/Runtime/Particle/CParticleElectricDataFactory.hpp index 2bc4fb49f..70cf5b487 100644 --- a/Runtime/Particle/CParticleElectricDataFactory.hpp +++ b/Runtime/Particle/CParticleElectricDataFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__ -#define __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -24,4 +23,3 @@ CFactoryFnReturn FParticleElectricDataFactory(const SObjectTag& tag, CInputStrea CObjectReference*); } -#endif // __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CParticleGen.hpp b/Runtime/Particle/CParticleGen.hpp index 8cf270129..dd913f67d 100644 --- a/Runtime/Particle/CParticleGen.hpp +++ b/Runtime/Particle/CParticleGen.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEGEN_HPP__ -#define __URDE_CPARTICLEGEN_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Graphics/CLight.hpp" @@ -66,4 +65,3 @@ public: } -#endif // __URDE_CPARTICLEGEN_HPP__ diff --git a/Runtime/Particle/CParticleGlobals.hpp b/Runtime/Particle/CParticleGlobals.hpp index c04299f52..4665729d0 100644 --- a/Runtime/Particle/CParticleGlobals.hpp +++ b/Runtime/Particle/CParticleGlobals.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLEGLOBALS_HPP__ -#define __URDE_CPARTICLEGLOBALS_HPP__ +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/CVector4f.hpp" @@ -85,4 +84,3 @@ struct SParticleUniforms } -#endif // __URDE_CPARTICLEGLOBALS_HPP__ diff --git a/Runtime/Particle/CParticleSwoosh.hpp b/Runtime/Particle/CParticleSwoosh.hpp index e59e3130c..b7c9e8034 100644 --- a/Runtime/Particle/CParticleSwoosh.hpp +++ b/Runtime/Particle/CParticleSwoosh.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLESWOOSH_HPP__ -#define __URDE_CPARTICLESWOOSH_HPP__ +#pragma once #include "CParticleGen.hpp" #include "CToken.hpp" @@ -224,4 +223,3 @@ public: } -#endif // __URDE_CPARTICLESWOOSH_HPP__ diff --git a/Runtime/Particle/CParticleSwooshDataFactory.hpp b/Runtime/Particle/CParticleSwooshDataFactory.hpp index 098d43f06..c03f806f8 100644 --- a/Runtime/Particle/CParticleSwooshDataFactory.hpp +++ b/Runtime/Particle/CParticleSwooshDataFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__ -#define __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -23,4 +22,3 @@ CFactoryFnReturn FParticleSwooshDataFactory(const SObjectTag& tag, CInputStream& CObjectReference*); } -#endif // __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.hpp b/Runtime/Particle/CProjectileWeaponDataFactory.hpp index 2e1c4e312..32e972d67 100644 --- a/Runtime/Particle/CProjectileWeaponDataFactory.hpp +++ b/Runtime/Particle/CProjectileWeaponDataFactory.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__ -#define __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -24,4 +23,3 @@ CFactoryFnReturn FProjectileWeaponDataFactory(const SObjectTag& tag, CInputStrea CObjectReference*); } -#endif // __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CRealElement.hpp b/Runtime/Particle/CRealElement.hpp index 7f305e858..9d3bd80c7 100644 --- a/Runtime/Particle/CRealElement.hpp +++ b/Runtime/Particle/CRealElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CREALELEMENT_HPP__ -#define __URDE_CREALELEMENT_HPP__ +#pragma once #include "IElement.hpp" @@ -376,4 +375,3 @@ public: }; } -#endif // __URDE_CREALELEMENT_HPP__ diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.hpp b/Runtime/Particle/CSpawnSystemKeyframeData.hpp index 08fc523e2..da8e34130 100644 --- a/Runtime/Particle/CSpawnSystemKeyframeData.hpp +++ b/Runtime/Particle/CSpawnSystemKeyframeData.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ -#define __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ +#pragma once #include "IOStreams.hpp" #include "CToken.hpp" @@ -40,4 +39,3 @@ public: } -#endif // __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ diff --git a/Runtime/Particle/CSwooshDescription.hpp b/Runtime/Particle/CSwooshDescription.hpp index 24780d536..adef52387 100644 --- a/Runtime/Particle/CSwooshDescription.hpp +++ b/Runtime/Particle/CSwooshDescription.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSWOOSHDESCRIPTION_HPP__ -#define __URDE_CSWOOSHDESCRIPTION_HPP__ +#pragma once #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -49,4 +48,3 @@ public: }; } -#endif // __URDE_CSWOOSHDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CUVElement.hpp b/Runtime/Particle/CUVElement.hpp index 923638279..0920dd363 100644 --- a/Runtime/Particle/CUVElement.hpp +++ b/Runtime/Particle/CUVElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CUVELEMENT_HPP__ -#define __URDE_CUVELEMENT_HPP__ +#pragma once #include "IElement.hpp" #include "CToken.hpp" @@ -69,4 +68,3 @@ public: } -#endif // __URDE_CUVELEMENT_HPP__ diff --git a/Runtime/Particle/CVectorElement.hpp b/Runtime/Particle/CVectorElement.hpp index 699ba3090..d1e19222b 100644 --- a/Runtime/Particle/CVectorElement.hpp +++ b/Runtime/Particle/CVectorElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CVECTORELEMENT_HPP__ -#define __URDE_CVECTORELEMENT_HPP__ +#pragma once #include "IElement.hpp" @@ -216,4 +215,3 @@ public: } -#endif // __URDE_CVECTORELEMENT_HPP__ diff --git a/Runtime/Particle/CWarp.hpp b/Runtime/Particle/CWarp.hpp index 649a9ac25..5ec6f5070 100644 --- a/Runtime/Particle/CWarp.hpp +++ b/Runtime/Particle/CWarp.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWARP_HPP__ -#define __URDE_CWARP_HPP__ +#pragma once #include "zeus/CColor.hpp" #include "zeus/CVector3f.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CWARP_HPP__ diff --git a/Runtime/Particle/CWeaponDescription.hpp b/Runtime/Particle/CWeaponDescription.hpp index cf97cb6b8..6a30bbe62 100644 --- a/Runtime/Particle/CWeaponDescription.hpp +++ b/Runtime/Particle/CWeaponDescription.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWEAPONDESCRIPTION_HPP__ -#define __URDE_CWEAPONDESCRIPTION_HPP__ +#pragma once #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -58,4 +57,3 @@ public: std::unique_ptr xb0_FOFF; }; } -#endif // __URDE_CWEAPONDESCRIPTION_HPP__ diff --git a/Runtime/Particle/IElement.hpp b/Runtime/Particle/IElement.hpp index 815f07b9c..84f0cbc45 100644 --- a/Runtime/Particle/IElement.hpp +++ b/Runtime/Particle/IElement.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IELEMENT_HPP__ -#define __URDE_IELEMENT_HPP__ +#pragma once #include #include "GCNTypes.hpp" @@ -57,4 +56,3 @@ public: } -#endif // __URDE_IELEMENT_HPP__ diff --git a/Runtime/RetroTypes.hpp b/Runtime/RetroTypes.hpp index a50b4c685..e09d5d224 100644 --- a/Runtime/RetroTypes.hpp +++ b/Runtime/RetroTypes.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_TYPES_HPP__ -#define __URDE_TYPES_HPP__ +#pragma once #include #include @@ -183,4 +182,3 @@ struct hash }; } -#endif // __URDE_TYPES_HPP__ diff --git a/Runtime/Weapon/CAuxWeapon.hpp b/Runtime/Weapon/CAuxWeapon.hpp index 592b5d77b..1f9842679 100644 --- a/Runtime/Weapon/CAuxWeapon.hpp +++ b/Runtime/Weapon/CAuxWeapon.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAUXWEAPON_HPP__ -#define __URDE_CAUXWEAPON_HPP__ +#pragma once #include "CPlayerState.hpp" #include "RetroTypes.hpp" @@ -54,4 +53,3 @@ public: } -#endif // __URDE_CAUXWEAPON_HPP__ diff --git a/Runtime/Weapon/CBeamInfo.hpp b/Runtime/Weapon/CBeamInfo.hpp index 19bf604c3..8490dc1aa 100644 --- a/Runtime/Weapon/CBeamInfo.hpp +++ b/Runtime/Weapon/CBeamInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBEAMINFO_HPP__ -#define __URDE_CBEAMINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "IOStreams.hpp" @@ -50,4 +49,3 @@ struct CBeamInfo }; } -#endif // __URDE_CBEAMINFO_HPP__ diff --git a/Runtime/Weapon/CBeamProjectile.hpp b/Runtime/Weapon/CBeamProjectile.hpp index a6bc91494..c09d62760 100644 --- a/Runtime/Weapon/CBeamProjectile.hpp +++ b/Runtime/Weapon/CBeamProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBEAMPROJECTILE_HPP__ -#define __URDE_CBEAMPROJECTILE_HPP__ +#pragma once #include "Weapon/CGameProjectile.hpp" namespace urde @@ -49,4 +48,3 @@ public: virtual void UpdateFX(const zeus::CTransform&, float, CStateManager&); }; } -#endif // __URDE_CBEAMPROJECTILE_HPP__ diff --git a/Runtime/Weapon/CBomb.hpp b/Runtime/Weapon/CBomb.hpp index 77623e2eb..66d1ef2b3 100644 --- a/Runtime/Weapon/CBomb.hpp +++ b/Runtime/Weapon/CBomb.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBOMB_HPP__ -#define __URDE_CBOMB_HPP__ +#pragma once #include "CWeapon.hpp" #include "CToken.hpp" @@ -40,4 +39,3 @@ public: } -#endif // __URDE_CBOMB_HPP__ diff --git a/Runtime/Weapon/CBurstFire.hpp b/Runtime/Weapon/CBurstFire.hpp index 646077e44..31fd6abea 100644 --- a/Runtime/Weapon/CBurstFire.hpp +++ b/Runtime/Weapon/CBurstFire.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CBURSTFIRE_HPP__ -#define __URDE_CBURSTFIRE_HPP__ +#pragma once #include "CStateManager.hpp" @@ -54,4 +53,3 @@ public: void SetFirstBurstIndex(s32); }; } -#endif // __URDE_CBURSTFIRE_HPP__ diff --git a/Runtime/Weapon/CEnergyProjectile.hpp b/Runtime/Weapon/CEnergyProjectile.hpp index 6d176fbe7..b3ee52d16 100644 --- a/Runtime/Weapon/CEnergyProjectile.hpp +++ b/Runtime/Weapon/CEnergyProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CENERGYPROJECTILE_HPP__ -#define __URDE_CENERGYPROJECTILE_HPP__ +#pragma once #include "CGameProjectile.hpp" #include "Camera/CCameraShakeData.hpp" @@ -50,4 +49,3 @@ public: } -#endif // __URDE_CENERGYPROJECTILE_HPP__ diff --git a/Runtime/Weapon/CFidget.hpp b/Runtime/Weapon/CFidget.hpp index 5791456e5..117ba1f09 100644 --- a/Runtime/Weapon/CFidget.hpp +++ b/Runtime/Weapon/CFidget.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFIDGET_HPP__ -#define __URDE_CFIDGET_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CGunMotion.hpp" @@ -50,4 +49,3 @@ public: } -#endif // __URDE_CFIDGET_HPP__ diff --git a/Runtime/Weapon/CFlameInfo.hpp b/Runtime/Weapon/CFlameInfo.hpp index ec5d369ab..196f9b12a 100644 --- a/Runtime/Weapon/CFlameInfo.hpp +++ b/Runtime/Weapon/CFlameInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLAMEINFO_HPP__ -#define __URDE_CFLAMEINFO_HPP__ +#pragma once #include "Weapon/CGameProjectile.hpp" @@ -22,4 +21,3 @@ public: CAssetId GetFlameFxId() const { return x8_flameFxId; } }; } -#endif // __URDE_CFLAMEINFO_HPP__ diff --git a/Runtime/Weapon/CFlameThrower.hpp b/Runtime/Weapon/CFlameThrower.hpp index d3d34fdb5..e547d03d6 100644 --- a/Runtime/Weapon/CFlameThrower.hpp +++ b/Runtime/Weapon/CFlameThrower.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLAMETHROWER_HPP__ -#define __URDE_CFLAMETHROWER_HPP__ +#pragma once #include "Weapon/CGameProjectile.hpp" @@ -37,4 +36,3 @@ public: bool GetX400_25() const { return x400_25; } }; } -#endif // __URDE_CFLAMETHROWER_HPP__ diff --git a/Runtime/Weapon/CGSComboFire.hpp b/Runtime/Weapon/CGSComboFire.hpp index 103136d2a..14057fcab 100644 --- a/Runtime/Weapon/CGSComboFire.hpp +++ b/Runtime/Weapon/CGSComboFire.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGSCOMBOFIRE_HPP__ -#define __URDE_CGSCOMBOFIRE_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -36,4 +35,3 @@ public: } -#endif // __URDE_CGSCOMBOFIRE_HPP__ diff --git a/Runtime/Weapon/CGSFidget.hpp b/Runtime/Weapon/CGSFidget.hpp index 8c3b5865c..0af095b65 100644 --- a/Runtime/Weapon/CGSFidget.hpp +++ b/Runtime/Weapon/CGSFidget.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGSFIDGET_HPP__ -#define __URDE_CGSFIDGET_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -24,4 +23,3 @@ public: } -#endif // __URDE_CGSFIDGET_HPP__ diff --git a/Runtime/Weapon/CGSFreeLook.hpp b/Runtime/Weapon/CGSFreeLook.hpp index 625098dc3..bd8b37c7a 100644 --- a/Runtime/Weapon/CGSFreeLook.hpp +++ b/Runtime/Weapon/CGSFreeLook.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGSFREELOOK_HPP__ -#define __URDE_CGSFREELOOK_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -29,4 +28,3 @@ public: } -#endif // __URDE_CGSFREELOOK_HPP__ diff --git a/Runtime/Weapon/CGameProjectile.hpp b/Runtime/Weapon/CGameProjectile.hpp index 30d836c0d..56848908d 100644 --- a/Runtime/Weapon/CGameProjectile.hpp +++ b/Runtime/Weapon/CGameProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMEPROJECTILE_HPP__ -#define __URDE_CGAMEPROJECTILE_HPP__ +#pragma once #include "Collision/CMaterialList.hpp" #include "Weapon/CWeaponMode.hpp" @@ -91,4 +90,3 @@ public: }; } -#endif // __URDE_CGAMEPROJECTILE_HPP__ diff --git a/Runtime/Weapon/CGrappleArm.hpp b/Runtime/Weapon/CGrappleArm.hpp index 29cd81b64..c2e32460d 100644 --- a/Runtime/Weapon/CGrappleArm.hpp +++ b/Runtime/Weapon/CGrappleArm.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGRAPPLEARM_HPP__ -#define __URDE_CGRAPPLEARM_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -142,4 +141,3 @@ public: } -#endif // __URDE_CGRAPPLEARM_HPP__ diff --git a/Runtime/Weapon/CGunController.hpp b/Runtime/Weapon/CGunController.hpp index da3a73712..bf76ec3d6 100644 --- a/Runtime/Weapon/CGunController.hpp +++ b/Runtime/Weapon/CGunController.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUNCONTROLLER_HPP__ -#define __URDE_CGUNCONTROLLER_HPP__ +#pragma once #include "Character/CModelData.hpp" #include "CGSFreeLook.hpp" @@ -57,4 +56,3 @@ public: }; } -#endif // __URDE_CGUNCONTROLLER_HPP__ diff --git a/Runtime/Weapon/CGunMotion.hpp b/Runtime/Weapon/CGunMotion.hpp index ecf6d7b7d..95fc2c240 100644 --- a/Runtime/Weapon/CGunMotion.hpp +++ b/Runtime/Weapon/CGunMotion.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUNMOTION_HPP__ -#define __URDE_CGUNMOTION_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -54,4 +53,3 @@ public: } -#endif // __URDE_CGUNMOTION_HPP__ diff --git a/Runtime/Weapon/CGunWeapon.hpp b/Runtime/Weapon/CGunWeapon.hpp index db6025f57..926a025a5 100644 --- a/Runtime/Weapon/CGunWeapon.hpp +++ b/Runtime/Weapon/CGunWeapon.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGUNWEAPON_HPP__ -#define __URDE_CGUNWEAPON_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CWeaponMgr.hpp" @@ -178,4 +177,3 @@ public: }; } -#endif // __URDE_CGUNWEAPON_HPP__ diff --git a/Runtime/Weapon/CIceBeam.hpp b/Runtime/Weapon/CIceBeam.hpp index 682496522..83d65889e 100644 --- a/Runtime/Weapon/CIceBeam.hpp +++ b/Runtime/Weapon/CIceBeam.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CICEBEAM_HPP__ -#define __URDE_CICEBEAM_HPP__ +#pragma once #include "CGunWeapon.hpp" @@ -35,4 +34,3 @@ public: } -#endif // __URDE_CICEBEAM_HPP__ diff --git a/Runtime/Weapon/CNewFlameThrower.hpp b/Runtime/Weapon/CNewFlameThrower.hpp index 3690ead37..53e57bf66 100644 --- a/Runtime/Weapon/CNewFlameThrower.hpp +++ b/Runtime/Weapon/CNewFlameThrower.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CNEWFLAMETHROWER_HPP -#define URDE_CNEWFLAMETHROWER_HPP +#pragma once #include "CGameProjectile.hpp" @@ -62,4 +61,3 @@ public: } -#endif // URDE_CNEWFLAMETHROWER_HPP diff --git a/Runtime/Weapon/CPhazonBeam.hpp b/Runtime/Weapon/CPhazonBeam.hpp index adf67b157..1e5c608b9 100644 --- a/Runtime/Weapon/CPhazonBeam.hpp +++ b/Runtime/Weapon/CPhazonBeam.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPHAZONBEAM_HPP__ -#define __URDE_CPHAZONBEAM_HPP__ +#pragma once #include "CGunWeapon.hpp" #include "Graphics/Shaders/CAABoxShader.hpp" @@ -56,4 +55,3 @@ public: } -#endif // __URDE_CPHAZONBEAM_HPP__ diff --git a/Runtime/Weapon/CPlasmaBeam.hpp b/Runtime/Weapon/CPlasmaBeam.hpp index ddf900f57..8479e8e98 100644 --- a/Runtime/Weapon/CPlasmaBeam.hpp +++ b/Runtime/Weapon/CPlasmaBeam.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLASMABEAM_HPP__ -#define __URDE_CPLASMABEAM_HPP__ +#pragma once #include "CGunWeapon.hpp" @@ -42,4 +41,3 @@ public: } -#endif // __URDE_CPLASMABEAM_HPP__ diff --git a/Runtime/Weapon/CPlasmaProjectile.hpp b/Runtime/Weapon/CPlasmaProjectile.hpp index 49ba8c61d..f7d434a1c 100644 --- a/Runtime/Weapon/CPlasmaProjectile.hpp +++ b/Runtime/Weapon/CPlasmaProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLASMAPROJECTILE_HPP__ -#define __URDE_CPLASMAPROJECTILE_HPP__ +#pragma once #include "Weapon/CBeamProjectile.hpp" #include "Weapon/CBeamInfo.hpp" @@ -21,4 +20,3 @@ public: }; } -#endif // __URDE_CPLASMAPROJECTILE_HPP__ diff --git a/Runtime/Weapon/CPlayerGun.hpp b/Runtime/Weapon/CPlayerGun.hpp index a28b2274f..b78be335d 100644 --- a/Runtime/Weapon/CPlayerGun.hpp +++ b/Runtime/Weapon/CPlayerGun.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYERGUN_HPP__ -#define __URDE_CPLAYERGUN_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Character/CActorLights.hpp" @@ -415,4 +414,3 @@ public: } -#endif // __URDE_CPLAYERGUN_HPP__ diff --git a/Runtime/Weapon/CPowerBeam.hpp b/Runtime/Weapon/CPowerBeam.hpp index c561dc676..bbe295eda 100644 --- a/Runtime/Weapon/CPowerBeam.hpp +++ b/Runtime/Weapon/CPowerBeam.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPOWERBEAM_HPP__ -#define __URDE_CPOWERBEAM_HPP__ +#pragma once #include "CGunWeapon.hpp" @@ -41,4 +40,3 @@ public: } -#endif // __URDE_CPOWERBEAM_HPP__ diff --git a/Runtime/Weapon/CPowerBomb.hpp b/Runtime/Weapon/CPowerBomb.hpp index ec9f2ca13..ca24725c0 100644 --- a/Runtime/Weapon/CPowerBomb.hpp +++ b/Runtime/Weapon/CPowerBomb.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPOWERBOMB_HPP__ -#define __URDE_CPOWERBOMB_HPP__ +#pragma once #include "CWeapon.hpp" #include "CToken.hpp" @@ -35,4 +34,3 @@ public: } -#endif // __URDE_CPOWERBOMB_HPP__ diff --git a/Runtime/Weapon/CProjectileInfo.hpp b/Runtime/Weapon/CProjectileInfo.hpp index fed107fd0..27d75e878 100644 --- a/Runtime/Weapon/CProjectileInfo.hpp +++ b/Runtime/Weapon/CProjectileInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPROJECTILEINFO_HPP__ -#define __URDE_CPROJECTILEINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -23,4 +22,3 @@ public: const TToken& Token() { return x0_weaponDescription; } }; } -#endif // __URDE_CPROJECTILEINFO_HPP__ diff --git a/Runtime/Weapon/CProjectileWeapon.hpp b/Runtime/Weapon/CProjectileWeapon.hpp index 6c1801ee3..f7970def0 100644 --- a/Runtime/Weapon/CProjectileWeapon.hpp +++ b/Runtime/Weapon/CProjectileWeapon.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPROJECTILEWEAPON_HPP__ -#define __URDE_CPROJECTILEWEAPON_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CRandom16.hpp" @@ -102,4 +101,3 @@ public: }; } -#endif // __URDE_CPROJECTILEWEAPON_HPP__ diff --git a/Runtime/Weapon/CTargetableProjectile.hpp b/Runtime/Weapon/CTargetableProjectile.hpp index 2a8c3fff3..2a08188c3 100644 --- a/Runtime/Weapon/CTargetableProjectile.hpp +++ b/Runtime/Weapon/CTargetableProjectile.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CTARGETABLEPROJECTILE_HPP -#define URDE_CTARGETABLEPROJECTILE_HPP +#pragma once #include "CEnergyProjectile.hpp" @@ -20,4 +19,3 @@ public: } -#endif // URDE_CTARGETABLEPROJECTILE_HPP diff --git a/Runtime/Weapon/CWaveBeam.hpp b/Runtime/Weapon/CWaveBeam.hpp index 0f496dcf5..25a12bc41 100644 --- a/Runtime/Weapon/CWaveBeam.hpp +++ b/Runtime/Weapon/CWaveBeam.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWAVEBEAM_HPP__ -#define __URDE_CWAVEBEAM_HPP__ +#pragma once #include "CGunWeapon.hpp" @@ -35,4 +34,3 @@ public: } -#endif // __URDE_CWAVEBEAM_HPP__ diff --git a/Runtime/Weapon/CWaveBuster.hpp b/Runtime/Weapon/CWaveBuster.hpp index 6d490419a..8219cf2f2 100644 --- a/Runtime/Weapon/CWaveBuster.hpp +++ b/Runtime/Weapon/CWaveBuster.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CWAVEBUSTER_HPP -#define URDE_CWAVEBUSTER_HPP +#pragma once #include "CGameProjectile.hpp" @@ -53,4 +52,3 @@ public: } -#endif // URDE_CWAVEBUSTER_HPP diff --git a/Runtime/Weapon/CWeapon.hpp b/Runtime/Weapon/CWeapon.hpp index 53fefa44c..ebaa860a8 100644 --- a/Runtime/Weapon/CWeapon.hpp +++ b/Runtime/Weapon/CWeapon.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWEAPON_HPP__ -#define __URDE_CWEAPON_HPP__ +#pragma once #include "World/CActor.hpp" #include "Weapon/WeaponCommon.hpp" @@ -48,4 +47,3 @@ public: void FluidFXThink(EFluidState state, CScriptWater& water, CStateManager& mgr); }; } -#endif // __URDE_CWEAPON_HPP__ diff --git a/Runtime/Weapon/CWeaponMgr.hpp b/Runtime/Weapon/CWeaponMgr.hpp index a6aee0aeb..c25984cb5 100644 --- a/Runtime/Weapon/CWeaponMgr.hpp +++ b/Runtime/Weapon/CWeaponMgr.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWEAPONMGR_HPP__ -#define __URDE_CWEAPONMGR_HPP__ +#pragma once #include "RetroTypes.hpp" #include "WeaponCommon.hpp" @@ -21,4 +20,3 @@ public: } -#endif // __URDE_CWEAPONMGR_HPP__ diff --git a/Runtime/Weapon/CWeaponMode.hpp b/Runtime/Weapon/CWeaponMode.hpp index 7ef9f8538..fdfe4e17f 100644 --- a/Runtime/Weapon/CWeaponMode.hpp +++ b/Runtime/Weapon/CWeaponMode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWEAPONMODE_HPP__ -#define __URDE_CWEAPONMODE_HPP__ +#pragma once #include "WeaponCommon.hpp" @@ -32,4 +31,3 @@ public: static CWeaponMode PowerBomb(); }; } -#endif // __URDE_CWEAPONMODE_HPP__ diff --git a/Runtime/Weapon/WeaponCommon.hpp b/Runtime/Weapon/WeaponCommon.hpp index 6bef273f5..a6e4bff5d 100644 --- a/Runtime/Weapon/WeaponCommon.hpp +++ b/Runtime/Weapon/WeaponCommon.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_WEAPONCOMMON_HPP__ -#define __URDE_WEAPONCOMMON_HPP__ +#pragma once #include "RetroTypes.hpp" #include "DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp" @@ -94,4 +93,3 @@ CSfxHandle play_sfx(u16 sfx, bool underwater, bool looped, float pan); } } -#endif // __URDE_WEAPONCOMMON_HPP__ diff --git a/Runtime/World/CActor.hpp b/Runtime/World/CActor.hpp index 1c9cb11c4..a09b24081 100644 --- a/Runtime/World/CActor.hpp +++ b/Runtime/World/CActor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CACTOR_HPP__ -#define __URDE_CACTOR_HPP__ +#pragma once #include "CEntity.hpp" #include "Graphics/CGraphics.hpp" @@ -203,4 +202,3 @@ public: }; } -#endif // __URDE_CACTOR_HPP__ diff --git a/Runtime/World/CActorModelParticles.hpp b/Runtime/World/CActorModelParticles.hpp index d9603affa..88d654bcd 100644 --- a/Runtime/World/CActorModelParticles.hpp +++ b/Runtime/World/CActorModelParticles.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CACTORMODELPARTICLES_HPP__ -#define __URDE_CACTORMODELPARTICLES_HPP__ +#pragma once #include #include "Audio/CSfxManager.hpp" @@ -122,4 +121,3 @@ public: }; } -#endif // __URDE_CACTORMODELPARTICLES_HPP__ diff --git a/Runtime/World/CActorParameters.hpp b/Runtime/World/CActorParameters.hpp index 1f0e6625b..59c98a6b6 100644 --- a/Runtime/World/CActorParameters.hpp +++ b/Runtime/World/CActorParameters.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CACTORPARAMETERS_HPP__ -#define __URDE_CACTORPARAMETERS_HPP__ +#pragma once #include "CLightParameters.hpp" #include "CScannableParameters.hpp" @@ -78,4 +77,3 @@ public: }; } -#endif // __URDE_CACTORPARAMETERS_HPP__ diff --git a/Runtime/World/CAi.hpp b/Runtime/World/CAi.hpp index 1b3e127fc..053adeead 100644 --- a/Runtime/World/CAi.hpp +++ b/Runtime/World/CAi.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAI_HPP__ -#define __URDE_CAI_HPP__ +#pragma once #include "GCNTypes.hpp" #include "ScriptObjectSupport.hpp" @@ -192,4 +191,3 @@ public: } -#endif // __URDE_CAI_HPP__ diff --git a/Runtime/World/CAiFuncMap.hpp b/Runtime/World/CAiFuncMap.hpp index 5ab64ca60..d22133225 100644 --- a/Runtime/World/CAiFuncMap.hpp +++ b/Runtime/World/CAiFuncMap.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAIFUNCMAP_HPP__ -#define __URDE_CAIFUNCMAP_HPP__ +#pragma once #include "RetroTypes.hpp" #include @@ -30,4 +29,3 @@ public: }; } -#endif // __URDE_CAIFUNCMAP_HPP__ diff --git a/Runtime/World/CAmbientAI.hpp b/Runtime/World/CAmbientAI.hpp index f3b39208f..6c5e0e535 100644 --- a/Runtime/World/CAmbientAI.hpp +++ b/Runtime/World/CAmbientAI.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CAMBIENTAI_HPP__ -#define __URDE_CAMBIENTAI_HPP__ +#pragma once #include "CPhysicsActor.hpp" #include "CDamageVulnerability.hpp" @@ -46,4 +45,3 @@ public: }; } -#endif // __URDE_CAMBIENTAI_HPP diff --git a/Runtime/World/CAnimationParameters.hpp b/Runtime/World/CAnimationParameters.hpp index e8af953ae..ff43da50d 100644 --- a/Runtime/World/CAnimationParameters.hpp +++ b/Runtime/World/CAnimationParameters.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CANIMATIONPARAMETERS_HPP__ -#define __URDE_CANIMATIONPARAMETERS_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -28,4 +27,3 @@ public: } -#endif // __URDE_CANIMATIONPARAMETERS_HPP__ diff --git a/Runtime/World/CDamageInfo.hpp b/Runtime/World/CDamageInfo.hpp index 88a235d4c..6132bc176 100644 --- a/Runtime/World/CDamageInfo.hpp +++ b/Runtime/World/CDamageInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDAMAGEINFO_HPP__ -#define __URDE_CDAMAGEINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Weapon/CWeaponMgr.hpp" @@ -71,4 +70,3 @@ public: }; } -#endif // __URDE_CDAMAGEINFO_HPP__ diff --git a/Runtime/World/CDamageVulnerability.hpp b/Runtime/World/CDamageVulnerability.hpp index d9f6b2aa5..4b60701c5 100644 --- a/Runtime/World/CDamageVulnerability.hpp +++ b/Runtime/World/CDamageVulnerability.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDAMAGEVULNERABILITY_HPP__ -#define __URDE_CDAMAGEVULNERABILITY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "Weapon/CWeaponMode.hpp" @@ -85,4 +84,3 @@ public: }; } -#endif // __URDE_CDAMAGEVULNERABILITY_HPP__ diff --git a/Runtime/World/CDestroyableRock.hpp b/Runtime/World/CDestroyableRock.hpp index 7ddd8d1a6..e47f8253a 100644 --- a/Runtime/World/CDestroyableRock.hpp +++ b/Runtime/World/CDestroyableRock.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CDESTROYABLEROCK_HPP__ -#define __URDE_CDESTROYABLEROCK_HPP__ +#pragma once #include "CAi.hpp" @@ -17,4 +16,3 @@ public: } -#endif // __URDE_CDESTROYABLEROCK_HPP__ diff --git a/Runtime/World/CEffect.hpp b/Runtime/World/CEffect.hpp index 894f353d5..edc97d86f 100644 --- a/Runtime/World/CEffect.hpp +++ b/Runtime/World/CEffect.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CEFFECT_HPP__ -#define __URDE_CEFFECT_HPP__ +#pragma once #include "CActor.hpp" @@ -18,4 +17,3 @@ public: } -#endif // __URDE_CEFFECT_HPP__ diff --git a/Runtime/World/CEnergyDrainSource.hpp b/Runtime/World/CEnergyDrainSource.hpp index 23f50cc30..865774dfb 100644 --- a/Runtime/World/CEnergyDrainSource.hpp +++ b/Runtime/World/CEnergyDrainSource.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CENERGYDRAINSOURCE_HPP__ -#define __URDE_CENERGYDRAINSOURCE_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -16,4 +15,3 @@ public: float GetEnergyDrainIntensity() const { return x4_intensity; } }; } -#endif // __URDE_CENERGYDRAINSOURCE_HPP__ diff --git a/Runtime/World/CEntity.hpp b/Runtime/World/CEntity.hpp index e5eea0f37..fe477f147 100644 --- a/Runtime/World/CEntity.hpp +++ b/Runtime/World/CEntity.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CENTITY_HPP__ -#define __URDE_CENTITY_HPP__ +#pragma once #include "RetroTypes.hpp" #include "ScriptObjectSupport.hpp" @@ -74,4 +73,3 @@ public: } -#endif // __URDE_CENTITY_HPP__ diff --git a/Runtime/World/CEntityInfo.hpp b/Runtime/World/CEntityInfo.hpp index 4e66ccd63..f7a9804d1 100644 --- a/Runtime/World/CEntityInfo.hpp +++ b/Runtime/World/CEntityInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CENTITYINFO_HPP__ -#define __URDE_CENTITYINFO_HPP__ +#pragma once #include #include @@ -29,4 +28,3 @@ public: }; } -#endif // __URDE_CENTITYINFO_HPP__ diff --git a/Runtime/World/CEnvFxManager.hpp b/Runtime/World/CEnvFxManager.hpp index ef5571c44..28d4502d0 100644 --- a/Runtime/World/CEnvFxManager.hpp +++ b/Runtime/World/CEnvFxManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CENVFXMANAGER_HPP__ -#define __URDE_CENVFXMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -90,4 +89,3 @@ public: } -#endif // __URDE_CENVFXMANAGER_HPP__ diff --git a/Runtime/World/CExplosion.hpp b/Runtime/World/CExplosion.hpp index 7f3788ec3..90ccbdac1 100644 --- a/Runtime/World/CExplosion.hpp +++ b/Runtime/World/CExplosion.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CEXPLOSION_HPP__ -#define __URDE_CEXPLOSION_HPP__ +#pragma once #include "CEffect.hpp" #include "Particle/CElementGen.hpp" @@ -34,4 +33,3 @@ public: } -#endif // __URDE_CEXPLOSION_HPP__ diff --git a/Runtime/World/CFishCloud.hpp b/Runtime/World/CFishCloud.hpp index fd6b5518f..f69cfa330 100644 --- a/Runtime/World/CFishCloud.hpp +++ b/Runtime/World/CFishCloud.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFISHCLOUD_HPP__ -#define __URDE_CFISHCLOUD_HPP__ +#pragma once #include "CActor.hpp" @@ -44,4 +43,3 @@ public: } -#endif // __URDE_CFISHCLOUD_HPP__ diff --git a/Runtime/World/CFishCloudModifier.hpp b/Runtime/World/CFishCloudModifier.hpp index 47b5a2ce0..4e980ca8c 100644 --- a/Runtime/World/CFishCloudModifier.hpp +++ b/Runtime/World/CFishCloudModifier.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFISHCLOUDMODIFIER_HPP__ -#define __URDE_CFISHCLOUDMODIFIER_HPP__ +#pragma once #include "CActor.hpp" @@ -21,4 +20,3 @@ public: }; } -#endif diff --git a/Runtime/World/CFluidPlane.hpp b/Runtime/World/CFluidPlane.hpp index d1a7f8eaf..3ba3595da 100644 --- a/Runtime/World/CFluidPlane.hpp +++ b/Runtime/World/CFluidPlane.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLUIDPLANE_HPP__ -#define __URDE_CFLUIDPLANE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -186,4 +185,3 @@ public: }; } -#endif // __URDE_CFLUIDPLANE_HPP__ diff --git a/Runtime/World/CFluidPlaneCPU.hpp b/Runtime/World/CFluidPlaneCPU.hpp index 6bece2c1a..389e0f7c2 100644 --- a/Runtime/World/CFluidPlaneCPU.hpp +++ b/Runtime/World/CFluidPlaneCPU.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLUIDPLANECPU_HPP__ -#define __URDE_CFLUIDPLANECPU_HPP__ +#pragma once #include "CFluidPlane.hpp" #include "CRipple.hpp" @@ -130,4 +129,3 @@ public: } -#endif // __URDE_CFLUIDPLANECPU_HPP__ diff --git a/Runtime/World/CFluidPlaneDoor.hpp b/Runtime/World/CFluidPlaneDoor.hpp index d9521944a..be0406e31 100644 --- a/Runtime/World/CFluidPlaneDoor.hpp +++ b/Runtime/World/CFluidPlaneDoor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLUIDPLANEDOOR_HPP__ -#define __URDE_CFLUIDPLANEDOOR_HPP__ +#pragma once #include "CFluidPlane.hpp" #include "Graphics/Shaders/CFluidPlaneShader.hpp" @@ -33,4 +32,3 @@ public: } -#endif // __URDE_CFLUIDPLANEDOOR_HPP__ diff --git a/Runtime/World/CFluidPlaneGPU.hpp b/Runtime/World/CFluidPlaneGPU.hpp index 03f84b6b2..ffe1771f3 100644 --- a/Runtime/World/CFluidPlaneGPU.hpp +++ b/Runtime/World/CFluidPlaneGPU.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLUIDPLANEGPU_HPP__ -#define __URDE_CFLUIDPLANEGPU_HPP__ +#pragma once #include "CFluidPlaneCPU.hpp" @@ -26,4 +25,3 @@ public: } -#endif // __URDE_CFLUIDPLANEGPU_HPP__ \ No newline at end of file diff --git a/Runtime/World/CFluidPlaneManager.hpp b/Runtime/World/CFluidPlaneManager.hpp index f311f0b03..246b6208f 100644 --- a/Runtime/World/CFluidPlaneManager.hpp +++ b/Runtime/World/CFluidPlaneManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLUIDPLANEMANAGER_HPP__ -#define __URDE_CFLUIDPLANEMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CRippleManager.hpp" @@ -65,4 +64,3 @@ public: } -#endif // __URDE_CFLUIDPLANEMANAGER_HPP__ diff --git a/Runtime/World/CFluidUVMotion.hpp b/Runtime/World/CFluidUVMotion.hpp index a2922e8ce..af2bf089b 100644 --- a/Runtime/World/CFluidUVMotion.hpp +++ b/Runtime/World/CFluidUVMotion.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CFLUIDUVMOTION_HPP__ -#define __URDE_CFLUIDUVMOTION_HPP__ +#pragma once #include "rstl.hpp" #include "RetroTypes.hpp" @@ -50,4 +49,3 @@ public: void CalculateFluidTextureOffset(float, float[3][2]) const; }; } -#endif // __URDE_CFLUIDUVMOTION_HPP__ diff --git a/Runtime/World/CGameArea.hpp b/Runtime/World/CGameArea.hpp index c31cc4a69..4f2329d30 100644 --- a/Runtime/World/CGameArea.hpp +++ b/Runtime/World/CGameArea.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMEAREA_HPP__ -#define __URDE_CGAMEAREA_HPP__ +#pragma once #include "zeus/CVector2f.hpp" #include "zeus/CColor.hpp" @@ -378,4 +377,3 @@ public: } -#endif // __URDE_CGAMEAREA_HPP__ diff --git a/Runtime/World/CGameLight.hpp b/Runtime/World/CGameLight.hpp index eb8dd8c3c..dcf3c48ac 100644 --- a/Runtime/World/CGameLight.hpp +++ b/Runtime/World/CGameLight.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGAMELIGHT_HPP__ -#define __URDE_CGAMELIGHT_HPP__ +#pragma once #include "CActor.hpp" @@ -25,4 +24,3 @@ public: TUniqueId GetParentId() const { return xe8_parentId; } }; } -#endif // __URDE_CGAMELIGHT_HPP__ diff --git a/Runtime/World/CGrappleParameters.hpp b/Runtime/World/CGrappleParameters.hpp index 1d844c1fc..035e212b2 100644 --- a/Runtime/World/CGrappleParameters.hpp +++ b/Runtime/World/CGrappleParameters.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CGRAPPLEPARAMETERS_HPP__ -#define __URDE_CGRAPPLEPARAMETERS_HPP__ +#pragma once namespace urde { @@ -31,4 +30,3 @@ public: } -#endif // __URDE_CGRAPPLEPARAMETERS_HPP__ diff --git a/Runtime/World/CHUDBillboardEffect.hpp b/Runtime/World/CHUDBillboardEffect.hpp index 4044c2f3c..b7735e198 100644 --- a/Runtime/World/CHUDBillboardEffect.hpp +++ b/Runtime/World/CHUDBillboardEffect.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHUDBILLBOARDEFFECT_HPP__ -#define __URDE_CHUDBILLBOARDEFFECT_HPP__ +#pragma once #include "RetroTypes.hpp" #include "World/CEffect.hpp" @@ -39,4 +38,3 @@ public: } -#endif // __URDE_CHUDBILLBOARDEFFECT_HPP__ \ No newline at end of file diff --git a/Runtime/World/CHUDMemoParms.hpp b/Runtime/World/CHUDMemoParms.hpp index e75fc1e7c..712c6a4a9 100644 --- a/Runtime/World/CHUDMemoParms.hpp +++ b/Runtime/World/CHUDMemoParms.hpp @@ -1,5 +1,4 @@ -#ifndef CHUDMEMOPARMS_HPP -#define CHUDMEMOPARMS_HPP +#pragma once #include "IOStreams.hpp" @@ -32,4 +31,3 @@ public: } -#endif // CHUDMEMOPARMS_HPP diff --git a/Runtime/World/CHealthInfo.hpp b/Runtime/World/CHealthInfo.hpp index d3e58de6e..ce46c5a78 100644 --- a/Runtime/World/CHealthInfo.hpp +++ b/Runtime/World/CHealthInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CHEALTHINFO_HPP__ -#define __URDE_CHEALTHINFO_HPP__ +#pragma once #include "Runtime/RetroTypes.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CHEALTHINFO_HPP__ diff --git a/Runtime/World/CIceImpact.hpp b/Runtime/World/CIceImpact.hpp index 9a1b4268b..f9754e91c 100644 --- a/Runtime/World/CIceImpact.hpp +++ b/Runtime/World/CIceImpact.hpp @@ -1,5 +1,4 @@ -#ifndef CICEIMPACT_HPP -#define CICEIMPACT_HPP +#pragma once #include "CEffect.hpp" @@ -17,4 +16,3 @@ public: } -#endif // CICEIMPACT_HPP diff --git a/Runtime/World/CLightParameters.hpp b/Runtime/World/CLightParameters.hpp index ac7fc0771..bd7a811f7 100644 --- a/Runtime/World/CLightParameters.hpp +++ b/Runtime/World/CLightParameters.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CLIGHTPARAMETERS_HPP__ -#define __URDE_CLIGHTPARAMETERS_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CColor.hpp" @@ -98,4 +97,3 @@ public: } -#endif // __URDE_CLIGHTPARAMETERS_HPP__ diff --git a/Runtime/World/CMorphBall.hpp b/Runtime/World/CMorphBall.hpp index 9b4de0fe8..a3cbf65c9 100644 --- a/Runtime/World/CMorphBall.hpp +++ b/Runtime/World/CMorphBall.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMORPHBALL_HPP__ -#define __URDE_CMORPHBALL_HPP__ +#pragma once #include "World/CActor.hpp" #include "World/ScriptObjectSupport.hpp" @@ -304,4 +303,3 @@ public: } -#endif // __URDE_CMORPHBALL_HPP__ diff --git a/Runtime/World/CMorphBallShadow.hpp b/Runtime/World/CMorphBallShadow.hpp index b81ce3776..11c024bec 100644 --- a/Runtime/World/CMorphBallShadow.hpp +++ b/Runtime/World/CMorphBallShadow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CMORPHBALLSHADOW_HPP__ -#define __URDE_CMORPHBALLSHADOW_HPP__ +#pragma once #include "CToken.hpp" #include "Graphics/CTexture.hpp" @@ -32,4 +31,3 @@ public: } -#endif // __URDE_CMORPHBALLSHADOW_HPP__ diff --git a/Runtime/World/CPathFindArea.hpp b/Runtime/World/CPathFindArea.hpp index ccaa16614..2f220fca1 100644 --- a/Runtime/World/CPathFindArea.hpp +++ b/Runtime/World/CPathFindArea.hpp @@ -1,5 +1,4 @@ -#ifndef CPATHFINDAREA_HPP -#define CPATHFINDAREA_HPP +#pragma once #include "IObj.hpp" #include "zeus/CTransform.hpp" @@ -114,4 +113,3 @@ CFactoryFnReturn FPathFindAreaFactory(const urde::SObjectTag& tag, CObjectReference* selfRef); } -#endif // CPATHFINDAREA_HPP diff --git a/Runtime/World/CPathFindRegion.hpp b/Runtime/World/CPathFindRegion.hpp index aad06166b..b651b9b86 100644 --- a/Runtime/World/CPathFindRegion.hpp +++ b/Runtime/World/CPathFindRegion.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPATHFINDREGION_HPP__ -#define __URDE_CPATHFINDREGION_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -127,4 +126,3 @@ public: }; } -#endif // __URDE_CPATHFINDREGION_HPP__ diff --git a/Runtime/World/CPathFindSearch.hpp b/Runtime/World/CPathFindSearch.hpp index 5988a2fc1..d62f9fe04 100644 --- a/Runtime/World/CPathFindSearch.hpp +++ b/Runtime/World/CPathFindSearch.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPATHFINDSEARCH_HPP__ -#define __URDE_CPATHFINDSEARCH_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CPathFindArea.hpp" @@ -46,4 +45,3 @@ public: } -#endif // __URDE_CPATHFINDSEARCH_HPP__ diff --git a/Runtime/World/CPatterned.hpp b/Runtime/World/CPatterned.hpp index 5cc704289..691349a19 100644 --- a/Runtime/World/CPatterned.hpp +++ b/Runtime/World/CPatterned.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPATTERNED_HPP__ -#define __URDE_CPATTERNED_HPP__ +#pragma once #include "CAi.hpp" #include "Character/CBodyController.hpp" @@ -333,4 +332,3 @@ public: }; } -#endif // CPATTERNED_HPP diff --git a/Runtime/World/CPatternedInfo.hpp b/Runtime/World/CPatternedInfo.hpp index b5d0955ab..01c7c225c 100644 --- a/Runtime/World/CPatternedInfo.hpp +++ b/Runtime/World/CPatternedInfo.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPATTERNEDINFO_HPP__ -#define __URDE_CPATTERNEDINFO_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CDamageInfo.hpp" @@ -68,4 +67,3 @@ public: }; } -#endif // __URDE_CPATTERNEDINFO_HPP__ diff --git a/Runtime/World/CPhysicsActor.hpp b/Runtime/World/CPhysicsActor.hpp index 245a93e09..48b3c16c1 100644 --- a/Runtime/World/CPhysicsActor.hpp +++ b/Runtime/World/CPhysicsActor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPHYSICSACTOR_HPP__ -#define __URDE_CPHYSICSACTOR_HPP__ +#pragma once #include "CActor.hpp" #include "Collision/CCollidableAABox.hpp" @@ -211,4 +210,3 @@ public: }; } -#endif // __URDE_CPHYSICSACTOR_HPP__ diff --git a/Runtime/World/CPlayer.hpp b/Runtime/World/CPlayer.hpp index 8624aecf7..3cc2bc423 100644 --- a/Runtime/World/CPlayer.hpp +++ b/Runtime/World/CPlayer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYER_HPP__ -#define __URDE_CPLAYER_HPP__ +#pragma once #include "CPhysicsActor.hpp" #include "zeus/CAABox.hpp" @@ -691,4 +690,3 @@ public: }; } -#endif // __URDE_CPLAYER_HPP__ diff --git a/Runtime/World/CPlayerCameraBob.hpp b/Runtime/World/CPlayerCameraBob.hpp index a26a5d68d..7133c8b40 100644 --- a/Runtime/World/CPlayerCameraBob.hpp +++ b/Runtime/World/CPlayerCameraBob.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYERCAMERABOB_HPP__ -#define __URDE_CPLAYERCAMERABOB_HPP__ +#pragma once #include #include "RetroTypes.hpp" @@ -104,4 +103,3 @@ public: }; } -#endif // __URDE_CPLAYERCAMERABOB_HPP__ diff --git a/Runtime/World/CPlayerEnergyDrain.hpp b/Runtime/World/CPlayerEnergyDrain.hpp index aa5943126..bb03ed231 100644 --- a/Runtime/World/CPlayerEnergyDrain.hpp +++ b/Runtime/World/CPlayerEnergyDrain.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPLAYERENERGYDRAIN_HPP__ -#define __URDE_CPLAYERENERGYDRAIN_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CEnergyDrainSource.hpp" @@ -22,4 +21,3 @@ public: void ProcessEnergyDrain(const CStateManager&, float); }; } -#endif // __URDE_CPLAYERENERGYDRAIN_HPP__ diff --git a/Runtime/World/CProjectedShadow.hpp b/Runtime/World/CProjectedShadow.hpp index cdbec191e..b06c1fd62 100644 --- a/Runtime/World/CProjectedShadow.hpp +++ b/Runtime/World/CProjectedShadow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CPROJECTEDSHADOW_HPP__ -#define __URDE_CPROJECTEDSHADOW_HPP__ +#pragma once #include "Graphics/CTexture.hpp" #include "zeus/CTransform.hpp" @@ -31,4 +30,3 @@ public: const zeus::CVector3f&, float, float); }; } -#endif // __URDE_CPROJECTEDSHADOW_HPP__ diff --git a/Runtime/World/CRepulsor.hpp b/Runtime/World/CRepulsor.hpp index 257da9eab..f8025d116 100644 --- a/Runtime/World/CRepulsor.hpp +++ b/Runtime/World/CRepulsor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CREPULSOR_HPP__ -#define __URDE_CREPULSOR_HPP__ +#pragma once #include "CActor.hpp" namespace urde @@ -17,4 +16,3 @@ public: float GetAffectRadius() const { return xe8_affectRadius; } }; } -#endif // __URDE_CREPULSOR_HPP__ diff --git a/Runtime/World/CRipple.hpp b/Runtime/World/CRipple.hpp index 147dc80a5..593329e11 100644 --- a/Runtime/World/CRipple.hpp +++ b/Runtime/World/CRipple.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRIPPLE_HPP__ -#define __URDE_CRIPPLE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -42,4 +41,3 @@ public: float GetLookupPhase() const { return x38_lookupPhase; } }; } -#endif // __URDE_CRIPPLE_HPP__ diff --git a/Runtime/World/CRippleManager.hpp b/Runtime/World/CRippleManager.hpp index f0cec0f6b..048972772 100644 --- a/Runtime/World/CRippleManager.hpp +++ b/Runtime/World/CRippleManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CRIPPLEMANAGER_HPP__ -#define __URDE_CRIPPLEMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CRipple.hpp" @@ -28,4 +27,3 @@ public: } ; -#endif // __URDE_CRIPPLEMANAGER_HPP__ diff --git a/Runtime/World/CScannableParameters.hpp b/Runtime/World/CScannableParameters.hpp index 3729235ce..ace276fa7 100644 --- a/Runtime/World/CScannableParameters.hpp +++ b/Runtime/World/CScannableParameters.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCANNABLEPARAMETERS_HPP__ -#define __URDE_CSCANNABLEPARAMETERS_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -17,4 +16,3 @@ public: }; } -#endif // __URDE_CSCANNABLEPARAMETERS_HPP__ diff --git a/Runtime/World/CScriptActor.hpp b/Runtime/World/CScriptActor.hpp index 7c2c17b94..0ea943d5f 100644 --- a/Runtime/World/CScriptActor.hpp +++ b/Runtime/World/CScriptActor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTACTOR_HPP__ -#define __URDE_CSCRIPTACTOR_HPP__ +#pragma once #include "CPhysicsActor.hpp" #include "CHealthInfo.hpp" @@ -50,4 +49,3 @@ public: }; }; -#endif // __URDE_CSCRIPTACTOR_HPP__ diff --git a/Runtime/World/CScriptActorKeyframe.hpp b/Runtime/World/CScriptActorKeyframe.hpp index ef266af8c..c76f416ac 100644 --- a/Runtime/World/CScriptActorKeyframe.hpp +++ b/Runtime/World/CScriptActorKeyframe.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTACTORKEYFRAME_HPP__ -#define __URDE_CSCRIPTACTORKEYFRAME_HPP__ +#pragma once #include "CEntity.hpp" @@ -37,4 +36,3 @@ public: }; } -#endif // __URDE_CSCRIPTACTORKEYFRAME_HPP__ diff --git a/Runtime/World/CScriptActorRotate.hpp b/Runtime/World/CScriptActorRotate.hpp index 9008363a3..663d4ee05 100644 --- a/Runtime/World/CScriptActorRotate.hpp +++ b/Runtime/World/CScriptActorRotate.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTACTORROTATE_HPP -#define CSCRIPTACTORROTATE_HPP +#pragma once #include "CEntity.hpp" #include "zeus/CTransform.hpp" @@ -44,4 +43,3 @@ public: } -#endif // CSCRIPTACTORROTATE_HPP diff --git a/Runtime/World/CScriptAiJumpPoint.hpp b/Runtime/World/CScriptAiJumpPoint.hpp index 2e1d61647..fb7499c19 100644 --- a/Runtime/World/CScriptAiJumpPoint.hpp +++ b/Runtime/World/CScriptAiJumpPoint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTAIJUMPPOINT_HPP__ -#define __URDE_CSCRIPTAIJUMPPOINT_HPP__ +#pragma once #include "CActor.hpp" @@ -34,4 +33,3 @@ public: bool GetInUse(TUniqueId uid) const; }; } -#endif // __URDE_CSCRIPTAIJUMPPOINT_HPP__ diff --git a/Runtime/World/CScriptAreaAttributes.hpp b/Runtime/World/CScriptAreaAttributes.hpp index 8b68c48de..0658df17f 100644 --- a/Runtime/World/CScriptAreaAttributes.hpp +++ b/Runtime/World/CScriptAreaAttributes.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTAREAATTRIBUTES_HPP__ -#define __URDE_CSCRIPTAREAATTRIBUTES_HPP__ +#pragma once #include "CEntity.hpp" #include "CEnvFxManager.hpp" @@ -38,4 +37,3 @@ public: }; } -#endif // __URDE_CSCRIPTAREAATTRIBUTES_HPP__ diff --git a/Runtime/World/CScriptBallTrigger.hpp b/Runtime/World/CScriptBallTrigger.hpp index 934b0c879..b330c7d63 100644 --- a/Runtime/World/CScriptBallTrigger.hpp +++ b/Runtime/World/CScriptBallTrigger.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTBALLTRIGGER_HPP__ -#define __URDE_CSCRIPTBALLTRIGGER_HPP__ +#pragma once #include "CScriptTrigger.hpp" @@ -24,4 +23,3 @@ public: void InhabitantExited(CActor&, CStateManager&); }; } -#endif // __URDE_CSCRIPTBALLTRIGGER_HPP diff --git a/Runtime/World/CScriptBeam.hpp b/Runtime/World/CScriptBeam.hpp index beb727534..170b77e6d 100644 --- a/Runtime/World/CScriptBeam.hpp +++ b/Runtime/World/CScriptBeam.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTBEAM_HPP__ -#define __URDE_CSCRIPTBEAM_HPP__ +#pragma once #include "CActor.hpp" #include "Weapon/CBeamInfo.hpp" @@ -23,4 +22,3 @@ public: void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager &); }; } -#endif // __URDE_CSCRIPTBEAM_HPP__ diff --git a/Runtime/World/CScriptCameraBlurKeyframe.hpp b/Runtime/World/CScriptCameraBlurKeyframe.hpp index 8df32f052..3c6ad39da 100644 --- a/Runtime/World/CScriptCameraBlurKeyframe.hpp +++ b/Runtime/World/CScriptCameraBlurKeyframe.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCAMERABLURKEYFRAME__ -#define __URDE_CSCRIPTCAMERABLURKEYFRAME__ +#pragma once #include "CEntity.hpp" #include "Camera/CCameraFilter.hpp" @@ -24,4 +23,3 @@ public: }; } -#endif // __URDE_CSCRIPTCAMERABLURKEYFRAME__ diff --git a/Runtime/World/CScriptCameraFilterKeyframe.hpp b/Runtime/World/CScriptCameraFilterKeyframe.hpp index a8c81a39c..bd43cc4c6 100644 --- a/Runtime/World/CScriptCameraFilterKeyframe.hpp +++ b/Runtime/World/CScriptCameraFilterKeyframe.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTCAMERAFILTERKEYFRAME_HPP -#define CSCRIPTCAMERAFILTERKEYFRAME_HPP +#pragma once #include "CEntity.hpp" #include "zeus/CColor.hpp" @@ -29,4 +28,3 @@ public: }; } -#endif // CSCRIPTCAMERAFILTERKEYFRAME_HPP diff --git a/Runtime/World/CScriptCameraHint.hpp b/Runtime/World/CScriptCameraHint.hpp index 6663e5113..f1598d05b 100644 --- a/Runtime/World/CScriptCameraHint.hpp +++ b/Runtime/World/CScriptCameraHint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCAMERAHINT_HPP__ -#define __URDE_CSCRIPTCAMERAHINT_HPP__ +#pragma once #include "CActor.hpp" #include "Camera/CBallCamera.hpp" @@ -95,4 +94,3 @@ public: }; } -#endif // __URDE_CSCRIPTCAMERAHINT_HPP__ diff --git a/Runtime/World/CScriptCameraHintTrigger.hpp b/Runtime/World/CScriptCameraHintTrigger.hpp index 3308009b2..66d6c44bd 100644 --- a/Runtime/World/CScriptCameraHintTrigger.hpp +++ b/Runtime/World/CScriptCameraHintTrigger.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCAMERAHINTTRIGGER_HPP__ -#define __URDE_CSCRIPTCAMERAHINTTRIGGER_HPP__ +#pragma once #include "CActor.hpp" #include "zeus/COBBox.hpp" @@ -28,4 +27,3 @@ public: void Accept(IVisitor& visitor); }; } -#endif // __URDE_CSCRIPTCAMERAHINTTRIGGER_HPP__ diff --git a/Runtime/World/CScriptCameraPitchVolume.hpp b/Runtime/World/CScriptCameraPitchVolume.hpp index 9d1d50c5b..225d5a31e 100644 --- a/Runtime/World/CScriptCameraPitchVolume.hpp +++ b/Runtime/World/CScriptCameraPitchVolume.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCAMERAPITCHVOLUME_HPP__ -#define __URDE_CSCRIPTCAMERAPITCHVOLUME_HPP__ +#pragma once #include "CActor.hpp" #include "zeus/CRelAngle.hpp" @@ -41,4 +40,3 @@ public: void Exited(CStateManager&); }; } -#endif // __URDE_CSCRIPTCAMERAPITCHVOLUME_HPP__ diff --git a/Runtime/World/CScriptCameraShaker.hpp b/Runtime/World/CScriptCameraShaker.hpp index 55d22e3c4..9c72ac6c5 100644 --- a/Runtime/World/CScriptCameraShaker.hpp +++ b/Runtime/World/CScriptCameraShaker.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCAMERASHAKER_HPP__ -#define __URDE_CSCRIPTCAMERASHAKER_HPP__ +#pragma once #include "CEntity.hpp" #include "Camera/CCameraShakeData.hpp" @@ -19,4 +18,3 @@ public: } -#endif // __URDE_CSCRIPTCAMERASHAKER_HPP__ diff --git a/Runtime/World/CScriptCameraWaypoint.hpp b/Runtime/World/CScriptCameraWaypoint.hpp index 882d90c11..072930346 100644 --- a/Runtime/World/CScriptCameraWaypoint.hpp +++ b/Runtime/World/CScriptCameraWaypoint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCAMERAWAYPOINT_HPP__ -#define __URDE_CSCRIPTCAMERAWAYPOINT_HPP__ +#pragma once #include "CActor.hpp" @@ -24,4 +23,3 @@ public: } -#endif // __URDE_CSCRIPTCAMERAWAYPOINT_HPP__ diff --git a/Runtime/World/CScriptColorModulate.hpp b/Runtime/World/CScriptColorModulate.hpp index dc8550c10..928ac61c9 100644 --- a/Runtime/World/CScriptColorModulate.hpp +++ b/Runtime/World/CScriptColorModulate.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCOLORMODULATE_HPP__ -#define __URDE_CSCRIPTCOLORMODULATE_HPP__ +#pragma once #include "CEntity.hpp" #include "zeus/CColor.hpp" @@ -67,4 +66,3 @@ public: void End(CStateManager&); }; } -#endif // __URDE_CSCRIPTCOLORMODULATE_HPP__ diff --git a/Runtime/World/CScriptControllerAction.hpp b/Runtime/World/CScriptControllerAction.hpp index 8e4beb141..4f2d45b83 100644 --- a/Runtime/World/CScriptControllerAction.hpp +++ b/Runtime/World/CScriptControllerAction.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCONTROLLERACTION_HPP__ -#define __URDE_CSCRIPTCONTROLLERACTION_HPP__ +#pragma once #include "CEntity.hpp" #include "Input/ControlMapper.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CSCRIPTCONTROLLERACTION_HPP__ diff --git a/Runtime/World/CScriptCounter.hpp b/Runtime/World/CScriptCounter.hpp index 0c8624e9f..69e39bdb9 100644 --- a/Runtime/World/CScriptCounter.hpp +++ b/Runtime/World/CScriptCounter.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTCOUNTER_HPP__ -#define __URDE_CSCRIPTCOUNTER_HPP__ +#pragma once #include "CEntity.hpp" @@ -22,4 +21,3 @@ public: } -#endif // __URDE_CSCRIPTCOUNTER_HPP__ diff --git a/Runtime/World/CScriptCoverPoint.hpp b/Runtime/World/CScriptCoverPoint.hpp index 0790d71cc..e5819cce6 100644 --- a/Runtime/World/CScriptCoverPoint.hpp +++ b/Runtime/World/CScriptCoverPoint.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTCOVERPOINT_HPP -#define CSCRIPTCOVERPOINT_HPP +#pragma once #include "CActor.hpp" @@ -58,4 +57,3 @@ public: }; } -#endif // CSCRIPTCOVERPOINT_HPP diff --git a/Runtime/World/CScriptDamageableTrigger.hpp b/Runtime/World/CScriptDamageableTrigger.hpp index 527dc68d0..5d6af0e99 100644 --- a/Runtime/World/CScriptDamageableTrigger.hpp +++ b/Runtime/World/CScriptDamageableTrigger.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTDAMAGEABLETRIGGER_HPP -#define CSCRIPTDAMAGEABLETRIGGER_HPP +#pragma once #include "CActor.hpp" #include "CFluidPlaneDoor.hpp" @@ -66,4 +65,3 @@ public: }; } -#endif // CSCRIPTDAMAGEABLETRIGGER_HPP diff --git a/Runtime/World/CScriptDebris.hpp b/Runtime/World/CScriptDebris.hpp index 4015b07d0..0136c4a76 100644 --- a/Runtime/World/CScriptDebris.hpp +++ b/Runtime/World/CScriptDebris.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTDEBRIS_HPP__ -#define __URDE_CSCRIPTDEBRIS_HPP__ +#pragma once #include "CPhysicsActor.hpp" @@ -99,4 +98,3 @@ public: }; } // namespace urde -#endif // __URDE_CSCRIPTDEBRIS_HPP__ diff --git a/Runtime/World/CScriptDebugCameraWaypoint.hpp b/Runtime/World/CScriptDebugCameraWaypoint.hpp index eab2e237e..9168855f1 100644 --- a/Runtime/World/CScriptDebugCameraWaypoint.hpp +++ b/Runtime/World/CScriptDebugCameraWaypoint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTDEBUGCAMERAWAYPOINT_HPP__ -#define __URDE_CSCRIPTDEBUGCAMERAWAYPOINT_HPP__ +#pragma once #include "CActor.hpp" @@ -16,4 +15,3 @@ public: } -#endif // __URDE_CSCRIPTDEBUGCAMERAWAYPOINT_HPP__ diff --git a/Runtime/World/CScriptDistanceFog.hpp b/Runtime/World/CScriptDistanceFog.hpp index ccfb7a2ed..7a20d987b 100644 --- a/Runtime/World/CScriptDistanceFog.hpp +++ b/Runtime/World/CScriptDistanceFog.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTDISTANCEFOG_HPP__ -#define __URDE_CSCRIPTDISTANCEFOG_HPP__ +#pragma once #include "Graphics/CGraphics.hpp" #include "CEntity.hpp" @@ -29,4 +28,3 @@ public: }; } -#endif // __URDE_CSCRIPTDISTANCEFOG_HPP__ diff --git a/Runtime/World/CScriptDock.hpp b/Runtime/World/CScriptDock.hpp index d9d744f7b..9232f092d 100644 --- a/Runtime/World/CScriptDock.hpp +++ b/Runtime/World/CScriptDock.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTDOCK_HPP__ -#define __URDE_CSCRIPTDOCK_HPP__ +#pragma once #include "CPhysicsActor.hpp" @@ -55,4 +54,3 @@ public: void SetLoadConnected(CStateManager&, bool); }; } -#endif // __URDE_CSCRIPTDOCK_HPP__ diff --git a/Runtime/World/CScriptDockAreaChange.hpp b/Runtime/World/CScriptDockAreaChange.hpp index f541e6263..873bbb399 100644 --- a/Runtime/World/CScriptDockAreaChange.hpp +++ b/Runtime/World/CScriptDockAreaChange.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTDOCKAREACHANGE_HPP__ -#define __URDE_CSCRIPTDOCKAREACHANGE_HPP__ +#pragma once #include "CEntity.hpp" @@ -16,4 +15,3 @@ public: }; } -#endif //__URDE_CSCRIPTDOCKAREACHANGE_HPP__ diff --git a/Runtime/World/CScriptDoor.hpp b/Runtime/World/CScriptDoor.hpp index 8f36368d4..a879d4a99 100644 --- a/Runtime/World/CScriptDoor.hpp +++ b/Runtime/World/CScriptDoor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTDOOR_HPP__ -#define __URDE_CSCRIPTDOOR_HPP__ +#pragma once #include "CPhysicsActor.hpp" @@ -58,4 +57,3 @@ public: } -#endif // __URDE_CSCRIPTDOOR_HPP__ diff --git a/Runtime/World/CScriptEffect.hpp b/Runtime/World/CScriptEffect.hpp index 910b3387b..44d2e64d6 100644 --- a/Runtime/World/CScriptEffect.hpp +++ b/Runtime/World/CScriptEffect.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPEFFECT_HPP__ -#define __URDE_CSCRIPEFFECT_HPP__ +#pragma once #include "CActor.hpp" @@ -77,4 +76,3 @@ public: } -#endif // __URDE_CSCRIPEFFECT_HPP__ diff --git a/Runtime/World/CScriptGenerator.hpp b/Runtime/World/CScriptGenerator.hpp index 5e644f820..38fb02b28 100644 --- a/Runtime/World/CScriptGenerator.hpp +++ b/Runtime/World/CScriptGenerator.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTGENERATOR_HPP__ -#define __URDE_CSCRIPTGENERATOR_HPP__ +#pragma once #include "CEntity.hpp" #include "zeus/CVector3f.hpp" @@ -32,4 +31,3 @@ public: }; } -#endif // __URDE_CSCRIPTGENERATOR_HPP__ diff --git a/Runtime/World/CScriptGrapplePoint.hpp b/Runtime/World/CScriptGrapplePoint.hpp index 3cd512dfc..0864fc607 100644 --- a/Runtime/World/CScriptGrapplePoint.hpp +++ b/Runtime/World/CScriptGrapplePoint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTGRAPPLEPOINT_HPP__ -#define __URDE_CSCRIPTGRAPPLEPOINT_HPP__ +#pragma once #include "CActor.hpp" #include "CGrappleParameters.hpp" @@ -24,4 +23,3 @@ public: }; } -#endif // __URDE_CSCRIPTGRAPPLEPOINT_HPP__ diff --git a/Runtime/World/CScriptGunTurret.hpp b/Runtime/World/CScriptGunTurret.hpp index b9577c7b5..5fa07b280 100644 --- a/Runtime/World/CScriptGunTurret.hpp +++ b/Runtime/World/CScriptGunTurret.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTGUNTURRET_HPP__ -#define __URDE_CSCRIPTGUNTURRET_HPP__ +#pragma once #include "CPhysicsActor.hpp" #include "CDamageInfo.hpp" @@ -159,4 +158,3 @@ public: } -#endif // __URDE_CSCRIPTGUNTURRET_HPP__ diff --git a/Runtime/World/CScriptHUDMemo.hpp b/Runtime/World/CScriptHUDMemo.hpp index 6561efce3..446941e4b 100644 --- a/Runtime/World/CScriptHUDMemo.hpp +++ b/Runtime/World/CScriptHUDMemo.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTHUDMEMO_HPP -#define CSCRIPTHUDMEMO_HPP +#pragma once #include "CEntity.hpp" #include "CHUDMemoParms.hpp" @@ -29,4 +28,3 @@ public: }; } -#endif // CSCRIPTHUDMEMO_HPP diff --git a/Runtime/World/CScriptMazeNode.hpp b/Runtime/World/CScriptMazeNode.hpp index deae39d5f..70ee7ba15 100644 --- a/Runtime/World/CScriptMazeNode.hpp +++ b/Runtime/World/CScriptMazeNode.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTMAZE_NODE_HPP__ -#define __URDE_CSCRIPTMAZE_NODE_HPP__ +#pragma once #include "CActor.hpp" @@ -41,4 +40,3 @@ public: }; } -#endif diff --git a/Runtime/World/CScriptMemoryRelay.hpp b/Runtime/World/CScriptMemoryRelay.hpp index 624d53dca..8aaea974d 100644 --- a/Runtime/World/CScriptMemoryRelay.hpp +++ b/Runtime/World/CScriptMemoryRelay.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTMEMORYRELAY_HPP -#define CSCRIPTMEMORYRELAY_HPP +#pragma once #include "CEntity.hpp" @@ -24,4 +23,3 @@ public: }; } -#endif // CSCRIPTMEMORYRELAY_HPP diff --git a/Runtime/World/CScriptMidi.hpp b/Runtime/World/CScriptMidi.hpp index 30afcc115..ecbeb8669 100644 --- a/Runtime/World/CScriptMidi.hpp +++ b/Runtime/World/CScriptMidi.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTMIDI_HPP__ -#define __URDE_CSCRIPTMIDI_HPP__ +#pragma once #include "CEntity.hpp" #include "CToken.hpp" @@ -30,4 +29,3 @@ public: } -#endif // __URDE_CSCRIPTSTREAMEDMUSIC_HPP__ diff --git a/Runtime/World/CScriptPickup.hpp b/Runtime/World/CScriptPickup.hpp index cf6af3420..02df3e9f9 100644 --- a/Runtime/World/CScriptPickup.hpp +++ b/Runtime/World/CScriptPickup.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTPICKUP_HPP__ -#define __URDE_CSCRIPTPICKUP_HPP__ +#pragma once #include "CPhysicsActor.hpp" #include "CPlayerState.hpp" @@ -36,4 +35,3 @@ public: }; } -#endif // __URDE_CSCRIPTPICKUP_HPP__ diff --git a/Runtime/World/CScriptPickupGenerator.hpp b/Runtime/World/CScriptPickupGenerator.hpp index 6fae1634f..45db034c0 100644 --- a/Runtime/World/CScriptPickupGenerator.hpp +++ b/Runtime/World/CScriptPickupGenerator.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTPICKUPGENERATOR_HPP__ -#define __URDE_CSCRIPTPICKUPGENERATOR_HPP__ +#pragma once #include "CEntity.hpp" #include "zeus/CVector3f.hpp" @@ -19,4 +18,3 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager &stateMgr); }; } -#endif // __URDE_CSCRIPTPICKUPGENERATOR_HPP__ diff --git a/Runtime/World/CScriptPlatform.hpp b/Runtime/World/CScriptPlatform.hpp index a23ce0b73..d3c474735 100644 --- a/Runtime/World/CScriptPlatform.hpp +++ b/Runtime/World/CScriptPlatform.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTPLATFORM_HPP__ -#define __URDE_CSCRIPTPLATFORM_HPP__ +#pragma once #include "CPhysicsActor.hpp" #include "optional.hpp" @@ -117,4 +116,3 @@ public: }; } -#endif // __URDE_CSCRIPTPLATFORM_HPP__ diff --git a/Runtime/World/CScriptPlayerActor.hpp b/Runtime/World/CScriptPlayerActor.hpp index efd869d42..fae8b48c8 100644 --- a/Runtime/World/CScriptPlayerActor.hpp +++ b/Runtime/World/CScriptPlayerActor.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTPLAYERACTOR_HPP__ -#define __URDE_CSCRIPTPLAYERACTOR_HPP__ +#pragma once #include "CScriptActor.hpp" #include "CPlayerState.hpp" @@ -74,4 +73,3 @@ public: }; } -#endif // __URDE_CSCRIPTPLAYERACTOR_HPP__ diff --git a/Runtime/World/CScriptPlayerHint.hpp b/Runtime/World/CScriptPlayerHint.hpp index 79701a4d9..ff20b481a 100644 --- a/Runtime/World/CScriptPlayerHint.hpp +++ b/Runtime/World/CScriptPlayerHint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTPLAYERHINT_HPP__ -#define __URDE_CSCRIPTPLAYERHINT_HPP__ +#pragma once #include "CActor.hpp" @@ -29,4 +28,3 @@ public: } -#endif // __URDE_CSCRIPTPLAYERHINT_HPP__ \ No newline at end of file diff --git a/Runtime/World/CScriptPlayerStateChange.hpp b/Runtime/World/CScriptPlayerStateChange.hpp index 179bd4a8e..ecae068c1 100644 --- a/Runtime/World/CScriptPlayerStateChange.hpp +++ b/Runtime/World/CScriptPlayerStateChange.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTPLAYERSTATECHANGE_HPP__ -#define __URDE_CSCRIPTPLAYERSTATECHANGE_HPP__ +#pragma once #include "World/CEntity.hpp" @@ -33,4 +32,3 @@ public: } -#endif // __URDE_CSCRIPTPLAYERSTATECHANGE_HPP__ diff --git a/Runtime/World/CScriptPointOfInterest.hpp b/Runtime/World/CScriptPointOfInterest.hpp index 32374da91..aab4b9a80 100644 --- a/Runtime/World/CScriptPointOfInterest.hpp +++ b/Runtime/World/CScriptPointOfInterest.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTPOINTOFINTEREST_HPP__ -#define __URDE_CSCRIPTPOINTOFINTEREST_HPP__ +#pragma once #include "CActor.hpp" @@ -23,4 +22,3 @@ public: std::experimental::optional GetTouchBounds() const; }; } -#endif // __URDE_CSCRIPTPOINTOFINTEREST_HPP__ diff --git a/Runtime/World/CScriptRandomRelay.hpp b/Runtime/World/CScriptRandomRelay.hpp index 26fa3d9fe..6265f24e6 100644 --- a/Runtime/World/CScriptRandomRelay.hpp +++ b/Runtime/World/CScriptRandomRelay.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTRANDOMRELAY_HPP -#define CSCRIPTRANDOMRELAY_HPP +#pragma once #include "CEntity.hpp" @@ -19,4 +18,3 @@ public: }; } -#endif // CSCRIPTRANDOMRELAY_HPP diff --git a/Runtime/World/CScriptRelay.hpp b/Runtime/World/CScriptRelay.hpp index 8884e093b..c4468a2fc 100644 --- a/Runtime/World/CScriptRelay.hpp +++ b/Runtime/World/CScriptRelay.hpp @@ -1,5 +1,4 @@ -#ifndef CSCRIPTRELAY_HPP -#define CSCRIPTRELAY_HPP +#pragma once #include "CEntity.hpp" @@ -19,4 +18,3 @@ public: }; } -#endif // CSCRIPTRELAY_HPP diff --git a/Runtime/World/CScriptRipple.hpp b/Runtime/World/CScriptRipple.hpp index 1670b8fc0..984d56326 100644 --- a/Runtime/World/CScriptRipple.hpp +++ b/Runtime/World/CScriptRipple.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTRIPPLE_HPP__ -#define __URDE_CSCRIPTRIPPLE_HPP__ +#pragma once #include "CEntity.hpp" #include "zeus/CVector3f.hpp" @@ -18,4 +17,3 @@ public: void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); }; } -#endif // __URDE_CSCRIPTRIPPLE_HPP__ diff --git a/Runtime/World/CScriptRoomAcoustics.hpp b/Runtime/World/CScriptRoomAcoustics.hpp index 15c7035ee..bd8c50730 100644 --- a/Runtime/World/CScriptRoomAcoustics.hpp +++ b/Runtime/World/CScriptRoomAcoustics.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTROOMACOUSTICS_HPP__ -#define __URDE_CSCRIPTROOMACOUSTICS_HPP__ +#pragma once #include "CEntity.hpp" #include "amuse/EffectChorus.hpp" @@ -46,4 +45,3 @@ public: } -#endif // __URDE_CSCRIPTROOMACOUSTICS_HPP__ diff --git a/Runtime/World/CScriptShadowProjector.hpp b/Runtime/World/CScriptShadowProjector.hpp index 8a2c20053..6d4e77a66 100644 --- a/Runtime/World/CScriptShadowProjector.hpp +++ b/Runtime/World/CScriptShadowProjector.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSHADOWPROJECTOR_HPP__ -#define __URDE_CSCRIPTSHADOWPROJECTOR_HPP__ +#pragma once #include "World/CActor.hpp" @@ -39,4 +38,3 @@ public: }; } -#endif // __URDE_CSCRIPTSHADOWPROJECTOR_HPP__ diff --git a/Runtime/World/CScriptSound.hpp b/Runtime/World/CScriptSound.hpp index 4dcec8cac..e919845d7 100644 --- a/Runtime/World/CScriptSound.hpp +++ b/Runtime/World/CScriptSound.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSOUND_HPP__ -#define __URDE_CSCRIPTSOUND_HPP__ +#pragma once #include "CActor.hpp" @@ -63,4 +62,3 @@ public: }; } -#endif // __URDE_CSCRIPTSOUND_HPP__ diff --git a/Runtime/World/CScriptSpawnPoint.hpp b/Runtime/World/CScriptSpawnPoint.hpp index c6302c2f9..68b1b47c7 100644 --- a/Runtime/World/CScriptSpawnPoint.hpp +++ b/Runtime/World/CScriptSpawnPoint.hpp @@ -1,5 +1,4 @@ -#ifndef __CSCRIPTSPAWNPOINT_HPP__ -#define __CSCRIPTSPAWNPOINT_HPP__ +#pragma once #include "CEntity.hpp" #include "zeus/CTransform.hpp" @@ -35,4 +34,3 @@ public: } -#endif // __CSCRIPTSPAWNPOINT_HPP__ diff --git a/Runtime/World/CScriptSpecialFunction.hpp b/Runtime/World/CScriptSpecialFunction.hpp index 83ed03a7f..71a73bf99 100644 --- a/Runtime/World/CScriptSpecialFunction.hpp +++ b/Runtime/World/CScriptSpecialFunction.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSPECIALFUNCTION_HPP__ -#define __URDE_CSCRIPTSPECIALFUNCTION_HPP__ +#pragma once #include "CActor.hpp" #include "CDamageInfo.hpp" @@ -151,4 +150,3 @@ public: }; } -#endif // CSCRIPTSPECIALFUNCTION_HPP diff --git a/Runtime/World/CScriptSpiderBallAttractionSurface.hpp b/Runtime/World/CScriptSpiderBallAttractionSurface.hpp index 6dcbbe87c..aecd6297f 100644 --- a/Runtime/World/CScriptSpiderBallAttractionSurface.hpp +++ b/Runtime/World/CScriptSpiderBallAttractionSurface.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSPIDERBALLATTRACTIONSURFACE_HPP__ -#define __URDE_CSCRIPTSPIDERBALLATTRACTIONSURFACE_HPP__ +#pragma once #include "CActor.hpp" @@ -23,4 +22,3 @@ public: } -#endif // __URDE_CSCRIPTSPIDERBALLATTRACTIONSURFACE_HPP__ diff --git a/Runtime/World/CScriptSpiderBallWaypoint.hpp b/Runtime/World/CScriptSpiderBallWaypoint.hpp index 227b9bfa1..827442a0b 100644 --- a/Runtime/World/CScriptSpiderBallWaypoint.hpp +++ b/Runtime/World/CScriptSpiderBallWaypoint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSPIDERBALLWAYPOINT_HPP__ -#define __URDE_CSCRIPTSPIDERBALLWAYPOINT_HPP__ +#pragma once #include "CActor.hpp" @@ -34,4 +33,3 @@ public: }; } -#endif // __URDE_CSCRIPTSPIDERBALLWAYPOINT_HPP__ diff --git a/Runtime/World/CScriptSpindleCamera.hpp b/Runtime/World/CScriptSpindleCamera.hpp index 42dbd03d6..c62c81c94 100644 --- a/Runtime/World/CScriptSpindleCamera.hpp +++ b/Runtime/World/CScriptSpindleCamera.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSPINDLECAMERA_HPP__ -#define __URDE_CSCRIPTSPINDLECAMERA_HPP__ +#pragma once #include "Camera/CGameCamera.hpp" @@ -68,4 +67,3 @@ public: } -#endif // __URDE_CSCRIPTSPINDLECAMERA_HPP__ diff --git a/Runtime/World/CScriptSteam.hpp b/Runtime/World/CScriptSteam.hpp index 520875b7b..88c891005 100644 --- a/Runtime/World/CScriptSteam.hpp +++ b/Runtime/World/CScriptSteam.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSTEAM_HPP__ -#define __URDE_CSCRIPTSTEAM_HPP__ +#pragma once #include "CScriptTrigger.hpp" @@ -27,4 +26,3 @@ public: } -#endif // __URDE_CSCRIPTSTEAM_HPP__ diff --git a/Runtime/World/CScriptStreamedMusic.hpp b/Runtime/World/CScriptStreamedMusic.hpp index d1c471442..8e0df1687 100644 --- a/Runtime/World/CScriptStreamedMusic.hpp +++ b/Runtime/World/CScriptStreamedMusic.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSTREAMEDMUSIC_HPP__ -#define __URDE_CSCRIPTSTREAMEDMUSIC_HPP__ +#pragma once #include "CEntity.hpp" @@ -34,4 +33,3 @@ public: } -#endif // __URDE_CSCRIPTSTREAMEDMUSIC_HPP__ diff --git a/Runtime/World/CScriptSwitch.hpp b/Runtime/World/CScriptSwitch.hpp index 7fa731a1e..d1fe0a009 100644 --- a/Runtime/World/CScriptSwitch.hpp +++ b/Runtime/World/CScriptSwitch.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTSWITCH_HPP__ -#define __URDE_CSCRIPTSWITCH_HPP__ +#pragma once #include "CEntity.hpp" @@ -16,4 +15,3 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager &stateMgr); }; } -#endif // __URDE_CSCRIPTSWITCH_HPP__ diff --git a/Runtime/World/CScriptTargetingPoint.hpp b/Runtime/World/CScriptTargetingPoint.hpp index 0b76a83f6..bab805a15 100644 --- a/Runtime/World/CScriptTargetingPoint.hpp +++ b/Runtime/World/CScriptTargetingPoint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTTARGETINGPOINT_HPP__ -#define __URDE_CSCRIPTTARGETINGPOINT_HPP__ +#pragma once #include "World/CActor.hpp" @@ -31,4 +30,3 @@ public: }; } -#endif // __URDE_CSCRIPTTARGETINGPOINT_HPP__ diff --git a/Runtime/World/CScriptTimer.hpp b/Runtime/World/CScriptTimer.hpp index cd7d2fad5..fa3dfd49d 100644 --- a/Runtime/World/CScriptTimer.hpp +++ b/Runtime/World/CScriptTimer.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTIMER_HPP__ -#define __URDE_CSCRIPTIMER_HPP__ +#pragma once #include "CEntity.hpp" @@ -29,4 +28,3 @@ public: } -#endif // __URDE_CSCRIPTIMER_HPP__ diff --git a/Runtime/World/CScriptTrigger.hpp b/Runtime/World/CScriptTrigger.hpp index a7af902bd..64b3677e2 100644 --- a/Runtime/World/CScriptTrigger.hpp +++ b/Runtime/World/CScriptTrigger.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTTRIGGER_HPP__ -#define __URDE_CSCRIPTTRIGGER_HPP__ +#pragma once #include "CActor.hpp" #include "CDamageInfo.hpp" @@ -91,4 +90,3 @@ public: }; } -#endif // __URDE_CSCRIPTTRIGGER_HPP__ diff --git a/Runtime/World/CScriptVisorFlare.hpp b/Runtime/World/CScriptVisorFlare.hpp index 3b784766c..6965f0dc1 100644 --- a/Runtime/World/CScriptVisorFlare.hpp +++ b/Runtime/World/CScriptVisorFlare.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTVISORFLARE_HPP__ -#define __URDE_CSCRIPTVISORFLARE_HPP__ +#pragma once #include "CActor.hpp" #include "CVisorFlare.hpp" @@ -28,4 +27,3 @@ public: } -#endif // __URDE_CSCRIPTVISORFLARE_HPP__ diff --git a/Runtime/World/CScriptVisorGoo.hpp b/Runtime/World/CScriptVisorGoo.hpp index 4111abf7f..0178d2d52 100644 --- a/Runtime/World/CScriptVisorGoo.hpp +++ b/Runtime/World/CScriptVisorGoo.hpp @@ -1,5 +1,4 @@ -#ifndef URDE_CSCRIPTVISORGOO_HPP -#define URDE_CSCRIPTVISORGOO_HPP +#pragma once #include "CActor.hpp" @@ -35,4 +34,3 @@ public: } -#endif // URDE_CSCRIPTVISORGOO_HPP diff --git a/Runtime/World/CScriptWater.hpp b/Runtime/World/CScriptWater.hpp index 87ecb962a..7f5b58705 100644 --- a/Runtime/World/CScriptWater.hpp +++ b/Runtime/World/CScriptWater.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTWATER_HPP__ -#define __URDE_CSCRIPTWATER_HPP__ +#pragma once #include "CScriptTrigger.hpp" #include "CFluidPlaneCPU.hpp" @@ -136,4 +135,3 @@ public: }; } -#endif // __URDE_CSCRIPTWATER_HPP__ diff --git a/Runtime/World/CScriptWaypoint.hpp b/Runtime/World/CScriptWaypoint.hpp index 441a06a0a..b76629060 100644 --- a/Runtime/World/CScriptWaypoint.hpp +++ b/Runtime/World/CScriptWaypoint.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSCRIPTWAYPOINT_HPP__ -#define __URDE_CSCRIPTWAYPOINT_HPP__ +#pragma once #include "CActor.hpp" @@ -32,4 +31,3 @@ public: }; } -#endif // __URDE_CSCRIPTWAYPOINT_HPP__ diff --git a/Runtime/World/CScriptWorldTeleporter.hpp b/Runtime/World/CScriptWorldTeleporter.hpp index 3125f1ca6..84e505723 100644 --- a/Runtime/World/CScriptWorldTeleporter.hpp +++ b/Runtime/World/CScriptWorldTeleporter.hpp @@ -1,5 +1,4 @@ -#ifndef __CSCRIPTWORLDTELEPORTER_HPP__ -#define __CSCRIPTWORLDTELEPORTER_HPP__ +#pragma once #include "CEntity.hpp" #include "CAnimationParameters.hpp" @@ -59,4 +58,3 @@ public: }; } -#endif // __CSCRIPTWORLDTELEPORTER_HPP__ diff --git a/Runtime/World/CSnakeWeedSwarm.hpp b/Runtime/World/CSnakeWeedSwarm.hpp index 313705c44..cc7724bd2 100644 --- a/Runtime/World/CSnakeWeedSwarm.hpp +++ b/Runtime/World/CSnakeWeedSwarm.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CSNAKEWEEDSWARM_HPP__ -#define __URDE_CSNAKEWEEDSWARM_HPP__ +#pragma once #include "World/CActor.hpp" #include "Collision/CCollisionSurface.hpp" @@ -21,4 +20,3 @@ public: }; } -#endif // __URDE_CSNAKEWEEDSWARM_HPP__ diff --git a/Runtime/World/CStateMachine.hpp b/Runtime/World/CStateMachine.hpp index 97c815279..e5bc5d1d5 100644 --- a/Runtime/World/CStateMachine.hpp +++ b/Runtime/World/CStateMachine.hpp @@ -1,5 +1,4 @@ -#ifndef CSTATEMACHINE_HPP -#define CSTATEMACHINE_HPP +#pragma once #include "CAiFuncMap.hpp" #include "IObj.hpp" @@ -127,4 +126,3 @@ CFactoryFnReturn FAiFiniteStateMachineFactory(const SObjectTag& tag, CInputStrea } -#endif // CSTATEMACHINE_HPP diff --git a/Runtime/World/CTeamAiMgr.hpp b/Runtime/World/CTeamAiMgr.hpp index 7c871b313..a305cb307 100644 --- a/Runtime/World/CTeamAiMgr.hpp +++ b/Runtime/World/CTeamAiMgr.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEAMAIMGR_HPP__ -#define __URDE_CTEAMAIMGR_HPP__ +#pragma once #include "CEntity.hpp" @@ -30,4 +29,3 @@ public: }; } -#endif // __URDE_CTEAMAIMGR_HPP__ diff --git a/Runtime/World/CTeamAiTypes.hpp b/Runtime/World/CTeamAiTypes.hpp index e87f334ed..a0e4c3a56 100644 --- a/Runtime/World/CTeamAiTypes.hpp +++ b/Runtime/World/CTeamAiTypes.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CTEAMAITYPES_HPP__ -#define __URDE_CTEAMAITYPES_HPP__ +#pragma once namespace urde { @@ -10,4 +9,3 @@ class CTeamAiTypes } -#endif // __URDE_CTEAMAITYPES_HPP__ diff --git a/Runtime/World/CVisorFlare.hpp b/Runtime/World/CVisorFlare.hpp index 42737e882..1ad251ea5 100644 --- a/Runtime/World/CVisorFlare.hpp +++ b/Runtime/World/CVisorFlare.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CVISORFLARE_HPP__ -#define __URDE_CVISORFLARE_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CToken.hpp" @@ -54,4 +53,3 @@ public: } -#endif // __URDE_CVISORFLARE_HPP__ diff --git a/Runtime/World/CVisorParameters.hpp b/Runtime/World/CVisorParameters.hpp index 2a05e02af..af2900fb7 100644 --- a/Runtime/World/CVisorParameters.hpp +++ b/Runtime/World/CVisorParameters.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CVISORPARAMETERS_HPP__ -#define __URDE_CVISORPARAMETERS_HPP__ +#pragma once #include "RetroTypes.hpp" @@ -21,4 +20,3 @@ public: } -#endif // __URDE_CVISORPARAMETERS_HPP__ diff --git a/Runtime/World/CWallCrawlerSwarm.hpp b/Runtime/World/CWallCrawlerSwarm.hpp index c0e50a422..12904cd12 100644 --- a/Runtime/World/CWallCrawlerSwarm.hpp +++ b/Runtime/World/CWallCrawlerSwarm.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWALLCRAWLERSWARM_HPP__ -#define __URDE_CWALLCRAWLERSWARM_HPP__ +#pragma once #include "World/CActor.hpp" #include "Collision/CCollisionSurface.hpp" @@ -77,4 +76,3 @@ public: }; } -#endif // __URDE_CWALLCRAWLERSWARM_HPP__ diff --git a/Runtime/World/CWallWalker.hpp b/Runtime/World/CWallWalker.hpp index 38f3b7373..0c61af5c0 100644 --- a/Runtime/World/CWallWalker.hpp +++ b/Runtime/World/CWallWalker.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWALLWALKER_HPP__ -#define __URDE_CWALLWALKER_HPP__ +#pragma once #include "CPatterned.hpp" #include "Collision/CCollisionSurface.hpp" @@ -41,4 +40,3 @@ public: void UpdateWPDestination(CStateManager&); }; } -#endif // __URDE_CWALLWALKER_HPP__ diff --git a/Runtime/World/CWorld.hpp b/Runtime/World/CWorld.hpp index 403d5f767..93e775dab 100644 --- a/Runtime/World/CWorld.hpp +++ b/Runtime/World/CWorld.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWORLD_HPP__ -#define __URDE_CWORLD_HPP__ +#pragma once #include "RetroTypes.hpp" #include "ScriptObjectSupport.hpp" @@ -229,5 +228,4 @@ struct CWorldLayers } -#endif // __URDE_CWORLD_HPP__ diff --git a/Runtime/World/CWorldLight.hpp b/Runtime/World/CWorldLight.hpp index d5c8194a8..89b683c38 100644 --- a/Runtime/World/CWorldLight.hpp +++ b/Runtime/World/CWorldLight.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWORLDLIGHT_HPP__ -#define __URDE_CWORLDLIGHT_HPP__ +#pragma once #include "Graphics/CLight.hpp" @@ -43,4 +42,3 @@ public: } -#endif // __URDE_CWORLDLIGHT_HPP__ diff --git a/Runtime/World/CWorldShadow.hpp b/Runtime/World/CWorldShadow.hpp index b76174d82..2ffdadf2a 100644 --- a/Runtime/World/CWorldShadow.hpp +++ b/Runtime/World/CWorldShadow.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWORLDSHADOW_HPP__ -#define __URDE_CWORLDSHADOW_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CAABox.hpp" @@ -36,4 +35,3 @@ public: } -#endif // __URDE_CWORLDSHADOW_HPP__ diff --git a/Runtime/World/CWorldTransManager.hpp b/Runtime/World/CWorldTransManager.hpp index d8379052f..37ab2188f 100644 --- a/Runtime/World/CWorldTransManager.hpp +++ b/Runtime/World/CWorldTransManager.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CWORLDTRANSMANAGER_HPP__ -#define __URDE_CWORLDTRANSMANAGER_HPP__ +#pragma once #include "RetroTypes.hpp" #include "CRandom16.hpp" @@ -136,4 +135,3 @@ public: } -#endif // __URDE_CWORLDTRANSMANAGER_HPP__ diff --git a/Runtime/World/IGameArea.hpp b/Runtime/World/IGameArea.hpp index 491754321..dfe985a42 100644 --- a/Runtime/World/IGameArea.hpp +++ b/Runtime/World/IGameArea.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_IGAMEAREA_HPP__ -#define __URDE_IGAMEAREA_HPP__ +#pragma once #include "RetroTypes.hpp" #include "zeus/CTransform.hpp" @@ -64,4 +63,3 @@ enum class EChain } -#endif // __URDE_IGAMEAREA_HPP__ diff --git a/Runtime/World/ScriptLoader.hpp b/Runtime/World/ScriptLoader.hpp index 988712272..21049e80d 100644 --- a/Runtime/World/ScriptLoader.hpp +++ b/Runtime/World/ScriptLoader.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_SCRIPTLOADER_HPP__ -#define __URDE_SCRIPTLOADER_HPP__ +#pragma once #include "IOStreams.hpp" #include "zeus/CTransform.hpp" @@ -165,4 +164,3 @@ public: } -#endif // __URDE_SCRIPTLOADER_HPP__ diff --git a/Runtime/World/ScriptObjectSupport.hpp b/Runtime/World/ScriptObjectSupport.hpp index 788f112b6..38c93e083 100644 --- a/Runtime/World/ScriptObjectSupport.hpp +++ b/Runtime/World/ScriptObjectSupport.hpp @@ -1,5 +1,4 @@ -#ifndef __SCRIPT_OBJECT_SUPPORT_HPP__ -#define __SCRIPT_OBJECT_SUPPORT_HPP__ +#pragma once #include @@ -236,4 +235,3 @@ std::string_view ScriptObjectMessageToStr(EScriptObjectMessage message); } -#endif // __SCRIPT_OBJECT_SUPPORT_HPP__ diff --git a/Runtime/rstl.hpp b/Runtime/rstl.hpp index aed004a54..b609a42ea 100644 --- a/Runtime/rstl.hpp +++ b/Runtime/rstl.hpp @@ -1,5 +1,4 @@ -#ifndef __RSTL_HPP__ -#define __RSTL_HPP__ +#pragma once #include #include @@ -602,4 +601,3 @@ string string_l(const char* data) } -#endif // __RSTL_HPP__ diff --git a/amuse b/amuse index 4c7971f53..dbd48a39c 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 4c7971f53a0f5c8fe471536d7e5ebc2fe2f0c601 +Subproject commit dbd48a39cc4eb746bde103e2721d5054d11c4c30 diff --git a/hecl b/hecl index 0ca2a8fa8..2aa318273 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 0ca2a8fa8c25a0d3c5e763f474feadf470371280 +Subproject commit 2aa3182734c78a67637c6bfcee6d39a33cd5ff61 diff --git a/hecl-gui b/hecl-gui index 690a69707..670633992 160000 --- a/hecl-gui +++ b/hecl-gui @@ -1 +1 @@ -Subproject commit 690a69707dea51eead11d4c0e7246603c6e8e52c +Subproject commit 670633992e5f3ebc63b4b8953536ff97082bb56f diff --git a/jbus b/jbus index 349263a88..500f88d7a 160000 --- a/jbus +++ b/jbus @@ -1 +1 @@ -Subproject commit 349263a88c736af830c000a29a2710c46d1ff249 +Subproject commit 500f88d7a70c5118b05209ca2e513f8440606a04 diff --git a/kabufuda b/kabufuda index 37461f216..e84546be2 160000 --- a/kabufuda +++ b/kabufuda @@ -1 +1 @@ -Subproject commit 37461f2165d2ebe94871ceef22fbea5b6044cf20 +Subproject commit e84546be2dcf64c628971cdda601c35cc07b14d1 diff --git a/nod b/nod index eb6aa3056..e964a013f 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit eb6aa30563e262167f173c6450b67e39062157ca +Subproject commit e964a013fe26ff097c4b69b9f607b015505dee0e diff --git a/specter b/specter index fafcfaa50..e7cf4931c 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit fafcfaa50aef8ac2231bf79335cd8a2871561dea +Subproject commit e7cf4931c734caceeae07f013ba049d5ec887396 diff --git a/visigen/VISIBuilder.hpp b/visigen/VISIBuilder.hpp index 4043d1802..b55015d79 100644 --- a/visigen/VISIBuilder.hpp +++ b/visigen/VISIBuilder.hpp @@ -1,5 +1,4 @@ -#ifndef _DNACOMMON_VISIBUILDER_HPP_ -#define _DNACOMMON_VISIBUILDER_HPP_ +#pragma once #include "VISIRenderer.hpp" #include "zeus/CAABox.hpp" @@ -134,4 +133,3 @@ struct VISIBuilder VISIBuilder(VISIRenderer& renderer) : renderCache(renderer) {} }; -#endif // _DNACOMMON_VISIBUILDER_HPP_ diff --git a/visigen/VISIRenderer.hpp b/visigen/VISIRenderer.hpp index 33189860e..5b7e53493 100644 --- a/visigen/VISIRenderer.hpp +++ b/visigen/VISIRenderer.hpp @@ -1,5 +1,4 @@ -#ifndef VISIRENDERER_HPP -#define VISIRENDERER_HPP +#pragma once #include "boo/graphicsdev/glew.h" #include "hecl/SystemChar.hpp" @@ -108,4 +107,3 @@ public: int ReturnVal() const { return m_return; } }; -#endif // VISIRENDERER_HPP