From e92ca59c9cd3bbc5bb33ceb5f284bb0c66681325 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Sat, 5 Jul 2025 13:20:37 +0200 Subject: [PATCH 1/5] [GEN][ZH] Remove all RTS_INTERNAL epilogues (#1231) --- Core/GameEngine/Source/Common/System/Xfer.cpp | 5 ----- .../Source/Compression/CompressionManager.cpp | 5 ----- .../Source/Compression/LZHCompress/NoxCompress.cpp | 5 ----- .../Source/WWVegas/WW3D2/render2dsentence.cpp | 5 ----- Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp | 5 ----- .../Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp | 5 ----- Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp | 5 ----- Core/Tools/MapCacheBuilder/Source/WinMain.cpp | 5 ----- .../GameEngine/Include/GameLogic/Module/JetAIUpdate.h | 5 ----- .../GameEngine/Source/Common/Audio/AudioEventRTS.cpp | 4 ---- .../Code/GameEngine/Source/Common/Audio/GameAudio.cpp | 4 ---- .../Code/GameEngine/Source/Common/Audio/GameMusic.cpp | 4 ---- .../Code/GameEngine/Source/Common/Audio/GameSounds.cpp | 4 ---- Generals/Code/GameEngine/Source/Common/CRCDebug.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/CommandLine.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/GameEngine.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/GameLOD.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/INI/INI.cpp | 5 ----- .../Code/GameEngine/Source/Common/INI/INIMapCache.cpp | 5 ----- .../GameEngine/Source/Common/INI/INIWebpageURL.cpp | 5 ----- .../Code/GameEngine/Source/Common/MessageStream.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/PerfTimer.cpp | 5 ----- .../GameEngine/Source/Common/RTS/ActionManager.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/RTS/Player.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/PlayerList.cpp | 5 ----- .../GameEngine/Source/Common/RTS/PlayerTemplate.cpp | 5 ----- .../Source/Common/RTS/ProductionPrerequisite.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/RTS/Science.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/SpecialPower.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/RTS/Team.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/RandomValue.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/Recorder.cpp | 5 ----- .../Code/GameEngine/Source/Common/StateMachine.cpp | 6 ------ .../Source/Common/System/ArchiveFileSystem.cpp | 5 ----- .../GameEngine/Source/Common/System/BuildAssistant.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/Debug.cpp | 4 ---- .../GameEngine/Source/Common/System/GameMemory.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/Geometry.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/LocalFile.cpp | 5 ----- .../GameEngine/Source/Common/System/MemoryInit.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/Radar.cpp | 5 ----- .../Source/Common/System/SaveGame/GameState.cpp | 5 ----- .../Source/Common/System/SaveGame/GameStateMap.cpp | 5 ----- .../Source/Common/System/SubsystemInterface.cpp | 5 ----- .../GameEngine/Source/Common/System/UnicodeString.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/registry.cpp | 5 ----- .../Code/GameEngine/Source/Common/Thing/Module.cpp | 5 ----- .../GameEngine/Source/Common/Thing/ModuleFactory.cpp | 5 ----- Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp | 5 ----- .../GameEngine/Source/Common/Thing/ThingFactory.cpp | 5 ----- .../GameEngine/Source/Common/Thing/ThingTemplate.cpp | 5 ----- .../Code/GameEngine/Source/Common/UserPreferences.cpp | 5 ----- Generals/Code/GameEngine/Source/GameClient/Color.cpp | 5 ----- Generals/Code/GameEngine/Source/GameClient/Credits.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/Drawable.cpp | 5 ----- .../GameClient/Drawable/Update/SwayClientUpdate.cpp | 5 ----- Generals/Code/GameEngine/Source/GameClient/Eva.cpp | 5 ----- Generals/Code/GameEngine/Source/GameClient/FXList.cpp | 5 ----- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 5 ----- .../GameClient/GUI/ControlBar/ControlBarCommand.cpp | 5 ----- .../GUI/ControlBar/ControlBarCommandProcessing.cpp | 5 ----- .../GUI/ControlBar/ControlBarMultiSelect.cpp | 5 ----- .../GameClient/GUI/ControlBar/ControlBarScheme.cpp | 5 ----- .../GUI/ControlBar/ControlBarStructureInventory.cpp | 5 ----- .../GUI/GUICallbacks/ControlBarPopupDescription.cpp | 5 ----- .../Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/GameInfoWindow.cpp | 5 ----- .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/PopupHostGame.cpp | 5 ----- .../GUI/GUICallbacks/Menus/PopupLadderSelect.cpp | 5 ----- .../GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 5 ----- .../GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp | 5 ----- .../GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp | 5 ----- .../Source/GameClient/GUI/Gadget/GadgetListBox.cpp | 5 ----- .../Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp | 5 ----- .../GameClient/GUI/Gadget/GadgetVerticalSlider.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/GameWindow.cpp | 5 ----- .../Source/GameClient/GUI/GameWindowManager.cpp | 5 ----- .../Source/GameClient/GUI/GameWindowManagerScript.cpp | 5 ----- .../Source/GameClient/GUI/GameWindowTransitions.cpp | 5 ----- .../GameClient/GUI/GameWindowTransitionsStyles.cpp | 5 ----- .../Source/GameClient/GUI/HeaderTemplate.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/IMEManager.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 10 ---------- .../GameEngine/Source/GameClient/GUI/Shell/Shell.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/WindowLayout.cpp | 6 ------ .../Code/GameEngine/Source/GameClient/GameClient.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/GameText.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/InGameUI.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 5 ----- .../GameEngine/Source/GameClient/LanguageFilter.cpp | 5 ----- Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp | 5 ----- .../Source/GameClient/MessageStream/CommandXlat.cpp | 5 ----- .../GameClient/MessageStream/GUICommandTranslator.cpp | 5 ----- .../Source/GameClient/MessageStream/MetaEvent.cpp | 5 ----- .../Source/GameClient/MessageStream/SelectionXlat.cpp | 5 ----- .../Source/GameClient/MessageStream/WindowXlat.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/RadiusDecal.cpp | 5 ----- .../GameEngine/Source/GameClient/SelectionInfo.cpp | 5 ----- .../GameEngine/Source/GameClient/System/Anim2D.cpp | 5 ----- .../Source/GameClient/System/CampaignManager.cpp | 5 ----- .../Source/GameClient/System/ParticleSys.cpp | 5 ----- .../Source/GameClient/Terrain/TerrainVisual.cpp | 5 ----- Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp | 5 ----- .../Source/GameLogic/AI/AISkirmishPlayer.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIStates.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp | 5 ----- Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp | 5 ----- .../GameEngine/Source/GameLogic/Map/TerrainLogic.cpp | 5 ----- .../GameLogic/Object/Behavior/AutoHealBehavior.cpp | 5 ----- .../Object/Behavior/DumbProjectileBehavior.cpp | 5 ----- .../Object/Behavior/FireWeaponWhenDeadBehavior.cpp | 5 ----- .../Object/Behavior/GenerateMinefieldBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/MinefieldBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/OverchargeBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/PoisonedBehavior.cpp | 5 ----- .../Object/Behavior/PropagandaTowerBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/RebuildHoleBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/SlowDeathBehavior.cpp | 5 ----- .../Source/GameLogic/Object/Behavior/SpawnBehavior.cpp | 5 ----- .../Source/GameLogic/Object/Body/ActiveBody.cpp | 5 ----- .../ConvertToHijackedVehicleCrateCollide.cpp | 5 ----- .../Object/Collide/CrateCollide/CrateCollide.cpp | 5 ----- .../Source/GameLogic/Object/Collide/SquishCollide.cpp | 5 ----- .../GameLogic/Object/Contain/GarrisonContain.cpp | 4 ---- .../Source/GameLogic/Object/Contain/OpenContain.cpp | 5 ----- .../GameLogic/Object/Contain/OverlordContain.cpp | 5 ----- .../GameLogic/Object/Contain/ParachuteContain.cpp | 5 ----- .../GameLogic/Object/Contain/TransportContain.cpp | 5 ----- .../Source/GameLogic/Object/Contain/TunnelContain.cpp | 5 ----- .../Source/GameLogic/Object/Create/PreorderCreate.cpp | 5 ----- .../Source/GameLogic/Object/Die/CreateObjectDie.cpp | 5 ----- .../Source/GameLogic/Object/Die/DestroyDie.cpp | 5 ----- .../Source/GameLogic/Object/Die/DieModule.cpp | 5 ----- .../GameLogic/Object/Die/RebuildHoleExposeDie.cpp | 5 ----- .../Source/GameLogic/Object/ExperienceTracker.cpp | 5 ----- .../Source/GameLogic/Object/FiringTracker.cpp | 5 ----- .../GameLogic/Object/Helper/ObjectDefectionHelper.cpp | 5 ----- .../Source/GameLogic/Object/Helper/ObjectHelper.cpp | 5 ----- .../GameEngine/Source/GameLogic/Object/Locomotor.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/Object/Object.cpp | 5 ----- .../Source/GameLogic/Object/ObjectCreationList.cpp | 5 ----- .../Source/GameLogic/Object/PartitionManager.cpp | 5 ----- .../GameLogic/Object/SpecialPower/OCLSpecialPower.cpp | 5 ----- .../GameLogic/Object/SpecialPower/SpecialAbility.cpp | 5 ----- .../Object/SpecialPower/SpecialPowerModule.cpp | 5 ----- .../Source/GameLogic/Object/Update/AIUpdate.cpp | 5 ----- .../Update/AIUpdate/AssaultTransportAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/ChinookAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/DeployStyleAIUpdate.cpp | 5 ----- .../GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/HackInternetAIUpdate.cpp | 5 ----- .../GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/MissileAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp | 9 --------- .../Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/TransportAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 5 ----- .../Object/Update/AssistedTargetingUpdate.cpp | 5 ----- .../GameLogic/Object/Update/BattlePlanUpdate.cpp | 5 ----- .../GameLogic/Object/Update/CleanupHazardUpdate.cpp | 5 ----- .../Object/Update/CommandButtonHuntUpdate.cpp | 5 ----- .../Update/DockUpdate/SupplyWarehouseDockUpdate.cpp | 5 ----- .../Object/Update/DynamicShroudClearingRangeUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/EMPUpdate.cpp | 5 ----- .../Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp | 5 ----- .../GameLogic/Object/Update/FireWeaponUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/FloatUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/HeightDieUpdate.cpp | 5 ----- .../Object/Update/HelicopterSlowDeathUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/HordeUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/LifetimeUpdate.cpp | 5 ----- .../Object/Update/MissileLauncherBuildingUpdate.cpp | 5 ----- .../GameLogic/Object/Update/MobMemberSlavedUpdate.cpp | 5 ----- .../Object/Update/ParticleUplinkCannonUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/PhysicsUpdate.cpp | 5 ----- .../GameLogic/Object/Update/PowerPlantUpdate.cpp | 5 ----- .../GameLogic/Object/Update/ProductionUpdate.cpp | 5 ----- .../GameLogic/Object/Update/ProjectileStreamUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/SlavedUpdate.cpp | 5 ----- .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 5 ----- .../GameLogic/Object/Update/StealthDetectorUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/StealthUpdate.cpp | 5 ----- .../GameLogic/Object/Update/StructureToppleUpdate.cpp | 5 ----- .../GameLogic/Object/Update/TensileFormationUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/UpdateModule.cpp | 5 ----- .../Source/GameLogic/Object/Upgrade/UpgradeModule.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/Object/Weapon.cpp | 5 ----- .../GameEngine/Source/GameLogic/Object/WeaponSet.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/ScriptActions.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/ScriptConditions.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/Scripts.cpp | 5 ----- .../GameLogic/ScriptEngine/VictoryConditions.cpp | 5 ----- .../GameEngine/Source/GameLogic/System/GameLogic.cpp | 5 ----- .../Source/GameLogic/System/GameLogicDispatch.cpp | 5 ----- .../GameEngine/Source/GameLogic/System/RankInfo.cpp | 5 ----- .../Source/GameNetwork/ConnectionManager.cpp | 5 ----- .../Source/GameNetwork/DisconnectManager.cpp | 5 ----- .../GameEngine/Source/GameNetwork/FirewallHelper.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/GUIUtil.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/GameInfo.cpp | 5 ----- .../GameEngine/Source/GameNetwork/GameSpy/Chat.cpp | 5 ----- .../GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp | 5 ----- .../Source/GameNetwork/GameSpy/LadderDefs.cpp | 5 ----- .../Source/GameNetwork/GameSpy/LobbyUtils.cpp | 5 ----- .../Source/GameNetwork/GameSpy/MainMenuUtils.cpp | 5 ----- .../GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp | 5 ----- .../Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp | 5 ----- .../Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp | 5 ----- .../Source/GameNetwork/GameSpy/Thread/PeerThread.cpp | 10 ---------- .../GameSpy/Thread/PersistentStorageThread.cpp | 5 ----- Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp | 5 ----- .../GameEngine/Source/GameNetwork/LANAPICallbacks.cpp | 5 ----- Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/NetPacket.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/Network.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/Transport.cpp | 5 ----- .../Source/GameNetwork/WOLBrowser/WebBrowser.cpp | 5 ----- Generals/Code/GameEngine/Source/GameNetwork/udp.cpp | 5 ----- .../Source/MilesAudioDevice/MilesAudioManager.cpp | 4 ---- .../Source/W3DDevice/Common/System/W3DRadar.cpp | 5 ----- .../Drawable/Draw/W3DDependencyModelDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DLaserDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DModelDraw.cpp | 5 ----- .../W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp | 5 ----- .../W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DTracerDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DTruckDraw.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/W3DControlBar.cpp | 5 ----- .../GameClient/GUI/Gadget/W3DHorizontalSlider.cpp | 5 ----- .../W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp | 5 ----- .../W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp | 5 ----- .../W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp | 5 ----- .../Source/W3DDevice/GameClient/HeightMap.cpp | 5 ----- .../W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp | 5 ----- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DAssetManager.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DDisplay.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DDisplayString.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DInGameUI.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DMouse.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DRoadBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DScene.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DShaderManager.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DShroud.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DTerrainTracks.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DView.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/Water/W3DWater.cpp | 5 ----- .../Source/W3DDevice/GameLogic/W3DGhostObject.cpp | 5 ----- .../Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp | 5 ----- .../Source/Win32Device/Common/Win32BIGFileSystem.cpp | 5 ----- .../Source/Win32Device/Common/Win32OSDisplay.cpp | 4 ---- .../Source/Win32Device/GameClient/Win32Mouse.cpp | 5 ----- Generals/Code/Main/WinMain.cpp | 5 ----- Generals/Code/Tools/WorldBuilder/src/EditAction.cpp | 5 ----- Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/ScriptProperties.cpp | 5 ----- Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp | 5 ----- Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp | 5 ----- .../GameEngine/Include/GameLogic/Module/JetAIUpdate.h | 5 ----- .../GameEngine/Source/Common/Audio/AudioEventRTS.cpp | 4 ---- .../Code/GameEngine/Source/Common/Audio/GameAudio.cpp | 4 ---- .../Code/GameEngine/Source/Common/Audio/GameMusic.cpp | 4 ---- .../Code/GameEngine/Source/Common/Audio/GameSounds.cpp | 4 ---- GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp | 5 ----- .../Code/GameEngine/Source/Common/CommandLine.cpp | 5 ----- .../Code/GameEngine/Source/Common/GameEngine.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp | 5 ----- .../Code/GameEngine/Source/Common/INI/INIMapCache.cpp | 5 ----- .../GameEngine/Source/Common/INI/INIWebpageURL.cpp | 5 ----- .../Code/GameEngine/Source/Common/MessageStream.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/AcademyStats.cpp | 5 ----- .../GameEngine/Source/Common/RTS/ActionManager.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/Energy.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/Player.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/PlayerList.cpp | 5 ----- .../GameEngine/Source/Common/RTS/PlayerTemplate.cpp | 5 ----- .../Source/Common/RTS/ProductionPrerequisite.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/Science.cpp | 5 ----- .../Code/GameEngine/Source/Common/RTS/SpecialPower.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp | 5 ----- .../Code/GameEngine/Source/Common/RandomValue.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp | 5 ----- .../Code/GameEngine/Source/Common/StateMachine.cpp | 6 ------ .../Source/Common/System/ArchiveFileSystem.cpp | 5 ----- .../GameEngine/Source/Common/System/BuildAssistant.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/Debug.cpp | 4 ---- .../GameEngine/Source/Common/System/GameMemory.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/Geometry.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/LocalFile.cpp | 5 ----- .../GameEngine/Source/Common/System/MemoryInit.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/Radar.cpp | 5 ----- .../Source/Common/System/SaveGame/GameState.cpp | 5 ----- .../Source/Common/System/SaveGame/GameStateMap.cpp | 5 ----- .../Source/Common/System/SubsystemInterface.cpp | 5 ----- .../GameEngine/Source/Common/System/UnicodeString.cpp | 5 ----- .../Code/GameEngine/Source/Common/System/registry.cpp | 5 ----- .../Code/GameEngine/Source/Common/Thing/Module.cpp | 5 ----- .../GameEngine/Source/Common/Thing/ModuleFactory.cpp | 5 ----- .../Code/GameEngine/Source/Common/Thing/Thing.cpp | 5 ----- .../GameEngine/Source/Common/Thing/ThingFactory.cpp | 5 ----- .../GameEngine/Source/Common/Thing/ThingTemplate.cpp | 5 ----- .../Code/GameEngine/Source/Common/UserPreferences.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/Credits.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/Drawable.cpp | 5 ----- .../GameClient/Drawable/Update/SwayClientUpdate.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/FXList.cpp | 5 ----- .../Source/GameClient/GUI/ChallengeGenerals.cpp | 5 ----- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 5 ----- .../GameClient/GUI/ControlBar/ControlBarCommand.cpp | 5 ----- .../GUI/ControlBar/ControlBarCommandProcessing.cpp | 5 ----- .../GUI/ControlBar/ControlBarMultiSelect.cpp | 5 ----- .../GameClient/GUI/ControlBar/ControlBarScheme.cpp | 5 ----- .../GUI/ControlBar/ControlBarStructureInventory.cpp | 5 ----- .../GUI/GUICallbacks/ControlBarPopupDescription.cpp | 5 ----- .../Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp | 5 ----- .../GUI/GUICallbacks/Menus/ChallengeMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/GameInfoWindow.cpp | 5 ----- .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/PopupHostGame.cpp | 5 ----- .../GUI/GUICallbacks/Menus/PopupLadderSelect.cpp | 5 ----- .../GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 5 ----- .../GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp | 5 ----- .../GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp | 5 ----- .../GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp | 5 ----- .../Source/GameClient/GUI/Gadget/GadgetListBox.cpp | 5 ----- .../Source/GameClient/GUI/Gadget/GadgetPushButton.cpp | 5 ----- .../Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp | 5 ----- .../GameClient/GUI/Gadget/GadgetVerticalSlider.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/GameWindow.cpp | 5 ----- .../Source/GameClient/GUI/GameWindowManager.cpp | 5 ----- .../Source/GameClient/GUI/GameWindowManagerScript.cpp | 5 ----- .../Source/GameClient/GUI/GameWindowTransitions.cpp | 5 ----- .../GameClient/GUI/GameWindowTransitionsStyles.cpp | 5 ----- .../Source/GameClient/GUI/HeaderTemplate.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/IMEManager.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/Shell/Shell.cpp | 5 ----- .../GameEngine/Source/GameClient/GUI/WindowLayout.cpp | 6 ------ .../Code/GameEngine/Source/GameClient/GameClient.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/GameText.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/InGameUI.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 5 ----- .../GameEngine/Source/GameClient/LanguageFilter.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/MapUtil.cpp | 5 ----- .../Source/GameClient/MessageStream/CommandXlat.cpp | 5 ----- .../GameClient/MessageStream/GUICommandTranslator.cpp | 5 ----- .../Source/GameClient/MessageStream/MetaEvent.cpp | 5 ----- .../GameClient/MessageStream/PlaceEventTranslator.cpp | 5 ----- .../Source/GameClient/MessageStream/SelectionXlat.cpp | 5 ----- .../Source/GameClient/MessageStream/WindowXlat.cpp | 5 ----- .../GameEngine/Source/GameClient/ParabolicEase.cpp | 5 ----- .../Code/GameEngine/Source/GameClient/RadiusDecal.cpp | 5 ----- .../GameEngine/Source/GameClient/SelectionInfo.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp | 5 ----- .../GameEngine/Source/GameClient/System/Anim2D.cpp | 5 ----- .../Source/GameClient/System/CampaignManager.cpp | 5 ----- .../Source/GameClient/System/ParticleSys.cpp | 5 ----- .../GameEngine/Source/GameClient/System/Smudge.cpp | 5 ----- .../Source/GameClient/Terrain/TerrainVisual.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp | 5 ----- .../Source/GameLogic/AI/AIGuardRetaliate.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp | 5 ----- .../Source/GameLogic/AI/AISkirmishPlayer.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AIStates.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/Squad.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp | 5 ----- .../GameEngine/Source/GameLogic/Map/TerrainLogic.cpp | 5 ----- .../GameLogic/Object/Behavior/AutoHealBehavior.cpp | 5 ----- .../Object/Behavior/BattleBusSlowDeathBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/BunkerBusterBehavior.cpp | 5 ----- .../Object/Behavior/CountermeasuresBehavior.cpp | 5 ----- .../Object/Behavior/DumbProjectileBehavior.cpp | 5 ----- .../Object/Behavior/FireWeaponWhenDeadBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/FlightDeckBehavior.cpp | 5 ----- .../Object/Behavior/GenerateMinefieldBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/GrantStealthBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/MinefieldBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/NeutonBlastBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/OverchargeBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/PoisonedBehavior.cpp | 5 ----- .../Object/Behavior/PropagandaTowerBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/RebuildHoleBehavior.cpp | 5 ----- .../GameLogic/Object/Behavior/SlowDeathBehavior.cpp | 5 ----- .../Source/GameLogic/Object/Behavior/SpawnBehavior.cpp | 5 ----- .../Source/GameLogic/Object/Body/ActiveBody.cpp | 5 ----- .../ConvertToHijackedVehicleCrateCollide.cpp | 5 ----- .../Object/Collide/CrateCollide/CrateCollide.cpp | 5 ----- .../CrateCollide/SabotageCommandCenterCrateCollide.cpp | 5 ----- .../Collide/CrateCollide/SabotageFakeBuilding.cpp | 5 ----- .../SabotageInternetCenterCrateCollide.cpp | 5 ----- .../SabotageMilitaryFactoryCrateCollide.cpp | 5 ----- .../CrateCollide/SabotagePowerPlantCrateCollide.cpp | 5 ----- .../CrateCollide/SabotageSuperweaponCrateCollide.cpp | 5 ----- .../CrateCollide/SabotageSupplyCenterCrateCollide.cpp | 5 ----- .../SabotageSupplyDropzoneCrateCollide.cpp | 5 ----- .../Source/GameLogic/Object/Collide/SquishCollide.cpp | 5 ----- .../GameLogic/Object/Contain/GarrisonContain.cpp | 4 ---- .../Source/GameLogic/Object/Contain/HelixContain.cpp | 5 ----- .../GameLogic/Object/Contain/InternetHackContain.cpp | 5 ----- .../Source/GameLogic/Object/Contain/OpenContain.cpp | 5 ----- .../GameLogic/Object/Contain/OverlordContain.cpp | 5 ----- .../GameLogic/Object/Contain/ParachuteContain.cpp | 5 ----- .../GameLogic/Object/Contain/RiderChangeContain.cpp | 5 ----- .../GameLogic/Object/Contain/TransportContain.cpp | 5 ----- .../Source/GameLogic/Object/Contain/TunnelContain.cpp | 5 ----- .../Source/GameLogic/Object/Create/PreorderCreate.cpp | 5 ----- .../Source/GameLogic/Object/Die/CreateObjectDie.cpp | 5 ----- .../Source/GameLogic/Object/Die/DestroyDie.cpp | 5 ----- .../Source/GameLogic/Object/Die/DieModule.cpp | 5 ----- .../GameLogic/Object/Die/RebuildHoleExposeDie.cpp | 5 ----- .../Source/GameLogic/Object/ExperienceTracker.cpp | 5 ----- .../Source/GameLogic/Object/FiringTracker.cpp | 5 ----- .../GameLogic/Object/Helper/ObjectDefectionHelper.cpp | 5 ----- .../Source/GameLogic/Object/Helper/ObjectHelper.cpp | 5 ----- .../GameEngine/Source/GameLogic/Object/Locomotor.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/Object/Object.cpp | 5 ----- .../Source/GameLogic/Object/ObjectCreationList.cpp | 5 ----- .../Source/GameLogic/Object/PartitionManager.cpp | 5 ----- .../GameLogic/Object/SpecialPower/FireWeaponPower.cpp | 5 ----- .../GameLogic/Object/SpecialPower/OCLSpecialPower.cpp | 5 ----- .../GameLogic/Object/SpecialPower/SpecialAbility.cpp | 5 ----- .../Object/SpecialPower/SpecialPowerModule.cpp | 5 ----- .../Source/GameLogic/Object/Update/AIUpdate.cpp | 5 ----- .../Update/AIUpdate/AssaultTransportAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/ChinookAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/DeployStyleAIUpdate.cpp | 5 ----- .../GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/HackInternetAIUpdate.cpp | 5 ----- .../GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/MissileAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/TransportAIUpdate.cpp | 5 ----- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 5 ----- .../Object/Update/AssistedTargetingUpdate.cpp | 5 ----- .../GameLogic/Object/Update/BattlePlanUpdate.cpp | 5 ----- .../GameLogic/Object/Update/CleanupHazardUpdate.cpp | 5 ----- .../Object/Update/CommandButtonHuntUpdate.cpp | 5 ----- .../Update/DockUpdate/SupplyCenterDockUpdate.cpp | 5 ----- .../Update/DockUpdate/SupplyWarehouseDockUpdate.cpp | 5 ----- .../Object/Update/DynamicShroudClearingRangeUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/EMPUpdate.cpp | 5 ----- .../Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp | 5 ----- .../GameLogic/Object/Update/FireWeaponUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/FloatUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/HeightDieUpdate.cpp | 5 ----- .../Object/Update/HelicopterSlowDeathUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/HordeUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/LaserUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/LifetimeUpdate.cpp | 5 ----- .../Object/Update/MissileLauncherBuildingUpdate.cpp | 5 ----- .../GameLogic/Object/Update/MobMemberSlavedUpdate.cpp | 5 ----- .../Object/Update/ParticleUplinkCannonUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/PhysicsUpdate.cpp | 5 ----- .../GameLogic/Object/Update/PowerPlantUpdate.cpp | 5 ----- .../SupplyCenterProductionExitUpdate.cpp | 5 ----- .../GameLogic/Object/Update/ProductionUpdate.cpp | 5 ----- .../GameLogic/Object/Update/ProjectileStreamUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/SlavedUpdate.cpp | 5 ----- .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 5 ----- .../Object/Update/SpecialPowerUpdateModule.cpp | 5 ----- .../Object/Update/SpectreGunshipDeploymentUpdate.cpp | 5 ----- .../GameLogic/Object/Update/SpectreGunshipUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/SpyVisionUpdate.cpp | 5 ----- .../GameLogic/Object/Update/StealthDetectorUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/StealthUpdate.cpp | 5 ----- .../GameLogic/Object/Update/StructureToppleUpdate.cpp | 5 ----- .../GameLogic/Object/Update/TensileFormationUpdate.cpp | 5 ----- .../Source/GameLogic/Object/Update/UpdateModule.cpp | 5 ----- .../GameLogic/Object/Upgrade/GrantScienceUpgrade.cpp | 5 ----- .../Source/GameLogic/Object/Upgrade/UpgradeModule.cpp | 5 ----- .../Code/GameEngine/Source/GameLogic/Object/Weapon.cpp | 5 ----- .../GameEngine/Source/GameLogic/Object/WeaponSet.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/ScriptActions.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/ScriptConditions.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 5 ----- .../Source/GameLogic/ScriptEngine/Scripts.cpp | 5 ----- .../GameLogic/ScriptEngine/VictoryConditions.cpp | 5 ----- .../GameEngine/Source/GameLogic/System/GameLogic.cpp | 5 ----- .../Source/GameLogic/System/GameLogicDispatch.cpp | 5 ----- .../GameEngine/Source/GameLogic/System/RankInfo.cpp | 5 ----- .../Source/GameNetwork/ConnectionManager.cpp | 5 ----- .../Source/GameNetwork/DisconnectManager.cpp | 5 ----- .../GameEngine/Source/GameNetwork/FirewallHelper.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/GUIUtil.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/GameInfo.cpp | 5 ----- .../GameEngine/Source/GameNetwork/GameSpy/Chat.cpp | 5 ----- .../GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp | 5 ----- .../Source/GameNetwork/GameSpy/LadderDefs.cpp | 5 ----- .../Source/GameNetwork/GameSpy/LobbyUtils.cpp | 5 ----- .../Source/GameNetwork/GameSpy/MainMenuUtils.cpp | 5 ----- .../GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp | 5 ----- .../Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp | 5 ----- .../Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp | 5 ----- .../Source/GameNetwork/GameSpy/Thread/PeerThread.cpp | 10 ---------- .../GameSpy/Thread/PersistentStorageThread.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/LANAPI.cpp | 5 ----- .../GameEngine/Source/GameNetwork/LANAPICallbacks.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/NetPacket.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/Network.cpp | 5 ----- .../Code/GameEngine/Source/GameNetwork/Transport.cpp | 5 ----- .../Source/GameNetwork/WOLBrowser/WebBrowser.cpp | 5 ----- GeneralsMD/Code/GameEngine/Source/GameNetwork/udp.cpp | 5 ----- .../Source/MilesAudioDevice/MilesAudioManager.cpp | 4 ---- .../Source/W3DDevice/Common/System/W3DRadar.cpp | 5 ----- .../Source/W3DDevice/GameClient/BaseHeightMap.cpp | 5 ----- .../Drawable/Draw/W3DDependencyModelDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DLaserDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DModelDraw.cpp | 5 ----- .../Drawable/Draw/W3DOverlordAircraftDraw.cpp | 5 ----- .../W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp | 5 ----- .../W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp | 5 ----- .../W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DTracerDraw.cpp | 5 ----- .../W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp | 5 ----- .../GameClient/Drawable/Draw/W3DTruckDraw.cpp | 5 ----- .../Source/W3DDevice/GameClient/FlatHeightMap.cpp | 5 ----- .../GameClient/GUI/GUICallbacks/W3DControlBar.cpp | 5 ----- .../GameClient/GUI/Gadget/W3DHorizontalSlider.cpp | 5 ----- .../W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp | 5 ----- .../W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp | 5 ----- .../W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp | 5 ----- .../Source/W3DDevice/GameClient/HeightMap.cpp | 5 ----- .../W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp | 5 ----- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DAssetManager.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DDisplay.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DDisplayString.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DInGameUI.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DMouse.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DParticleSys.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DPropBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DRoadBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DScene.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DShaderManager.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DShroud.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DSmudge.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DSnow.cpp | 5 ----- .../W3DDevice/GameClient/W3DTerrainBackground.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DTerrainTracks.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DTreeBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3DView.cpp | 5 ----- .../Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp | 5 ----- .../Source/W3DDevice/GameClient/Water/W3DWater.cpp | 5 ----- .../Source/W3DDevice/GameClient/WorldHeightMap.cpp | 5 ----- .../Source/W3DDevice/GameLogic/W3DGhostObject.cpp | 5 ----- .../Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp | 5 ----- .../Source/Win32Device/Common/Win32BIGFileSystem.cpp | 5 ----- .../Source/Win32Device/Common/Win32OSDisplay.cpp | 4 ---- .../Source/Win32Device/GameClient/Win32Mouse.cpp | 5 ----- .../Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp | 5 ----- GeneralsMD/Code/Main/WinMain.cpp | 5 ----- GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/EditCondition.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/EditParameter.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/ScriptDialog.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/ScriptProperties.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/WorldBuilder.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp | 5 ----- .../Code/Tools/WorldBuilder/src/mapobjectprops.cpp | 5 ----- GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp | 5 ----- GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp | 5 ----- 622 files changed, 3117 deletions(-) diff --git a/Core/GameEngine/Source/Common/System/Xfer.cpp b/Core/GameEngine/Source/Common/System/Xfer.cpp index b66d57195a..bd01b38f2d 100644 --- a/Core/GameEngine/Source/Common/System/Xfer.cpp +++ b/Core/GameEngine/Source/Common/System/Xfer.cpp @@ -36,11 +36,6 @@ #include "Common/Xfer.h" #include "Common/BitFlagsIO.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Core/Libraries/Source/Compression/CompressionManager.cpp b/Core/Libraries/Source/Compression/CompressionManager.cpp index a4e7325832..f752360ccd 100644 --- a/Core/Libraries/Source/Compression/CompressionManager.cpp +++ b/Core/Libraries/Source/Compression/CompressionManager.cpp @@ -32,11 +32,6 @@ #include "EAC/huffcodex.h" #include "EAC/refcodex.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif // TheSuperHackers @todo Recover debug logging in this file? #define DEBUG_LOG(x) {} diff --git a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp index b79db73c46..6ef197afc3 100644 --- a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp +++ b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp @@ -26,11 +26,6 @@ #include "NoxCompress.h" #include "CompLibHeader/lzhl.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define BLOCKSIZE 500000 #define NoxRead fread diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp index 97b6ac508a..4e6ae7ced8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp @@ -41,11 +41,6 @@ #include "wwmemlog.h" #include "dx8wrapper.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif //////////////////////////////////////////////////////////////////////////////////// // Local constants diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp index 0c9b8faad0..defeb101f7 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp @@ -93,11 +93,6 @@ #include "intersec.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // Definitions of static members: const float RenderObjClass::AT_MIN_LOD = FLT_MAX; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp index d0058decdc..9235b87729 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp @@ -60,11 +60,6 @@ #define SEGLINE_CHUNK_SIZE (128) #endif -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define MAX_SEGLINE_POINT_BUFFER_SIZE (1 + SEGLINE_CHUNK_SIZE) // This macro depends on the assumption that each line segment is two polys. diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp index 6ae932191d..8402ab28e5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp @@ -35,11 +35,6 @@ #include "RANDOM.H" #include "v3_rnd.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -// #pragma optimize("", off) -// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /* We have chunking logic which handles N segments at a time. To simplify the subdivision logic, ** we will ensure that N is a power of two and that N >= 2^MAX_STREAK_SUBDIV_LEVELS, so that the diff --git a/Core/Tools/MapCacheBuilder/Source/WinMain.cpp b/Core/Tools/MapCacheBuilder/Source/WinMain.cpp index 3abf1f9e8a..fd29d7d49d 100644 --- a/Core/Tools/MapCacheBuilder/Source/WinMain.cpp +++ b/Core/Tools/MapCacheBuilder/Source/WinMain.cpp @@ -110,11 +110,6 @@ // PRIVATE TYPES ////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index 05dd189442..638f48b762 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -35,11 +35,6 @@ #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/AIUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp b/Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp index a5f5f9b6ab..c80bbe5830 100644 --- a/Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp +++ b/Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp @@ -57,10 +57,6 @@ #include "GameClient/Drawable.h" // For getPosition #include "GameClient/GameClient.h" // For getDrawableByID -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- AudioEventRTS::AudioEventRTS() diff --git a/Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp b/Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp index f9a7f32d15..2224249a62 100644 --- a/Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -71,10 +71,6 @@ #include "WWMath/matrix3d.h" /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static const char* TheSpeakerTypes[] = { diff --git a/Generals/Code/GameEngine/Source/Common/Audio/GameMusic.cpp b/Generals/Code/GameEngine/Source/Common/Audio/GameMusic.cpp index d9adae2520..b7dce07e7a 100644 --- a/Generals/Code/GameEngine/Source/Common/Audio/GameMusic.cpp +++ b/Generals/Code/GameEngine/Source/Common/Audio/GameMusic.cpp @@ -52,10 +52,6 @@ #include "Common/GameAudio.h" #include "Common/INI.h" -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/Generals/Code/GameEngine/Source/Common/Audio/GameSounds.cpp b/Generals/Code/GameEngine/Source/Common/Audio/GameSounds.cpp index 6a0f0b93f5..c224f33b48 100644 --- a/Generals/Code/GameEngine/Source/Common/Audio/GameSounds.cpp +++ b/Generals/Code/GameEngine/Source/Common/Audio/GameSounds.cpp @@ -56,10 +56,6 @@ #include "GameLogic/PartitionManager.h" /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- SoundManager::SoundManager() diff --git a/Generals/Code/GameEngine/Source/Common/CRCDebug.cpp b/Generals/Code/GameEngine/Source/Common/CRCDebug.cpp index e6f8981f57..dbaae90a1a 100644 --- a/Generals/Code/GameEngine/Source/Common/CRCDebug.cpp +++ b/Generals/Code/GameEngine/Source/Common/CRCDebug.cpp @@ -33,11 +33,6 @@ #include "GameNetwork/IPEnumeration.h" #include -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef DEBUG_CRC diff --git a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp index ec75d89b2f..7ec41a0090 100644 --- a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp @@ -37,11 +37,6 @@ #include "GameNetwork/NetworkDefs.h" #include "trim.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp index f522ba5083..0e4745c652 100644 --- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp @@ -110,11 +110,6 @@ #include "Common/version.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/Common/GameLOD.cpp b/Generals/Code/GameEngine/Source/Common/GameLOD.cpp index 0a6568d9f4..607f1e854f 100644 --- a/Generals/Code/GameEngine/Source/Common/GameLOD.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameLOD.cpp @@ -41,11 +41,6 @@ #define DEFINE_PARTICLE_SYSTEM_NAMES #include "GameClient/ParticleSys.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define PROFILE_ERROR_LIMIT 0.94f //fraction of profiled result needed to get a match. Allows some room for error/fluctuation. diff --git a/Generals/Code/GameEngine/Source/Common/INI/INI.cpp b/Generals/Code/GameEngine/Source/Common/INI/INI.cpp index 5fa23ac345..5246be9c31 100644 --- a/Generals/Code/GameEngine/Source/Common/INI/INI.cpp +++ b/Generals/Code/GameEngine/Source/Common/INI/INI.cpp @@ -59,11 +59,6 @@ #include "GameLogic/ObjectCreationList.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp index abc56997d5..6c15219d71 100644 --- a/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp +++ b/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp @@ -38,11 +38,6 @@ #include "Common/WellKnownKeys.h" #include "Common/QuotedPrintable.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif class MapMetaDataReader { diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp index 324913d218..4080c5c4d9 100644 --- a/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp +++ b/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp @@ -34,11 +34,6 @@ #include "Common/Registry.h" #include "GameNetwork/WOLBrowser/WebBrowser.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index 24a1ccda09..6ee1ad6464 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -42,11 +42,6 @@ CommandList *TheCommandList = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp index 91e9fb8774..711e596260 100644 --- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -36,11 +36,6 @@ #include "GameClient/GraphDraw.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp index 7eb26c8cb8..49ddc3358f 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp @@ -64,11 +64,6 @@ #include "GameLogic/ExperienceTracker.h"//LORENZEN -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBAL ///////////////////////////////////////////////////////////////////////////////////////// ActionManager *TheActionManager = NULL; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp index 711568b020..49df05a3fe 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp @@ -51,11 +51,6 @@ #include "Common/Xfer.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- Energy::Energy() diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 57d54c5b2f..0bc6767495 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -99,11 +99,6 @@ #include "GameLogic/VictoryConditions.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //Grey for neutral. #define NEUTRAL_PLAYER_COLOR 0xffffffff diff --git a/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp b/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp index 5337de071a..bddfa1e0ec 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp @@ -60,11 +60,6 @@ #include "GameLogic/SidesList.h" #include "GameNetwork/NetworkDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- /*extern*/ PlayerList *ThePlayerList = NULL; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp b/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp index 3c542e9d1c..cbb7bc6730 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp @@ -53,11 +53,6 @@ #include "Common/Science.h" #include "GameClient/Image.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index ce38ddcaa5..ec1f25b377 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -52,11 +52,6 @@ #include "GameClient/Drawable.h" #include "GameClient/GameText.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- ProductionPrerequisite::ProductionPrerequisite() diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp index 930740923a..494f8fc801 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp @@ -35,11 +35,6 @@ ScienceStore* TheScienceStore = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- void ScienceStore::init() diff --git a/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp b/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp index 6fbd809109..faf1d6d111 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp @@ -37,11 +37,6 @@ #include "GameLogic/Object.h" #include "Common/BitFlagsIO.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBAL ///////////////////////////////////////////////////////////////////////////////////////// SpecialPowerStore *TheSpecialPowerStore = NULL; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp index 7eeaca9519..ee0c316bb0 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -51,11 +51,6 @@ #include "GameLogic/ScriptActions.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif ///@todo - do delayed script evaluations for team scripts. jba. diff --git a/Generals/Code/GameEngine/Source/Common/RandomValue.cpp b/Generals/Code/GameEngine/Source/Common/RandomValue.cpp index 8b2f5dafcc..137f820552 100644 --- a/Generals/Code/GameEngine/Source/Common/RandomValue.cpp +++ b/Generals/Code/GameEngine/Source/Common/RandomValue.cpp @@ -37,11 +37,6 @@ //#define DETERMINISTIC // to allow repetition for debugging -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #undef DEBUG_RANDOM_CLIENT #undef DEBUG_RANDOM_LOGIC diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp index a1fa13adab..3ecf2981a5 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -46,11 +46,6 @@ #include "Common/CRCDebug.h" #include "Common/version.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif Int REPLAY_CRC_INTERVAL = 100; diff --git a/Generals/Code/GameEngine/Source/Common/StateMachine.cpp b/Generals/Code/GameEngine/Source/Common/StateMachine.cpp index 71f4fea7a0..576f0ae0ee 100644 --- a/Generals/Code/GameEngine/Source/Common/StateMachine.cpp +++ b/Generals/Code/GameEngine/Source/Common/StateMachine.cpp @@ -39,12 +39,6 @@ #include "ref_ptr.h" -#ifdef RTS_INTERNAL -// for occasional debugging... - -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------ Performance Timers //#include "Common/PerfMetrics.h" diff --git a/Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp index 2b94283ef6..59ef351da7 100644 --- a/Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp @@ -51,11 +51,6 @@ #include "Common/AsciiString.h" #include "Common/PerfTimer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp index 9a700aacbc..77f8dcfb57 100644 --- a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp @@ -59,11 +59,6 @@ // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// BuildAssistant *TheBuildAssistant = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp index ff40ce6389..a6ddb22718 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp @@ -76,10 +76,6 @@ extern HWND ApplicationHWnd; extern const char *gAppPrefix; /// So WB can have a different log file name. -#ifdef RTS_INTERNAL -// this should ALWAYS be present -#pragma optimize("", off) -#endif // ---------------------------------------------------------------------------- // DEFINES diff --git a/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp b/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp index a2b90fb572..5ff3b22798 100644 --- a/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp @@ -64,11 +64,6 @@ DECLARE_PERF_TIMER(MemoryPoolDebugging) DECLARE_PERF_TIMER(MemoryPoolInitFilling) #endif -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ---------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp b/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp index 7e16c3b378..b7ee51728f 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp @@ -36,11 +36,6 @@ #include "Common/RandomValue.h" #include "Common/Xfer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/Common/System/LocalFile.cpp b/Generals/Code/GameEngine/Source/Common/System/LocalFile.cpp index 52d005be4e..74ae452183 100644 --- a/Generals/Code/GameEngine/Source/Common/System/LocalFile.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/LocalFile.cpp @@ -61,11 +61,6 @@ #include "Common/PerfTimer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/Generals/Code/GameEngine/Source/Common/System/MemoryInit.cpp b/Generals/Code/GameEngine/Source/Common/System/MemoryInit.cpp index 206f4496e2..bd72801b11 100644 --- a/Generals/Code/GameEngine/Source/Common/System/MemoryInit.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/MemoryInit.cpp @@ -49,11 +49,6 @@ #include "Lib/BaseType.h" #include "Common/GameMemory.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms) diff --git a/Generals/Code/GameEngine/Source/Common/System/Radar.cpp b/Generals/Code/GameEngine/Source/Common/System/Radar.cpp index e1943b53d4..52d040cc63 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Radar.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Radar.cpp @@ -53,11 +53,6 @@ #include "GameLogic/Module/ContainModule.h" #include "GameLogic/Module/StealthUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBALS //////////////////////////////////////////////////////////////////////////////////////// Radar *TheRadar = NULL; ///< the radar global singleton diff --git a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp index cb85e81dbc..8ca2f3c210 100644 --- a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp @@ -59,11 +59,6 @@ #include "GameLogic/SidesList.h" #include "GameLogic/TerrainLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// GameState *TheGameState = NULL; diff --git a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp index 2ca950c46c..6eae82655b 100644 --- a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp @@ -43,11 +43,6 @@ // GLOBALS //////////////////////////////////////////////////////////////////////////////////////// GameStateMap *TheGameStateMap = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // METHODS //////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp b/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp index 93b247f846..80a79a24fb 100644 --- a/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp @@ -29,11 +29,6 @@ #include "Common/SubsystemInterface.h" #include "Common/Xfer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef DUMP_PERF_STATS #include "GameLogic/GameLogic.h" diff --git a/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp index 77f70711f4..04afddd18a 100644 --- a/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp @@ -46,11 +46,6 @@ #include "Common/CriticalSection.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ----------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/Common/System/registry.cpp b/Generals/Code/GameEngine/Source/Common/System/registry.cpp index c475d9ddfa..06672735de 100644 --- a/Generals/Code/GameEngine/Source/Common/System/registry.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/registry.cpp @@ -30,11 +30,6 @@ #include "Common/Registry.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif Bool getStringFromRegistry(HKEY root, AsciiString path, AsciiString key, AsciiString& val) { diff --git a/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp b/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp index 362a43657c..0e4a71a404 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp @@ -47,11 +47,6 @@ #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/UpgradeModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp index 5402d019f6..4c266598c4 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp @@ -259,11 +259,6 @@ ModuleFactory *TheModuleFactory = NULL; ///< the module factory singleton // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp b/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp index 2ea011e384..72e6208e76 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp @@ -46,11 +46,6 @@ #include "Lib/trig.h" #include "GameLogic/TerrainLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //============================================================================= /** Constructor */ diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp index e95b59b285..dcea6c05e4 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp @@ -48,11 +48,6 @@ #include "GameClient/Drawable.h" #include "Common/INI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -///#pragma optimize("", off) -///#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif enum { TEMPLATE_HASH_SIZE = 12288 }; diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp index cedcb61716..14f186d8c5 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp @@ -70,11 +70,6 @@ #include "GameLogic/Powers.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp b/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp index a8efb383cd..5c1580eec8 100644 --- a/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp +++ b/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp @@ -50,11 +50,6 @@ #include "GameClient/MapUtil.h" #include "GameNetwork/GameSpy/PeerDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/Color.cpp b/Generals/Code/GameEngine/Source/GameClient/Color.cpp index 36943ff01e..9a22f53681 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Color.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Color.cpp @@ -79,11 +79,6 @@ /** Get the RGB color comonents of a color */ //============================================================================= -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //Put on ice until later M Lorenzen diff --git a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp index c64ba754e8..8e04ed6775 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp @@ -56,11 +56,6 @@ #include "GameClient/Display.h" #include "GameClient/GameText.h" #include "GameClient/GlobalLanguage.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp index 58cf782784..25de80331d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -76,11 +76,6 @@ #include "GameClient/Shadow.h" #include "GameClient/GameText.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define VERY_TRANSPARENT_HEATVISION (0.001f) #define HEATVISION_FADE_SCALAR (0.8f) diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp index b0ad847dc0..2196c0fcbe 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp @@ -43,11 +43,6 @@ #include "GameLogic/ScriptEngine.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/Eva.cpp b/Generals/Code/GameEngine/Source/GameClient/Eva.cpp index a678955750..4f6a7c9e0b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Eva.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Eva.cpp @@ -31,11 +31,6 @@ #include "Common/PlayerList.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- const char *TheEvaMessageNames[] = diff --git a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp index 1f442c8ade..a57ac72b2b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp @@ -54,11 +54,6 @@ // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif FXListStore *TheFXListStore = NULL; ///< the FXList store definition diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 93cb360092..f75a2c1bf9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -82,11 +82,6 @@ #include "GameNetwork/GameInfo.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC ///////////////////////////////////////////////////////////////////////////////////////// ControlBar *TheControlBar = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp index 824aaed5e8..5300623c60 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp @@ -59,11 +59,6 @@ #include "GameClient/GameWindowManager.h" #include "GameClient/GadgetPushButton.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static GameWindow *commandWindows[ MAX_COMMANDS_PER_SET ]; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp index 1fe9f006f0..07549bcaf7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp @@ -56,11 +56,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Module/ProductionUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- /** Process a button transition message from the window system that should be for one of diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp index 85eb3c63f3..5c09932d42 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp @@ -40,11 +40,6 @@ #include "GameClient/InGameUI.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 0ddac64527..44d64cb98c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -62,11 +62,6 @@ #include "GameClient/Image.h" #include "GameClient/GameWindowManager.h" #include "GameClient/GadgetPushButton.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp index 35ecaadc07..9fb3ddb383 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp @@ -44,11 +44,6 @@ #include "GameClient/GadgetPushButton.h" #include "GameClient/HotKey.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define STOP_ID 10 #define EVACUATE_ID 11 diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp index 9e9fa0499a..97bc80090a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp @@ -93,11 +93,6 @@ #include "GameLogic/ScriptEngine.h" #include "GameNetwork/NetworkInterface.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static WindowLayout *theLayout = NULL; static GameWindow *theWindow = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp index b5c9fdeb12..549c060c80 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp @@ -57,11 +57,6 @@ #include "GameNetwork/GameSpy/BuddyDefs.h" #include "GameNetwork/GameSpy/PeerDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp index ba0595257f..708e536960 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp @@ -47,11 +47,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp index 2a1617cc8e..8136245b79 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp @@ -44,11 +44,6 @@ #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANAPI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static GameWindow *parent = NULL; static GameWindow *staticTextGameName = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index 117454fd75..18230d6110 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -57,11 +57,6 @@ #include "GameClient/GameText.h" #include "GameNetwork/GUIUtil.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif extern char *LANnextScreen; extern Bool LANisShuttingDown; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp index 326cc05af0..4117834a03 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp @@ -44,11 +44,6 @@ #include "GameClient/MapUtil.h" #include "GameNetwork/GUIUtil.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static NameKeyType buttonBack = NAMEKEY_INVALID; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index 11d034110e..6aa50ed99e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -75,11 +75,6 @@ //for accessing the InGameUI #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp index f4de519ce0..899eb8c0bb 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp @@ -50,11 +50,6 @@ #include "GameNetwork/LANAPI.h" #include "GameNetwork/LANAPICallbacks.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // window ids ------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index ec490c273f..1273b71e5e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -76,11 +76,6 @@ // This is for non-RC builds only!!! #define VERBOSE_VERSION L"Release" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static NameKeyType comboBoxOnlineIPID = NAMEKEY_INVALID; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp index dbfbf1e43d..182e847089 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp @@ -96,11 +96,6 @@ static GameWindow *comboBoxLadderName = NULL; static GameWindow *textEntryLadderPassword = NULL; static GameWindow *textEntryGamePassword = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif void createGame( void ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp index d0d5727d3a..e5a55a2964 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp @@ -68,11 +68,6 @@ //#include "GameNetwork/GameSpy/PeerThread.h" #include "GameNetwork/GameSpyOverlay.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp index 6465db36a8..0d5aa9bcca 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp @@ -60,11 +60,6 @@ #include "WWDownload/Registry.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// // window ids ------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp index 9ac79b1e6a..8b9c2c8224 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp @@ -59,11 +59,6 @@ #include "GameClient/Shell.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static NameKeyType buttonBackKey = NAMEKEY_INVALID; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 622073e176..e31b1e286d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -53,11 +53,6 @@ #include "GameClient/DisconnectMenu.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp index 45929868c1..77fe4a1ff5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp @@ -48,11 +48,6 @@ #include "GameClient/GameText.h" #include "GameClient/GameWindowTransitions.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // window ids ------------------------------------------------------------------------------------- static NameKeyType parentReplayMenuID = NAMEKEY_INVALID; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index ad5f67aa93..c30d24da25 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -99,11 +99,6 @@ //Added By Saad #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index ff0ae64334..2a5313e3ef 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -68,11 +68,6 @@ #include "GameNetwork/IPEnumeration.h" #include "WWDownload/Registry.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif SkirmishGameInfo *TheSkirmishGameInfo = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp index c394bff6cb..33cfafb8e8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp @@ -57,11 +57,6 @@ // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // window ids ------------------------------------------------------------------------------ static NameKeyType parentID = NAMEKEY_INVALID; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index 7c0b05c1f5..e71dcb1db5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -65,11 +65,6 @@ void WOLDisplaySlotList( void ); -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif extern std::list TheLobbyQueuedUTMs; extern void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp index e0680cd2b1..e7ef96d9e7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp @@ -70,11 +70,6 @@ #include "GameNetwork/GameSpy/LobbyUtils.h" #include "GameNetwork/RankPointValue.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif void refreshGameList( Bool forceRefresh = FALSE ); void refreshPlayerList( Bool forceRefresh = FALSE ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp index 20f24e1f5d..4a351102fb 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp @@ -48,11 +48,6 @@ #include "GameNetwork/GameSpy/PersistentStorageDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// // window ids ------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp index e01a232ffc..d7475ae1c9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp @@ -69,11 +69,6 @@ #include "GameNetwork/WOLBrowser/WebBrowser.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef ALLOW_NON_PROFILED_LOGIN Bool GameSpyUseProfiles = false; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp index 205fb037b5..b5538a5740 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp @@ -44,11 +44,6 @@ #include "GameClient/MapUtil.h" #include "GameNetwork/GUIUtil.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static NameKeyType buttonBack = NAMEKEY_INVALID; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp index b90c6cec80..b5bafa1e1e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp @@ -65,11 +65,6 @@ #include "GameNetwork/GameSpy/PersistentStorageThread.h" #include "GameNetwork/RankPointValue.h" #include "GameNetwork/GameSpy/LadderDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef DEBUG_LOGGING #include "Common/MiniLog.h" diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp index 309ea2c626..b9a8e18c75 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp @@ -67,11 +67,6 @@ #include "GameNetwork/GameSpy/MainMenuUtils.h" #include "GameNetwork/WOLBrowser/WebBrowser.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static Bool isShuttingDown = FALSE; static Bool buttonPushed = FALSE; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp index 218cee89bb..5bcecf2935 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp @@ -67,11 +67,6 @@ /////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GadgetHorizontalSliderInput ================================================ /** Handle input for horizontal slider */ diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp index 2faec91032..3fb2f24bfc 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp @@ -63,11 +63,6 @@ #include "GameClient/GameWindowGlobal.h" #include "GameClient/Keyboard.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// // Sets up the user's OS set doubleclick time so if they don't like it... they can diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp index 90f9785c08..bd9034f09b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp @@ -57,11 +57,6 @@ // DEFINES //////////////////////////////////////////////////////////////////// // PRIVATE TYPES ////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp index 6e3f6abef8..703e6c177d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp @@ -66,11 +66,6 @@ /////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GadgetVerticlaSliderInput ================================================== /** Handle input for vertical slider */ diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp index 1cffd09c68..4f9ce08ef0 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp @@ -62,11 +62,6 @@ #include "GameClient/Mouse.h" #include "GameClient/SelectionXlat.h" #include "GameClient/GameWindowTransitions.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index f3222a77a2..1edec48f25 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -61,11 +61,6 @@ UnsignedInt WindowLayoutCurrentVersion = 2; /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE FUNCTIONS ////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // // with this statis set to true, the window system will propogate mouse position diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp index 2bb9320edd..081e52176a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp @@ -72,11 +72,6 @@ #include "GameClient/GameText.h" #include "GameClient/HeaderTemplate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp index bf6cbbf42c..f582a403f8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp @@ -47,11 +47,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp index 8f8864bb4e..71e2ba2ad4 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp @@ -47,11 +47,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index 0416494124..484ac94d04 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -60,11 +60,6 @@ #include "GameClient/HeaderTemplate.h" #include "GameClient/GameFont.h" #include "GameClient/GlobalLanguage.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 721e68bd65..236df23fc2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -61,11 +61,6 @@ #include "GameClient/Color.h" #include "Common/NameKeyGenerator.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 149a8e37a0..4abe899b9f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -48,11 +48,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -94,11 +89,6 @@ // DEFINES //////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // PRIVATE TYPES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index 1a787dadf0..f3bc2b4af2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -45,11 +45,6 @@ // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// Shell *TheShell = NULL; ///< the shell singleton definition -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp index d1cec83234..9e2d4fb281 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp @@ -33,12 +33,6 @@ #include "GameClient/WindowLayout.h" #include "GameClient/Shell.h" #include "GameClient/GameWindowManager.h" -#ifdef RTS_INTERNAL - -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp index 07ac79f01f..1508354a89 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -81,11 +81,6 @@ #include "GameLogic/GhostObject.h" #include "GameLogic/Object.h" #include "GameLogic/ScriptEngine.h" // For TheScriptEngine - jkmcd -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define DRAWABLE_HASH_SIZE 8192 diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index f720c480dc..60c67155a9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -58,11 +58,6 @@ #include "Common/FileSystem.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index d2fb1bef95..a980032a9c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -86,11 +86,6 @@ #include "GameLogic/Module/SupplyWarehouseDockUpdate.h" #include "GameLogic/Module/MobMemberSlavedUpdate.h"//ML -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 4df5571b8e..02a8b7c1c2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -47,11 +47,6 @@ #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// Mouse *TheMouse = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp index d591f623ee..79f5769f7a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp @@ -29,11 +29,6 @@ #include "Common/FileSystem.h" #include "Common/file.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif LanguageFilter *TheLanguageFilter = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp index f64e8588fe..67d4714ff8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp @@ -61,11 +61,6 @@ #include "GameNetwork/GameInfo.h" #include "GameNetwork/NetworkDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------- // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 347deb6a22..1d2324140d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -86,11 +86,6 @@ #include "GameNetwork/GameSpyOverlay.h" #include "GameNetwork/GameSpy/BuddyThread.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp index 71cba2bd0a..8d6e90b667 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp @@ -47,11 +47,6 @@ #include "GameClient/GUICommandTranslator.h" #include "GameClient/CommandXlat.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE //////////////////////////////////////////////////////////////////////////////////////// enum CommandStatus diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp index 90f3f3bd68..d5dad6e4ad 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp @@ -54,11 +54,6 @@ MetaMap *TheMetaMap = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -///#pragma optimize("", off) -///#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index 32df3659e7..17e6f43923 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -56,11 +56,6 @@ #include "GameClient/SelectionXlat.h" #include "GameClient/TerrainVisual.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp index dfb78fa691..b09cadd95f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp @@ -55,11 +55,6 @@ #include "GameClient/Shell.h" #include "GameClient/Display.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp b/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp index d009983a60..9a21688350 100644 --- a/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp @@ -36,11 +36,6 @@ #include "GameClient/Shadow.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ RadiusDecalTemplate::RadiusDecalTemplate() : diff --git a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp index 4f873f7426..a905b8d634 100644 --- a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp @@ -37,11 +37,6 @@ #include "GameClient/GameClient.h" #include "GameClient/KeyDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- SelectionInfo::SelectionInfo() : diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index b261a8114f..114d7a5aa5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -38,11 +38,6 @@ #include "GameClient/Image.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBAL ///////////////////////////////////////////////////////////////////////////////////////// Anim2DCollection *TheAnim2DCollection = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp index b58d366683..6d2c963706 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp @@ -62,11 +62,6 @@ CampaignManager *TheCampaignManager = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif const FieldParse CampaignManager::m_campaignFieldParseTable[] = diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 7e02284547..9c80905936 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -49,11 +49,6 @@ #include "GameLogic/Object.h" #include "GameLogic/TerrainLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------ Performance Timers //#include "Common/PerfMetrics.h" diff --git a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp b/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp index f6bec5e353..abc6a1964d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp @@ -32,11 +32,6 @@ #include "GameClient/TerrainVisual.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp index 7587c407dd..c458e3e951 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -47,11 +47,6 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE CLASS /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp index 8e29f731a2..dd80bc79d9 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp @@ -56,11 +56,6 @@ #include "GameLogic/Module/SpecialPowerUpdateModule.h" #include "GameLogic/ObjectIter.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /** * NOTE: Only AI objects (ie: having an AIUpdate module) can be in diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp index 6dff1494ed..e4577ae26e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp @@ -54,11 +54,6 @@ const Real CLOSE_ENOUGH = (25.0f); -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/ ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index c0e9e56800..70dcb88ae0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -71,11 +71,6 @@ //------------------------------------------------------------------------------------------------- -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif struct TCheckMovementInfo { diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp index 66701ea6ed..8843df1099 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp @@ -61,11 +61,6 @@ #include "GameLogic/Module/SupplyWarehouseDockUpdate.h" #include "GameLogic/PartitionManager.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define SUPPLY_CENTER_CLOSE_DIST (20*PATHFIND_CELL_SIZE_F) diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp index 6861406488..209ad2c428 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp @@ -56,11 +56,6 @@ #include "GameLogic/Module/ProductionUpdate.h" #include "GameClient/TerrainVisual.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define USE_DOZER 1 diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp index d5e1fd3d04..dd606b0309 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -66,11 +66,6 @@ #include "GameLogic/Module/ContainModule.h" #include "GameLogic/Module/PhysicsUpdate.h" #include "GameLogic/Module/StealthUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static Bool cannotPossiblyAttackObject( State *thisState, void* userData ); diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp index 16446d486b..2f9add3ade 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp @@ -55,11 +55,6 @@ const Real CLOSE_ENOUGH = (25.0f); -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/ ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp index 8f529bdbe6..55f249939f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp @@ -48,11 +48,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // addObject ////////////////////////////////////////////////////////////////////////////////////// void Squad::addObject(Object *objectToAdd) diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index 4f07e88314..d4afcff4dc 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -47,11 +47,6 @@ const UnsignedInt WAIT_INDEFINITELY = 0xffffffff; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index 7a1951976f..925bd8832d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -59,11 +59,6 @@ #include "WWMath/plane.h" #include "WWMath/tri.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBALS //////////////////////////////////////////////////////////////////////////////////////// TerrainLogic *TheTerrainLogic = NULL; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp index 7e2ea1e227..de3d30e298 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp @@ -44,11 +44,6 @@ #include "GameLogic/Object.h" #include "GameLogic/PartitionManager.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp index c9c90e3513..8b548c9b75 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp @@ -45,11 +45,6 @@ #include "GameLogic/Module/PhysicsUpdate.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp index 7fde1f16f3..a2bc0c44c9 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp @@ -49,11 +49,6 @@ #include "GameLogic/Weapon.h" #include "GameClient/Drawable.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif const Int MAX_IDX = 32; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp index c2b8af0357..ca2e756c8b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp @@ -54,11 +54,6 @@ #include "GameLogic/Weapon.h" #include "GameClient/Drawable.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- GenerateMinefieldBehaviorModuleData::GenerateMinefieldBehaviorModuleData() diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp index 5cf8018b9c..eef5faf94f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp @@ -43,11 +43,6 @@ #include "GameLogic/Object.h" #include "GameLogic/ObjectCreationList.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp index 1083e304d4..bdd976155c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp @@ -45,11 +45,6 @@ #include "GameLogic/Module/AutoHealBehavior.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // detonation never puts our health below this, since we probably auto-regen const Real MIN_HEALTH = 0.1f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp index 83ea354a02..a841d4bae6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp @@ -43,11 +43,6 @@ #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index 2548dbb573..4668cb2f2b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -44,11 +44,6 @@ #include "GameLogic/TerrainLogic.h" #include "Common/Team.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp index a0d37ad48b..d13b4b7909 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp @@ -37,11 +37,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // tinting is all handled in drawable, now, Graham look near the bottom of Drawable::UpdateDrawable() //static const RGBColor poisonedTint = {0.0f, 1.0f, 0.0f}; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp index 303c752bd5..741ae02317 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp @@ -44,11 +44,6 @@ #include "GameLogic/Module/BodyModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp index 14aed92100..20d6b0fd8a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp @@ -42,11 +42,6 @@ #include "GameLogic/Module/RebuildHoleBehavior.h" #include "GameLogic/Module/StickyBombUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp index 3eb9059ccc..120c513bae 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp @@ -51,11 +51,6 @@ #include "GameLogic/Weapon.h" #include "GameClient/Drawable.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif const Real BEGIN_MIDPOINT_RATIO = 0.35f; const Real END_MIDPOINT_RATIO = 0.65f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp index 72a1eddabf..f0e238f4b3 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp @@ -48,11 +48,6 @@ #define NONE_SPAWNED_YET (0xffffffff) -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp index 3893614c11..7b2509eb73 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp @@ -57,11 +57,6 @@ #include "GameLogic/Module/DieModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define YELLOW_DAMAGE_PERCENT (0.25f) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp index 2bcccf16d4..c32573067c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp @@ -56,11 +56,6 @@ #include "GameLogic/ScriptEngine.h" #include "GameLogic/Module/DozerAIUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp index f9da65a67d..8ede4089e8 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -39,11 +39,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Module/CrateCollide.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp index ae7c08f504..bcae760a48 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp @@ -41,11 +41,6 @@ #include "GameLogic/Module/AIUpdate.h" #include "GameLogic/PartitionManager.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp index 1f0a7bebb3..45a9ff0409 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp @@ -54,10 +54,6 @@ #include "GameClient/InGameUI.h" #include "GameClient/View.h" -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// enum { MUZZLE_FLASH_LIFETIME = LOGICFRAMES_PER_SECOND / 7 }; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 9e9e446661..1dde1bf222 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -57,11 +57,6 @@ #include "GameLogic/PartitionManager.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp index e84213ce62..2e5c32065c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp @@ -44,11 +44,6 @@ #include "GameLogic/PartitionManager.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index 37d6878d98..341f2a8229 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -49,11 +49,6 @@ const Real NO_START_Z = 1e10; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE //////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp index cbf62d9d7f..bdef98df5e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp @@ -45,11 +45,6 @@ #include "GameLogic/Module/TransportContain.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp index a0deeb7d77..35c42f740f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp @@ -43,11 +43,6 @@ #include "GameLogic/Object.h" #include "GameLogic/PartitionManager.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp index c3c7e2ddb7..4d3139ad9a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp @@ -35,11 +35,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Module/PreorderCreate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp index 583b0dea93..b1e0d6ac32 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp @@ -37,11 +37,6 @@ #include "GameLogic/Object.h" #include "GameLogic/ObjectCreationList.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp index 9cd6452976..816ee45df5 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp @@ -35,11 +35,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/Module/DestroyDie.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp index f4af098b8d..3da89f724c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp @@ -38,11 +38,6 @@ #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp index 5bbd58f543..4e48f38920 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp @@ -45,11 +45,6 @@ #include "GameLogic/Object.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp index 8b8435a823..f6d517f816 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp @@ -36,11 +36,6 @@ #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- ExperienceTracker::ExperienceTracker(Object *parent) : diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp index 5810e9c2c2..63e7353df3 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp @@ -42,11 +42,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- FiringTracker::FiringTracker(Thing* thing, const ModuleData *modData) : UpdateModule( thing, modData ) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp index 32921202b3..1f4bb63b51 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp @@ -36,11 +36,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Module/ObjectDefectionHelper.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp index f50df5163b..4a86c7f674 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp @@ -34,11 +34,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Module/ObjectHelper.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index f465dcce7d..2882f3a61b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -46,11 +46,6 @@ #include "GameLogic/Module/BodyModule.h" #include "GameLogic/Module/AIUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static const Real DONUT_TIME_DELAY_SECONDS=2.5f; static const Real DONUT_DISTANCE=4.0*PATHFIND_CELL_SIZE_F; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp index 174c559630..ec326f9fb1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -101,11 +101,6 @@ #include "Common/CRCDebug.h" #include "Common/MiscAudio.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef DEBUG_OBJECT_ID_EXISTS ObjectID TheObjectIDToDebug = INVALID_ID; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 9614b61e31..9754e97612 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -70,11 +70,6 @@ #include "Common/CRCDebug.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 4f5c3d2e2f..ee8fb1636f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -92,11 +92,6 @@ UnsignedInt s_gcoPerfFrame = 0xffffffff; #endif -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp index ed5006c196..6e49440019 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp @@ -43,11 +43,6 @@ // MODULE DATA //////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif enum { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp index e985809aa6..d3345c0938 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp @@ -39,11 +39,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp index 6c6c8a3d6c..0c902f45bf 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp @@ -54,11 +54,6 @@ #include "GameClient/ControlBar.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp index b88ea92b9a..6d13862846 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp @@ -73,11 +73,6 @@ #define SLEEPY_AI -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- AIUpdateModuleData::AIUpdateModuleData() diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp index da0c9b3c2a..fc4901a394 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp @@ -43,11 +43,6 @@ #include "GameLogic/PartitionManager.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp index 48d4046ea1..2c3ac3e79c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp @@ -48,11 +48,6 @@ const Real BIGNUM = 99999.0f; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- enum ChinookAIStateType CPP_11(: Int) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index aa9a886b08..ce0f37b474 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -49,11 +49,6 @@ #include "GameLogic/Weapon.h" #include "GameLogic/WeaponSet.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- const FieldParse* DeliverPayloadData::getFieldParse() diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp index 48062d7aa4..c19e50f3f4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp @@ -46,11 +46,6 @@ #include "GameLogic/Module/DeployStyleAIUpdate.h" #include "GameLogic/Module/PhysicsUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp index 40745308ad..39f8134db6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -55,11 +55,6 @@ #include "GameLogic/Module/DozerAIUpdate.h" #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // FORWARD DECLARATIONS /////////////////////////////////////////////////////////////////////////// class DozerPrimaryStateMachine; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp index db4372c153..64f245abf0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp @@ -42,11 +42,6 @@ #include "GameLogic/Object.h" //#include "GameLogic/PartitionManager.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp index 9f1764699c..38977d58fd 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -48,11 +48,6 @@ const Real BIGNUM = 99999.0f; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- enum TaxiType CPP_11(: Int) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp index 774913b42b..b740995117 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp @@ -52,11 +52,6 @@ const Real BIGNUM = 99999.0f; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index 5d9e3f7fe0..a42ec56267 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -58,15 +58,6 @@ static const Int INVALID_PATH = -1; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -//#pragma message("NO COMMENTS, PLEASE ABOUT THIS PRAGMA BEING LEFT ON... IT IS FOR A SPECIAL TEST...") -//#pragma message("IF QA EVER REPRODUCES A DESYNC (BELIEVED FIXED) I'LL NEED TO DEBUG WHILE PLAYING AGAINST") -//#pragma message("THAT MACHINE WITHOUT QUITTING TO START A DEBUGGABLE VERSION...") -//#pragma message("THIS WILL BE CORRECTED IN GOOD TIME. JUST TRUST ME, -ML") -#endif #define FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH (2) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp index 004c0c0161..1bf1bcd8f6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp @@ -41,11 +41,6 @@ #include "GameClient/Drawable.h" #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define NO_DEBUG_SUPPLY_STATE diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp index 652a3f7ea2..01372a783c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp @@ -36,11 +36,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp index 28d68695fa..d185f83ac9 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -62,11 +62,6 @@ #include "GameLogic/Module/WorkerAIUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // FORWARD DECLARATIONS /////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp index 2526e17f4c..8a62af2084 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp @@ -42,11 +42,6 @@ #include "GameLogic/Module/LaserUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index 8c3eb42b98..4163d707bf 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -61,11 +61,6 @@ #include "GameLogic/Module/AIUpdate.h" #include "GameLogic/Module/StealthDetectorUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp index 80979372ab..5e0b018ca5 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp @@ -46,11 +46,6 @@ #include "GameLogic/WeaponSet.h" #include "GameLogic/Module/AIUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp index 6321cc43a4..f3f617a9ec 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp @@ -52,11 +52,6 @@ #include "GameLogic/Module/SpecialPowerModule.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp index 12b9b40e5c..f50cf213c0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp @@ -38,11 +38,6 @@ #include "GameLogic/PartitionManager.h" #include "GameLogic/AIPathfind.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ SupplyWarehouseDockUpdateModuleData::SupplyWarehouseDockUpdateModuleData( void ) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp index b24f982587..3692b8e239 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp @@ -37,11 +37,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- DynamicShroudClearingRangeUpdateModuleData::DynamicShroudClearingRangeUpdateModuleData() diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp index df2df552a7..b99a13fa02 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp @@ -48,11 +48,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp index df413ad986..e168d291a5 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp @@ -51,11 +51,6 @@ #include "GameLogic/Module/AIUpdate.h" #include "GameLogic/Module/BodyModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- FireOCLAfterWeaponCooldownUpdateModuleData::FireOCLAfterWeaponCooldownUpdateModuleData() diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp index 42c71e1c29..09b68c8f7a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp @@ -35,11 +35,6 @@ #include "GameLogic/Module/FireWeaponUpdate.h" #include "GameLogic/WeaponStatus.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- FireWeaponUpdateModuleData::FireWeaponUpdateModuleData() diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp index 670271cb3e..892da8febe 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp @@ -40,11 +40,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp index 5cbf6cc7e9..c92aeb1fe1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp @@ -42,11 +42,6 @@ #include "GameLogic/Module/HeightDieUpdate.h" #include "GameLogic/Module/PhysicsUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp index 98ecd1ce6d..129d1c434d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -55,11 +55,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 57b71869ba..9cafdfb74b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -47,11 +47,6 @@ //------------------------------------------------------------------------------------------------- -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static HordeUpdateInterface* getHUI(Object* obj) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp index 998e52fd81..db8bb5e63f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp @@ -36,11 +36,6 @@ #include "GameLogic/Module/LifetimeUpdate.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp index f19fe7ada9..123c3f3855 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp @@ -41,11 +41,6 @@ #include "GameClient/Drawable.h" #include "GameClient/FXList.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- MissileLauncherBuildingUpdate::MissileLauncherBuildingUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp index 48a3a4971f..694316dc44 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp @@ -55,11 +55,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define STRAY_MULTIPLIER 2.0f // Multiplier from stating diestance from tunnel, to max distance from diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp index c9a82a54cc..388593c334 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp @@ -58,11 +58,6 @@ #include "GameLogic/Module/PhysicsUpdate.h" #include "GameLogic/Module/ActiveBody.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp index 1205439434..22e6733de2 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp @@ -63,11 +63,6 @@ const Int MOTIVE_FRAMES = LOGICFRAMES_PER_SECOND / 3; #define SLEEPY_PHYSICS -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- static Real angleBetweenVectors(const Coord3D& inCurDir, const Coord3D& inGoalDir) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp index cdace6f8c7..d66a65a34a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp @@ -38,11 +38,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Module/PowerPlantUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index 48b1572969..e713c267ea 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -55,11 +55,6 @@ #include "GameLogic/Object.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp index 9f706cb5cf..d237fc774a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp @@ -36,11 +36,6 @@ #include "GameLogic/Module/ProjectileStreamUpdate.h" #include "WWMath/vector3.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp index d4b5ea35ce..ea1f50edff 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp @@ -50,11 +50,6 @@ #include "GameLogic/Module/SlavedUpdate.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define STRAY_MULTIPLIER 2.0f // Multiplier from stating diestance from tunnel, to max distance from const Real CLOSE_ENOUGH = 15; // Our moveTo commands and pathfinding can't handle people in the way, so quit trying to hump someone on your spot diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index 4a08bd399f..e920167a28 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -63,11 +63,6 @@ #include "GameLogic/Module/StealthUpdate.h" #include "GameLogic/Module/ContainModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp index 106fe566cc..542bc31fa8 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp @@ -50,11 +50,6 @@ #include "Common/PlayerList.h" #include "Common/Player.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- void StealthDetectorUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp index 74f7b3f460..de9dfb67e4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp @@ -58,11 +58,6 @@ #include "GameLogic/Module/ContainModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index 6439347f66..1a2e03c2a7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -48,11 +48,6 @@ #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif const Int MAX_IDX = 32; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp index 1075711f56..208b6feafd 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp @@ -47,11 +47,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define MAP_XY_FACTOR (10.0f) //How wide and tall each height map square is in world space. diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp index f4148d27f9..6f824db51e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp @@ -33,11 +33,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/Module/UpdateModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp index c059dde8a0..41f54f8bd3 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp @@ -32,11 +32,6 @@ #include "Common/Xfer.h" #include "GameLogic/Module/UpgradeModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ /** CRC */ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp index d1ed003577..c25d0a522f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp @@ -86,11 +86,6 @@ const DistanceCalculationType ATTACK_RANGE_CALC_TYPE = FROM_BOUNDINGSPHERE_3D; #endif -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // damage is ALWAYS 3d const DistanceCalculationType DAMAGE_RANGE_CALC_TYPE = FROM_BOUNDINGSPHERE_3D; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp index d4ab53b7b2..dceaa5ab05 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp @@ -53,11 +53,6 @@ #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp index e8fd96ba8d..a055d86181 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp @@ -81,11 +81,6 @@ #include "GameLogic/Weapon.h" #include "GameLogic/VictoryConditions.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // Kind of hacky, but we need to dance on the guts of the terrain. extern void oversizeTheTerrain(Int amount); diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp index 7fab353010..cd98bce9c4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp @@ -61,11 +61,6 @@ #include "GameLogic/Scripts.h" #include "GameLogic/VictoryConditions.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif class ObjectTypesTemp { diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index b56c8bfc9a..bf26a630e1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -56,11 +56,6 @@ #include "GameLogic/ScriptEngine.h" #include "GameLogic/SidesList.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // These are for debugger window static int st_LastCurrentFrame; diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index 7cd3ac2f75..adb932da12 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -66,11 +66,6 @@ #include "GameLogic/SidesList.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static Script *s_mtScript = NULL; diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp index c75633340b..eae151b0c7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp @@ -51,11 +51,6 @@ #include "GameNetwork/GameInfo.h" #include "GameNetwork/NetworkDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- #define ISSET(x) (m_victoryConditions & VICTORY_##x) diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index fa3614a91f..c96b234067 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -121,11 +121,6 @@ FILE *g_UT_commaLog=NULL; #endif -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // I'm making this larger now that we know how big our maps are going to be. enum { OBJ_HASH_SIZE = 8192 }; diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 3c0bb7ce24..6d4b8a5229 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -85,11 +85,6 @@ #include "GameNetwork/NetworkInterface.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define MAX_PATH_SUBJECTS 64 diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp index 425ef42476..6738a53421 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp @@ -35,11 +35,6 @@ RankInfoStore* TheRankInfoStore = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- RankInfo::~RankInfo() diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp index b2df6bad2a..db31ab380d 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp @@ -53,11 +53,6 @@ #include "GameClient/DisconnectMenu.h" #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /** * Le destructor. diff --git a/Generals/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp index 5f8bc10272..49913671ec 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp @@ -35,11 +35,6 @@ #include "GameNetwork/GameSpy/PingThread.h" #include "GameNetwork/GameSpy/GSConfig.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif DisconnectManager::DisconnectManager() { diff --git a/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp index f44b7b1455..179aca81d8 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp @@ -56,11 +56,6 @@ #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/GameSpy/GSConfig.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif FirewallHelperClass *TheFirewallHelper = NULL; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp index 29ba9158aa..707b567aa9 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp @@ -44,11 +44,6 @@ #include "Common/PlayerTemplate.h" #include "GameNetwork/LANAPICallbacks.h" // for acceptTrueColor, etc -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp index 903a295743..324fa10e78 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp @@ -45,11 +45,6 @@ #include "GameNetwork/LANAPICallbacks.h" // for testing packet size #include "strtok_r.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif GameInfo *TheGameInfo = NULL; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp index 2bd368d922..c913d05476 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp @@ -37,11 +37,6 @@ #include "GameNetwork/GameSpy/PeerDefsImplementation.h" #include "GameNetwork/GameSpy/PeerThread.h" #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define OFFSET(x) (sizeof(Int) * (x)) static const FieldParse GameSpyColorFieldParse[] = diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp index f8f6e98cbe..a08a48733d 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp @@ -36,11 +36,6 @@ #include "GameNetwork/GameSpy/GSConfig.h" #include "GameNetwork/RankPointValue.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp index cf8336b358..650f48b9bf 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp @@ -39,11 +39,6 @@ #include "GameClient/GameText.h" #include "GameClient/MapUtil.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif LadderList *TheLadderList = NULL; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp index 6ebf0b9f29..708f03cb47 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp @@ -62,11 +62,6 @@ #include "Common/STLTypedefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// enum { diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp index 0d8cb1a8ea..ad08e00df9 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp @@ -54,11 +54,6 @@ #include "WWDownload/Registry.h" #include "WWDownload/urlBuilder.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp index aebd617cc5..0ac952a5a1 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp @@ -46,11 +46,6 @@ #include "GameNetwork/RankPointValue.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif GameSpyInfoInterface *TheGameSpyInfo = NULL; GameSpyStagingRoom *TheGameSpyGame = NULL; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp index 372c2ac4ff..1abd24963d 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp @@ -48,11 +48,6 @@ #include "GameNetwork/NAT.h" #include "GameNetwork/NetworkInterface.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GameSpyGameSlot ------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp index 32e8119667..7c3b8e7484 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp @@ -41,11 +41,6 @@ #include "mutex.h" #include "thread.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp index d9c2ea6b9e..1a5c487625 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp @@ -48,11 +48,6 @@ #include "Common/MiniLog.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // enable this for trying to track down why SBServers are losing their keyvals -MDC 2/20/2003 #undef SERVER_DEBUGGING @@ -84,11 +79,6 @@ static LogClass s_stateChangedLog("StateChanged.txt"); // -MDC 2/14/2003 #define USE_BROADCAST_KEYS -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif int isThreadHosting = 0; static UnsignedInt s_lastStateChangedHeartbeat = 0; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp index c042e8c5f6..a57677bbe7 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp @@ -41,11 +41,6 @@ #include "Common/StackDump.h" #include "Common/SubsystemInterface.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp index 8e47946604..efe58934a2 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp @@ -38,11 +38,6 @@ #include "Common/UserPreferences.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static const UnsignedShort lobbyPort = 8086; ///< This is the UDP port used by all LANAPI communication diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp index 006c270e9b..934a7c595b 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp @@ -50,11 +50,6 @@ LANAPI *TheLAN = NULL; extern Bool LANbuttonPushed; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //Colors used for the chat dialogs const Color playerColor = GameMakeColor(255,255,255,255); diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp index 41e2f7178e..224ea73123 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp @@ -42,11 +42,6 @@ #include "GameNetwork/GameSpy/PersistentStorageThread.h" #include "GameNetwork/GameSpy/GSConfig.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /* * In case you're wondering, we do this weird connection pairing scheme diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp index 39367ca687..a7941a8a97 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp @@ -32,11 +32,6 @@ #include "GameNetwork/networkutil.h" #include "GameNetwork/GameMessageParser.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // This function assumes that all of the fields are either of default value or are // present in the raw data. diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp index 6c9003908b..4e8863cb9c 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp @@ -52,11 +52,6 @@ #include "Common/Recorder.h" #include "GameClient/MessageBox.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #if defined(DEBUG_CRC) Int NET_CRC_INTERVAL = 1; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp index 7dccc9f69c..85ef1b713b 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp @@ -29,11 +29,6 @@ #include "GameNetwork/Transport.h" #include "GameNetwork/NetworkInterface.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //-------------------------------------------------------------------------- // Packet-level encryption is an XOR operation, for speed reasons. To get diff --git a/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp index f47bbbb487..e81641644e 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp @@ -46,11 +46,6 @@ #include "GameClient/GameWindow.h" #include "GameClient/Display.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /** * OLEInitializer class - Init and shutdown OLE & COM as a global diff --git a/Generals/Code/GameEngine/Source/GameNetwork/udp.cpp b/Generals/Code/GameEngine/Source/GameNetwork/udp.cpp index 059313eea5..abdc78cb95 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/udp.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/udp.cpp @@ -35,11 +35,6 @@ //#include "GameNetwork/NetworkInterface.h" #include "GameNetwork/udp.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp index 7af59b2593..b3d7c5a734 100644 --- a/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp @@ -66,10 +66,6 @@ #include "Common/file.h" -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif enum { INFINITE_LOOP_COUNT = 1000000 }; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp index 01ebdc494c..e2f99f55f6 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp @@ -55,11 +55,6 @@ #include "WW3D2/texture.h" #include "WW3D2/dx8caps.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp index d77d71ee55..7baa8b0da8 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp @@ -40,11 +40,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp index 5c9a27f1e7..04d57588fd 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp @@ -52,11 +52,6 @@ #include "WW3D2/assetmgr.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp index d2d735ae7b..effb187669 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp @@ -68,11 +68,6 @@ #include "WW3D2/meshmdl.h" #include "Common/BitFlagsIO.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- static inline Bool isValidTimeToCalcLogicStuff() diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp index c799364345..8d38018024 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp @@ -44,11 +44,6 @@ #include "W3DDevice/GameClient/W3DScene.h" #include "Common/GameState.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp index afd5ef7d28..5498b8cc8e 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp @@ -47,11 +47,6 @@ #include "W3DDevice/GameClient/Module/W3DTankDraw.h" #include "WW3D2/matinfo.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif class Matrix3D; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp index 5236498060..4b5c3331f7 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp @@ -41,11 +41,6 @@ #include "WW3D2/line3d.h" #include "W3DDevice/GameClient/W3DScene.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp index dc54baca09..1647432f8f 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp @@ -49,11 +49,6 @@ #include "W3DDevice/GameClient/W3DGameClient.h" #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- W3DTruckDrawModuleData::W3DTruckDrawModuleData() diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp index 071cb170cf..ded1e0011a 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp @@ -39,11 +39,6 @@ #include "GameClient/ControlBarScheme.h" #include "GameClient/MapUtil.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- void W3DCameoMovieDraw( GameWindow *window, WinInstanceData *instData ) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp index 48314c84c6..4c468fd2df 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp @@ -68,11 +68,6 @@ /////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // W3DGadgetHorizontalSliderDraw ============================================== /** Draw colored horizontal slider using standard graphics */ diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp index 23ae42355b..367b63845e 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp @@ -58,11 +58,6 @@ #include "W3DDevice/GameClient/W3DGadget.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp index 407ac1242b..04be63a263 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp @@ -70,11 +70,6 @@ /////////////////////////////////////////////////////////////////////////////// // PRIVATE FUNCTIONS ////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // drawStaticTextText ========================================================= /** Draw the text for a static text window */ diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp index 527ebcc5e2..a47ff89c65 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp @@ -53,11 +53,6 @@ #include "W3DDevice/GameClient/W3DGadget.h" #include "W3DDevice/GameClient/W3DDisplay.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp index 39613903fd..307065155f 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp @@ -91,11 +91,6 @@ #include "Common/PerfTimer.h" #include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba. -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define no_OPTIMIZED_HEIGHTMAP_LIGHTING 01 // Doesn't work well. jba. diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp index 5ac331ddc9..67a7499408 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp @@ -58,11 +58,6 @@ #include "W3DDevice/GameClient/W3DShadow.h" #include "W3DDevice/GameClient/HeightMap.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /** @todo: We're going to have a pool of a couple rendertargets to use in rare cases when dynamic shadows need to be generated. Maybe we can diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index 0c487df949..6135448919 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -58,11 +58,6 @@ #include "WW3D2/dx8caps.h" #include "GameClient/Drawable.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // Global Variables and Functions ///////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp index 74946b2b7b..0a433082b0 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp @@ -69,11 +69,6 @@ #include "Common/PerfTimer.h" #include "Common/GlobalData.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //--------------------------------------------------------------------- // Constants diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp index 2eba44e7ff..9ed1158049 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp @@ -72,11 +72,6 @@ #include "WW3D2/meshmdl.h" #include "WW3D2/scene.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // Private Data diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index 3e6ad95863..b86ea5bf2a 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -108,11 +108,6 @@ static void drawFramerateBar(void); #include "WinMain.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINE AND ENUMS /////////////////////////////////////////////////////////// #define DEFAULT_DISPLAY_BIT_DEPTH 32 diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp index 80b67ceeb8..fad7e0db5e 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp @@ -56,11 +56,6 @@ #include "GameClient/GlobalLanguage.h" // DEFINES //////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE TYPES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp index e74f7a8930..fb06ee3c18 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp @@ -52,11 +52,6 @@ #include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba. -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef RTS_DEBUG diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp index b5249abaf7..30bcbd6026 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp @@ -47,11 +47,6 @@ #include "mutex.h" #include "thread.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif //Since there can't be more than 1 mouse, might as well keep these static. static CriticalSectionClass mutex; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp index 86e61d7253..d84bf83e67 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp @@ -70,11 +70,6 @@ static const Real TEE_WIDTH_ADJUSTMENT = 1.03f; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // Private Data diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp index 05ff57069e..663422b29f 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp @@ -63,11 +63,6 @@ #include "WW3D2/dx8caps.h" #include "WW3D2/colorspace.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////// // DEFINITIONS //////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp index 90252d6eab..5fff58239b 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp @@ -73,11 +73,6 @@ #include "dx8caps.h" #include "Common/GameLOD.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /** Interface definition for custom shaders we define in our app. These shaders can perform more complex operations than those allowed in the WW3D2 shader system. diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp index fcb943d214..6b25f48ec3 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp @@ -42,11 +42,6 @@ #include "Common/GlobalData.h" #include "GameLogic/PartitionManager.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp index 38ce674c73..354380cdef 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp @@ -60,11 +60,6 @@ #include "GameLogic/Object.h" #include "GameClient/Drawable.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define BRIDGE_OFFSET_FACTOR 0.25f //amount to raise tracks above bridges. //============================================================================= diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp index a4ff36e2d3..80e0da060c 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp @@ -94,11 +94,6 @@ #include "WinMain.h" /** @todo Remove this, it's only here because we are using timeGetTime, but we can remove that when we have our own timer */ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp index 150712c48a..88c372d56d 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp @@ -86,11 +86,6 @@ -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //============================================================================= diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp index db9bd79b2c..6192edd312 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp @@ -66,11 +66,6 @@ #include "W3DDevice/GameClient/W3DCustomScene.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define MIPMAP_BUMP_TEXTURE diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp index 57c904e987..8d57fdd70c 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp @@ -51,11 +51,6 @@ #include "WW3D2/matinfo.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /**This class will hold all information about a W3D RenderObject needed to reconstruct it if necessary*/ diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp index c5dd176b56..f7d1271ee3 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp @@ -41,11 +41,6 @@ #include "GameLogic/AI.h" #include "GameLogic/AIPathfind.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp index 94730ba482..f5ebda42f2 100644 --- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp +++ b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp @@ -37,11 +37,6 @@ #include "Win32Device/Common/Win32BIGFileSystem.h" #include "Utility/endian_compat.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static const char *BIGFileIdentifier = "BIGF"; diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp index 761a98b785..95496a065b 100644 --- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp +++ b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp @@ -37,10 +37,6 @@ #include "Common/UnicodeString.h" #include "GameClient/GameText.h" -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif extern HWND ApplicationHWnd; diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp index d6a80e85fd..ee712a4ea7 100644 --- a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp +++ b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp @@ -37,11 +37,6 @@ #include "Win32Device/GameClient/Win32Mouse.h" #include "WinMain.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern Win32Mouse *TheWin32Mouse; diff --git a/Generals/Code/Main/WinMain.cpp b/Generals/Code/Main/WinMain.cpp index 8a3f00888c..5d30943d84 100644 --- a/Generals/Code/Main/WinMain.cpp +++ b/Generals/Code/Main/WinMain.cpp @@ -65,11 +65,6 @@ #include "GeneratedVersion.h" #include "resource.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBALS //////////////////////////////////////////////////////////////////// HINSTANCE ApplicationHInstance = NULL; ///< our application instance diff --git a/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp b/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp index a594ca4b71..3a2fe26a96 100644 --- a/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp @@ -25,11 +25,6 @@ #include "EditParameter.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif ///////////////////////////////////////////////////////////////////////////// // EditAction dialog diff --git a/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp b/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp index a7c1f1237e..8cd78866be 100644 --- a/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp @@ -64,11 +64,6 @@ #include "W3DDevice/GameClient/W3DGameFont.h" #include "W3DDevice/GameClient/HeightMap.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif // TYPE DEFINES /////////////////////////////////////////////////////////////////////////////////// #define WORLDBUILDER_FONT_FILENAME "GUIEFont.txt" diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp index f99b1e059d..8ca9f94955 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp @@ -24,11 +24,6 @@ #include "ScriptProperties.h" #include "GameLogic/Scripts.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif ///////////////////////////////////////////////////////////////////////////// // ScriptProperties property page diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 7024305a4b..390572b651 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -83,11 +83,6 @@ #include "Win32Device/Common/Win32LocalFileSystem.h" #include "Win32Device/Common/Win32BIGFileSystem.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static SubsystemInterfaceList TheSubsystemListRecord; diff --git a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp index b29b202d74..921de88d2a 100644 --- a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -95,11 +95,6 @@ #include -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ---------------------------------------------------------------------------- // Misc. Forward Declarations diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index afb4491759..e4cb9b4891 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -35,11 +35,6 @@ #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/AIUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp index 3f9d2937bb..7e363bb127 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp @@ -57,10 +57,6 @@ #include "GameClient/Drawable.h" // For getPosition #include "GameClient/GameClient.h" // For getDrawableByID -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- AudioEventRTS::AudioEventRTS() diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameAudio.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameAudio.cpp index 77c09a7d5d..4bd78773fa 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -71,10 +71,6 @@ #include "WWMath/matrix3d.h" /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static const char* TheSpeakerTypes[] = { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameMusic.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameMusic.cpp index 5eb664302c..538a313207 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameMusic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameMusic.cpp @@ -52,10 +52,6 @@ #include "Common/GameAudio.h" #include "Common/INI.h" -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameSounds.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameSounds.cpp index 361a752e59..aa588c5886 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameSounds.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameSounds.cpp @@ -56,10 +56,6 @@ #include "GameLogic/PartitionManager.h" /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- SoundManager::SoundManager() diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp index 6263d46eb4..4cbf29b7dc 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp @@ -33,11 +33,6 @@ #include "GameNetwork/IPEnumeration.h" #include -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef DEBUG_CRC diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp index dc967b179c..c35cffd5dc 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp @@ -37,11 +37,6 @@ #include "GameNetwork/NetworkDefs.h" #include "trim.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp index c558886252..d50d11c163 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp @@ -108,11 +108,6 @@ #include "Common/version.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp index 235c3a14a6..6607d3c673 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp @@ -41,11 +41,6 @@ #define DEFINE_PARTICLE_SYSTEM_NAMES #include "GameClient/ParticleSys.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define PROFILE_ERROR_LIMIT 0.94f //fraction of profiled result needed to get a match. Allows some room for error/fluctuation. diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp index bc9569238f..59cf63dc6f 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp @@ -59,11 +59,6 @@ #include "GameLogic/ScriptEngine.h" #include "GameLogic/Weapon.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp index 1cad0961cf..4f95569aa6 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp @@ -39,11 +39,6 @@ #include "Common/WellKnownKeys.h" #include "Common/QuotedPrintable.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif class MapMetaDataReader { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp index b529e9e844..1be51ef267 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp @@ -34,11 +34,6 @@ #include "Common/Registry.h" #include "GameNetwork/WOLBrowser/WebBrowser.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 702add5f2a..b25cb4b995 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -42,11 +42,6 @@ CommandList *TheCommandList = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp index 2888170991..f60dfa2118 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -40,11 +40,6 @@ __forceinline void ProfileGetTime(__int64 &t) t = _rdtsc(); } -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp index 4506da46f2..37de07f170 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp @@ -62,11 +62,6 @@ #include "GameLogic/Module/ContainModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif const char *TheAcademyClassificationTypeNames[] = { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp index c7f058919b..ef14ac76f8 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp @@ -64,11 +64,6 @@ #include "GameLogic/ExperienceTracker.h"//LORENZEN -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBAL ///////////////////////////////////////////////////////////////////////////////////////// ActionManager *TheActionManager = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp index 4b2eb27110..393bcb05e3 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp @@ -53,11 +53,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- Energy::Energy() diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index d096a602fd..aa0685fbff 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -101,11 +101,6 @@ #include "GameNetwork/GameInfo.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //Grey for neutral. #define NEUTRAL_PLAYER_COLOR 0xffffffff diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp index 1916007520..8f1a59e1b6 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp @@ -60,11 +60,6 @@ #include "GameLogic/SidesList.h" #include "GameNetwork/NetworkDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- /*extern*/ PlayerList *ThePlayerList = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp index 14f18ef9b7..86aa7a954b 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp @@ -53,11 +53,6 @@ #include "Common/Science.h" #include "GameClient/Image.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index c8ee735ee6..29d84b1598 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -52,11 +52,6 @@ #include "GameClient/Drawable.h" #include "GameClient/GameText.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- ProductionPrerequisite::ProductionPrerequisite() diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp index 2653c80766..4bb6f1979e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp @@ -35,11 +35,6 @@ ScienceStore* TheScienceStore = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- void ScienceStore::init() diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp index 07bce5c8fe..646036b4c1 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp @@ -37,11 +37,6 @@ #include "GameLogic/Object.h" #include "Common/BitFlagsIO.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBAL ///////////////////////////////////////////////////////////////////////////////////////// SpecialPowerStore *TheSpecialPowerStore = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp index 2b3185e6f9..5565fd127e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -51,11 +51,6 @@ #include "GameLogic/ScriptActions.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif ///@todo - do delayed script evaluations for team scripts. jba. diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RandomValue.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RandomValue.cpp index c1b41acd5b..a0a36d0e23 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RandomValue.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RandomValue.cpp @@ -37,11 +37,6 @@ //#define DETERMINISTIC // to allow repetition for debugging -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #undef DEBUG_RANDOM_CLIENT #undef DEBUG_RANDOM_LOGIC diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index 8261cbbe7f..bf2fac9b34 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -46,11 +46,6 @@ #include "Common/CRCDebug.h" #include "Common/version.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif Int REPLAY_CRC_INTERVAL = 100; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp index faa22d3c90..605999d9e3 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp @@ -39,12 +39,6 @@ #include "ref_ptr.h" -#ifdef RTS_INTERNAL -// for occasional debugging... - -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------ Performance Timers //#include "Common/PerfMetrics.h" diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp index c0513d6370..9d6d4a58d5 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp @@ -51,11 +51,6 @@ #include "Common/AsciiString.h" #include "Common/PerfTimer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp index 03a13937e2..59360d66ae 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp @@ -59,11 +59,6 @@ // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// BuildAssistant *TheBuildAssistant = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp index 173c496ad4..6bc9dfb5cc 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp @@ -77,10 +77,6 @@ extern HWND ApplicationHWnd; extern const char *gAppPrefix; /// So WB can have a different log file name. -#ifdef RTS_INTERNAL -// this should ALWAYS be present -#pragma optimize("", off) -#endif // ---------------------------------------------------------------------------- // DEFINES diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp index 220cc0b532..9f2be7cbb6 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp @@ -64,11 +64,6 @@ DECLARE_PERF_TIMER(MemoryPoolDebugging) DECLARE_PERF_TIMER(MemoryPoolInitFilling) #endif -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ---------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp index 40e048563d..09b7242cf5 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp @@ -36,11 +36,6 @@ #include "Common/RandomValue.h" #include "Common/Xfer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFile.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFile.cpp index 9680a43fa3..e1cfd5c811 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFile.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFile.cpp @@ -61,11 +61,6 @@ #include "Common/PerfTimer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/MemoryInit.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/MemoryInit.cpp index 5c377d6ffe..7c5d74d5c1 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/MemoryInit.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/MemoryInit.cpp @@ -49,11 +49,6 @@ #include "Lib/BaseType.h" #include "Common/GameMemory.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp index 69e3caf68f..025362552f 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp @@ -53,11 +53,6 @@ #include "GameLogic/Module/ContainModule.h" #include "GameLogic/Module/StealthUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBALS //////////////////////////////////////////////////////////////////////////////////////// Radar *TheRadar = NULL; ///< the radar global singleton diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp index fd2de28eb1..0f608da490 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp @@ -59,11 +59,6 @@ #include "GameLogic/SidesList.h" #include "GameLogic/TerrainLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// GameState *TheGameState = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp index a5edd698a2..7d94e462f7 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp @@ -45,11 +45,6 @@ // GLOBALS //////////////////////////////////////////////////////////////////////////////////////// GameStateMap *TheGameStateMap = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // METHODS //////////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp index ad6b39ea2e..ede05db892 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp @@ -29,11 +29,6 @@ #include "Common/SubsystemInterface.h" #include "Common/Xfer.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef DUMP_PERF_STATS #include "GameLogic/GameLogic.h" diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp index 235e9f8868..7de7ee3b98 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp @@ -46,11 +46,6 @@ #include "Common/CriticalSection.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ----------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp index d82ce18e08..6830a8ea6f 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp @@ -30,11 +30,6 @@ #include "Common/Registry.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif Bool getStringFromRegistry(HKEY root, AsciiString path, AsciiString key, AsciiString& val) { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp index a5908421bc..9b9c776cc9 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp @@ -47,11 +47,6 @@ #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/UpgradeModule.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp index dc8a3d9eb7..9c03ddbc38 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp @@ -286,11 +286,6 @@ ModuleFactory *TheModuleFactory = NULL; ///< the module factory singleton // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp index bc0f65c456..d55ecef21b 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp @@ -46,11 +46,6 @@ #include "Lib/trig.h" #include "GameLogic/TerrainLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //============================================================================= /** Constructor */ diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp index a92d80b548..6b18f42095 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp @@ -48,11 +48,6 @@ #include "GameClient/Drawable.h" #include "Common/INI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif enum { TEMPLATE_HASH_SIZE = 12288 }; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp index 81105d61a0..10f181ff2e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp @@ -72,11 +72,6 @@ #include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba. -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp b/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp index 1d488c1d38..cd1019b1dd 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp @@ -51,11 +51,6 @@ #include "GameClient/ChallengeGenerals.h" #include "GameNetwork/GameSpy/PeerDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp index 70d20e99e5..20a12d2767 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp @@ -79,11 +79,6 @@ /** Get the RGB color comonents of a color */ //============================================================================= -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //Put on ice until later M Lorenzen diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp index afe800967a..b01f91c031 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp @@ -56,11 +56,6 @@ #include "GameClient/Display.h" #include "GameClient/GameText.h" #include "GameClient/GlobalLanguage.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp index b5413b37b1..2c9ad924b9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -82,11 +82,6 @@ #include "GameLogic/Module/ParkingPlaceBehavior.h" #endif -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define VERY_TRANSPARENT_MATERIAL_PASS_OPACITY (0.001f) #define MATERIAL_PASS_OPACITY_FADE_SCALAR (0.8f) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp index f3eadcbe85..15e848c33c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp @@ -43,11 +43,6 @@ #include "GameLogic/ScriptEngine.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp index 89d88ccfc2..0e8381ac56 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp @@ -31,11 +31,6 @@ #include "Common/PlayerList.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- const char *TheEvaMessageNames[] = diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp index 74ff421e69..03cd1bde2d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp @@ -54,11 +54,6 @@ // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif FXListStore *TheFXListStore = NULL; ///< the FXList store definition diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp index b788f33492..51ac4d65ba 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp @@ -31,11 +31,6 @@ #include "GameClient/ChallengeGenerals.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif ChallengeGenerals *TheChallengeGenerals = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 3dd2012ec8..d9cc4136ce 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -83,11 +83,6 @@ #include "GameNetwork/GameInfo.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC ///////////////////////////////////////////////////////////////////////////////////////// ControlBar *TheControlBar = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp index a61b397177..9f3068c1ee 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp @@ -60,11 +60,6 @@ #include "GameClient/GameWindowManager.h" #include "GameClient/GadgetPushButton.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static GameWindow *commandWindows[ MAX_COMMANDS_PER_SET ]; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp index a5a3e5feda..3a11618bba 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp @@ -56,11 +56,6 @@ #include "GameLogic/Object.h" #include "GameLogic/Module/ProductionUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp index daa7176c15..3265fd9e41 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp @@ -40,11 +40,6 @@ #include "GameClient/InGameUI.h" #include "GameLogic/Object.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 2684160703..fbe52ddae7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -62,11 +62,6 @@ #include "GameClient/Image.h" #include "GameClient/GameWindowManager.h" #include "GameClient/GadgetPushButton.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp index 0afb55edf6..beeec46734 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp @@ -44,11 +44,6 @@ #include "GameClient/GadgetPushButton.h" #include "GameClient/HotKey.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define STOP_ID 10 #define EVACUATE_ID 11 diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp index 3546d55f6a..55577718c4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp @@ -93,11 +93,6 @@ #include "GameLogic/ScriptEngine.h" #include "GameNetwork/NetworkInterface.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static WindowLayout *theLayout = NULL; static GameWindow *theWindow = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp index 5f8db64374..53df52341b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp @@ -57,11 +57,6 @@ #include "GameNetwork/GameSpy/BuddyDefs.h" #include "GameNetwork/GameSpy/PeerDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp index 7d3c2d6898..caf5c9089c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp @@ -55,11 +55,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif SkirmishGameInfo *TheChallengeGameInfo = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp index afb9fb5eb3..d5adf905f9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp @@ -47,11 +47,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp index 11784eda81..96916bc542 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp @@ -44,11 +44,6 @@ #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANAPI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static GameWindow *parent = NULL; static GameWindow *staticTextGameName = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index c99333ef94..a9a0be113a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -60,11 +60,6 @@ #include "GameClient/GameText.h" #include "GameNetwork/GUIUtil.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif extern char *LANnextScreen; extern Bool LANisShuttingDown; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp index b1a9d246cf..c55ef06466 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp @@ -44,11 +44,6 @@ #include "GameClient/MapUtil.h" #include "GameNetwork/GUIUtil.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static NameKeyType buttonBack = NAMEKEY_INVALID; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index 7b6052efff..b8b652ee27 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -78,11 +78,6 @@ //for accessing the InGameUI #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp index 7de2fa6f00..720957a13c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp @@ -50,11 +50,6 @@ #include "GameNetwork/LANAPI.h" #include "GameNetwork/LANAPICallbacks.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // window ids ------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index b5c2ab8d6f..92a54431f7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -76,11 +76,6 @@ // This is for non-RC builds only!!! #define VERBOSE_VERSION L"Release" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static NameKeyType comboBoxOnlineIPID = NAMEKEY_INVALID; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp index efd7235e58..9e1af04aac 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp @@ -100,11 +100,6 @@ static GameWindow *textEntryGamePassword = NULL; static GameWindow *checkBoxLimitArmies = NULL; static GameWindow *checkBoxUseStats = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif void createGame( void ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp index 3a184f884f..3d19a9b8db 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp @@ -68,11 +68,6 @@ //#include "GameNetwork/GameSpy/PeerThread.h" #include "GameNetwork/GameSpyOverlay.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp index 60fdf4da2f..051209e36c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp @@ -60,11 +60,6 @@ #include "WWDownload/Registry.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// // window ids ------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp index 8919f94fef..f270b3c962 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp @@ -59,11 +59,6 @@ #include "GameClient/Shell.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static NameKeyType buttonBackKey = NAMEKEY_INVALID; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 87403c40e6..8c5f3513b6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -53,11 +53,6 @@ #include "GameClient/DisconnectMenu.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp index 710c113256..be7be46882 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp @@ -48,11 +48,6 @@ #include "GameClient/GameText.h" #include "GameClient/GameWindowTransitions.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // window ids ------------------------------------------------------------------------------------- static NameKeyType parentReplayMenuID = NAMEKEY_INVALID; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index c82b077b82..cb7b8ba7ed 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -101,11 +101,6 @@ #include "GameClient/InGameUI.h" #include "GameClient/ChallengeGenerals.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index ba9dd813cf..d459d69114 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -70,11 +70,6 @@ #include "GameNetwork/IPEnumeration.h" #include "WWDownload/Registry.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif SkirmishGameInfo *TheSkirmishGameInfo = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp index c153ef6787..4e29d14fe5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp @@ -57,11 +57,6 @@ // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // window ids ------------------------------------------------------------------------------ static NameKeyType parentID = NAMEKEY_INVALID; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index 2d3b33d3c5..36bb297619 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -67,11 +67,6 @@ void WOLDisplaySlotList( void ); -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif extern std::list TheLobbyQueuedUTMs; extern void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp index c4eb5eb466..c680e133bb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp @@ -70,11 +70,6 @@ #include "GameNetwork/GameSpy/LobbyUtils.h" #include "GameNetwork/RankPointValue.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif void refreshGameList( Bool forceRefresh = FALSE ); void refreshPlayerList( Bool forceRefresh = FALSE ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp index 522a354c93..db110929d8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp @@ -48,11 +48,6 @@ #include "GameNetwork/GameSpy/PersistentStorageDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// // window ids ------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp index 104e40c35d..cb1d566db2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp @@ -69,11 +69,6 @@ #include "GameNetwork/WOLBrowser/WebBrowser.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef ALLOW_NON_PROFILED_LOGIN Bool GameSpyUseProfiles = false; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp index ebc6680f49..842e1bf897 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp @@ -44,11 +44,6 @@ #include "GameClient/MapUtil.h" #include "GameNetwork/GUIUtil.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static NameKeyType buttonBack = NAMEKEY_INVALID; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp index e281adc384..b2a0d3ae43 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp @@ -66,11 +66,6 @@ #include "GameNetwork/GameSpy/PersistentStorageThread.h" #include "GameNetwork/RankPointValue.h" #include "GameNetwork/GameSpy/LadderDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #ifdef DEBUG_LOGGING #include "Common/MiniLog.h" diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp index 5fb0378e3a..839920bffe 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp @@ -69,11 +69,6 @@ #include "GameNetwork/GameSpy/MainMenuUtils.h" #include "GameNetwork/WOLBrowser/WebBrowser.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static Bool isShuttingDown = FALSE; static Bool buttonPushed = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp index ecb1195987..99f7309cb6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp @@ -67,11 +67,6 @@ /////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GadgetHorizontalSliderInput ================================================ /** Handle input for horizontal slider */ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp index da207906c2..e85ec198cc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp @@ -63,11 +63,6 @@ #include "GameClient/GameWindowGlobal.h" #include "GameClient/Keyboard.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// // Sets up the user's OS set doubleclick time so if they don't like it... they can diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp index 4caedbf70b..9ba65d372c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp @@ -54,11 +54,6 @@ #include "GameClient/GameWindowManager.h" #include "GameClient/InGameUI.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// // PRIVATE TYPES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp index e6927627a6..852b343849 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp @@ -57,11 +57,6 @@ // DEFINES //////////////////////////////////////////////////////////////////// // PRIVATE TYPES ////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif /////////////////////////////////////////////////////////////////////////////// // PRIVATE DATA /////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp index bef5d28808..cbe925a4f5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp @@ -66,11 +66,6 @@ /////////////////////////////////////////////////////////////////////////////// // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GadgetVerticlaSliderInput ================================================== /** Handle input for vertical slider */ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp index 767a9d6e02..43cd553632 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp @@ -62,11 +62,6 @@ #include "GameClient/Mouse.h" #include "GameClient/SelectionXlat.h" #include "GameClient/GameWindowTransitions.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index c4300b691c..86c10e7741 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -61,11 +61,6 @@ UnsignedInt WindowLayoutCurrentVersion = 2; /////////////////////////////////////////////////////////////////////////////////////////////////// // PRIVATE FUNCTIONS ////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // // with this statis set to true, the window system will propogate mouse position diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp index 4c22f9c081..b8ce0db552 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp @@ -72,11 +72,6 @@ #include "GameClient/GameText.h" #include "GameClient/HeaderTemplate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp index 6bdb319c9c..3b5b521476 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp @@ -47,11 +47,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp index 13ac6f6e29..36e9e86c51 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp @@ -47,11 +47,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index 503c131969..d5df520a2a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -60,11 +60,6 @@ #include "GameClient/HeaderTemplate.h" #include "GameClient/GameFont.h" #include "GameClient/GlobalLanguage.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // DEFINES //////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 925622ede5..23d95ea320 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -61,11 +61,6 @@ #include "GameClient/Color.h" #include "Common/NameKeyGenerator.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- // Externals diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index b343455844..270b84081c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -90,11 +90,6 @@ // DEFINES //////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- // PRIVATE TYPES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index be41669d34..3046bab3fe 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -47,11 +47,6 @@ // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// Shell *TheShell = NULL; ///< the shell singleton definition -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp index 746f595b2e..75e07bb123 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp @@ -33,12 +33,6 @@ #include "GameClient/WindowLayout.h" #include "GameClient/Shell.h" #include "GameClient/GameWindowManager.h" -#ifdef RTS_INTERNAL - -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp index c072e3d0d0..522779806d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -83,11 +83,6 @@ #include "GameLogic/GhostObject.h" #include "GameLogic/Object.h" #include "GameLogic/ScriptEngine.h" // For TheScriptEngine - jkmcd -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif #define DRAWABLE_HASH_SIZE 8192 diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp index 163018fbd2..fbb673ee49 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp @@ -58,11 +58,6 @@ #include "Common/FileSystem.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //---------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index e540c5ab11..41c3f58b55 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -90,11 +90,6 @@ #include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba. -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 22abf438fc..58531975a9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -47,11 +47,6 @@ #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PUBLIC DATA //////////////////////////////////////////////////////////////////////////////////// Mouse *TheMouse = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp index b7fabb01f3..23a49e6330 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp @@ -29,11 +29,6 @@ #include "Common/FileSystem.h" #include "Common/file.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif LanguageFilter *TheLanguageFilter = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp index da50d6c3cd..08efb7a139 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp @@ -61,11 +61,6 @@ #include "GameNetwork/GameInfo.h" #include "GameNetwork/NetworkDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------- // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index adef51f3cc..83a014d02c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -86,11 +86,6 @@ #include "GameNetwork/GameSpyOverlay.h" #include "GameNetwork/GameSpy/BuddyThread.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp index 1adfb116f2..4e255cc83c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp @@ -47,11 +47,6 @@ #include "GameClient/GUICommandTranslator.h" #include "GameClient/CommandXlat.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // PRIVATE //////////////////////////////////////////////////////////////////////////////////////// enum CommandStatus diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp index f4be3f08d2..e0fbccc24f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp @@ -62,11 +62,6 @@ MetaMap *TheMetaMap = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp index 6c750071fe..e31143df16 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp @@ -46,11 +46,6 @@ #include "GameLogic/Module/ProductionUpdate.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- PlaceEventTranslator::PlaceEventTranslator() : m_frameOfUpButton(-1) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index a7b0cc57ee..170f18d005 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -56,11 +56,6 @@ #include "GameClient/SelectionXlat.h" #include "GameClient/TerrainVisual.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp index 8a934a8f7e..a7ca35948a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp @@ -55,11 +55,6 @@ #include "GameClient/Shell.h" #include "GameClient/Display.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp index b393145d45..d4fa40cb96 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp @@ -26,11 +26,6 @@ #include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine #include "GameClient/ParabolicEase.h" // ============================================================================ -#ifdef RTS_INTERNAL -// for occasional debugging... -// #pragma optimize("", off) -// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // RTS_INTERNAL // ============================================================================ namespace { // ============================================================================ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp index c0ffe556a0..e9f0eac2f1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp @@ -36,11 +36,6 @@ #include "GameClient/Shadow.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ------------------------------------------------------------------------------------------------ RadiusDecalTemplate::RadiusDecalTemplate() : diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp index dba71ac691..aa44e82eba 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp @@ -39,11 +39,6 @@ #include "GameClient/Drawable.h" #include "GameClient/KeyDefs.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------------------------- SelectionInfo::SelectionInfo() : diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp index eb6dbd1464..01abeeba88 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp @@ -31,11 +31,6 @@ #include "GameClient/Snow.h" #include "GameClient/View.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif SnowManager *TheSnowManager=NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index 6c84603bdf..cff1867b24 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -38,11 +38,6 @@ #include "GameClient/Image.h" #include "GameLogic/GameLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBAL ///////////////////////////////////////////////////////////////////////////////////////// Anim2DCollection *TheAnim2DCollection = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp index 715ddf84fb..842d91bc65 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp @@ -66,11 +66,6 @@ CampaignManager *TheCampaignManager = NULL; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif const FieldParse CampaignManager::m_campaignFieldParseTable[] = diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 66b7362be8..ed47a2e681 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -49,11 +49,6 @@ #include "GameLogic/Object.h" #include "GameLogic/TerrainLogic.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif //------------------------------------------------------------------------------ Performance Timers //#include "Common/PerfMetrics.h" diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp index 436a83da99..775bc879f5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp @@ -30,11 +30,6 @@ #include "PreRTS.h" // This must go first in EVERY cpp file int the Game #include "GameClient/Smudge.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif DLListClass SmudgeSet::m_freeSmudgeList; /// #include -#ifdef RTS_INTERNAL -// for occasional debugging... -// #pragma optimize("", off) -// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif bool SortingRendererClass::_EnableTriangleDraw=true; static unsigned DEFAULT_SORTING_POLY_COUNT = 16384; // (count * 3) must be less than 65536 diff --git a/GeneralsMD/Code/Main/WinMain.cpp b/GeneralsMD/Code/Main/WinMain.cpp index c2754bc541..7d6fff0947 100644 --- a/GeneralsMD/Code/Main/WinMain.cpp +++ b/GeneralsMD/Code/Main/WinMain.cpp @@ -68,11 +68,6 @@ #include -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif // GLOBALS //////////////////////////////////////////////////////////////////// HINSTANCE ApplicationHInstance = NULL; ///< our application instance diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp index d34968b370..1982788685 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp @@ -25,11 +25,6 @@ #include "EditParameter.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif ///////////////////////////////////////////////////////////////////////////// // EditAction dialog diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp index e74a8dd121..f90b700d43 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp @@ -25,11 +25,6 @@ #include "EditParameter.h" #include "GameLogic/ScriptEngine.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif LRESULT CMyTreeCtrl::WindowProc( UINT message, WPARAM wParam, LPARAM lParam ) { diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp index cedf8e96a8..de8d3c9281 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp @@ -64,11 +64,6 @@ #include "W3DDevice/GameClient/W3DGameFont.h" #include "W3DDevice/GameClient/HeightMap.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif // TYPE DEFINES /////////////////////////////////////////////////////////////////////////////////// #define WORLDBUILDER_FONT_FILENAME "GUIEFont.txt" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index 99fbaca893..b086ebfab9 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -42,11 +42,6 @@ #include "WaypointOptions.h" #include "Common/UnicodeString.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static const Int K_LOCAL_TEAMS_VERSION_1 = 1; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp index fcba96f790..2a43819289 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp @@ -24,11 +24,6 @@ #include "ScriptProperties.h" #include "GameLogic/Scripts.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma message("************************************** WARNING, optimization disabled for debugging purposes") -#endif ///////////////////////////////////////////////////////////////////////////// // ScriptProperties property page diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index 94603d387f..b18ca10334 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp @@ -43,11 +43,6 @@ #include "Common/DataChunk.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif int WorldHeightMapEdit::m_numGlobalTextureClasses=0; TGlobalTextureClass WorldHeightMapEdit::m_globalTextureClasses[NUM_TEXTURE_CLASSES]; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index d9c1aa9476..d57d2a6e07 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -83,11 +83,6 @@ #include "Win32Device/Common/Win32LocalFileSystem.h" #include "Win32Device/Common/Win32BIGFileSystem.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif static SubsystemInterfaceList TheSubsystemListRecord; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp index 0929a4d6b6..8b714b110a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp @@ -59,11 +59,6 @@ #include "WorldBuilderView.h" #include "MapPreview.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // Can't currently have multiple open... jba. #define notONLY_ONE_AT_A_TIME diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp index 7fa1aba166..ec6bc5ae44 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp @@ -39,11 +39,6 @@ const char* NEUTRAL_TEAM_UI_STR = "(neutral)"; const char* NEUTRAL_TEAM_INTERNAL_STR = "team"; -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif ///////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp index 3366701712..02401e8692 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp @@ -36,11 +36,6 @@ #include "teamsdialog.h" #include "LayersList.h" -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif Bool WbView::m_snapToGrid = false; ///////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp index 94e9c6f51e..38874ec02b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -95,11 +95,6 @@ #include -#ifdef RTS_INTERNAL -// for occasional debugging... -//#pragma optimize("", off) -//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes") -#endif // ---------------------------------------------------------------------------- // Misc. Forward Declarations From 00c323e10f9b1095318ebd02250c8a99553ee86b Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Sat, 5 Jul 2025 13:59:40 +0200 Subject: [PATCH 2/5] [GEN][ZH] Remove obsolete conditions for RTS_INTERNAL (#1231) --- Core/Libraries/Source/WWVegas/WWLib/always.h | 2 +- .../Libraries/Source/WWVegas/WWLib/sharebuf.h | 6 +- Core/Libraries/Source/debug/debug.h | 2 +- Core/Libraries/Source/debug/debug_macro.h | 8 +-- .../GameEngine/Include/Common/AsciiString.h | 2 +- .../Code/GameEngine/Include/Common/Debug.h | 2 +- .../GameEngine/Include/Common/DrawModule.h | 2 +- .../GameEngine/Include/Common/GameAudio.h | 4 +- .../GameEngine/Include/Common/GameCommon.h | 2 +- .../GameEngine/Include/Common/GameMemory.h | 6 +- .../Code/GameEngine/Include/Common/Geometry.h | 4 +- .../GameEngine/Include/Common/MessageStream.h | 12 ++-- .../GameEngine/Include/Common/PerfTimer.h | 2 +- .../Code/GameEngine/Include/Common/Player.h | 4 +- .../Code/GameEngine/Include/Common/Recorder.h | 2 +- .../Include/Common/SparseMatchFinder.h | 2 +- .../GameEngine/Include/Common/StackDump.h | 2 +- .../GameEngine/Include/Common/StateMachine.h | 2 +- .../Code/GameEngine/Include/Common/Thing.h | 2 +- .../GameEngine/Include/Common/ThingTemplate.h | 2 +- .../GameEngine/Include/Common/UnicodeString.h | 2 +- .../Include/GameClient/ControlBar.h | 2 +- .../Include/GameClient/DebugDisplay.h | 2 +- .../GameEngine/Include/GameClient/Display.h | 4 +- .../GameEngine/Include/GameClient/InGameUI.h | 2 +- .../GameEngine/Include/GameClient/Shadow.h | 2 +- .../GameEngine/Include/GameLogic/AIPathfind.h | 4 +- .../GameEngine/Include/GameLogic/ArmorSet.h | 2 +- .../GameLogic/Module/DumbProjectileBehavior.h | 2 +- .../GameEngine/Include/GameLogic/Object.h | 4 +- .../Include/GameLogic/PartitionManager.h | 64 ++++++++--------- .../Include/GameLogic/ScriptEngine.h | 2 +- .../GameEngine/Include/GameLogic/WeaponSet.h | 2 +- .../Include/GameNetwork/Connection.h | 2 +- .../Include/GameNetwork/ConnectionManager.h | 2 +- .../Include/GameNetwork/NetCommandRef.h | 2 +- .../Include/GameNetwork/NetworkDefs.h | 2 +- .../Include/GameNetwork/NetworkInterface.h | 2 +- .../Include/GameNetwork/Transport.h | 2 +- .../Source/Common/Audio/GameAudio.cpp | 2 +- .../GameEngine/Source/Common/CommandLine.cpp | 50 +++++++------- .../GameEngine/Source/Common/GameEngine.cpp | 10 +-- .../Source/Common/MessageStream.cpp | 16 ++--- .../Source/Common/NameKeyGenerator.cpp | 4 +- .../GameEngine/Source/Common/PerfTimer.cpp | 4 +- .../GameEngine/Source/Common/RTS/Player.cpp | 4 +- .../GameEngine/Source/Common/Recorder.cpp | 14 ++-- .../Source/Common/StatsCollector.cpp | 6 +- .../Source/Common/System/AsciiString.cpp | 2 +- .../GameEngine/Source/Common/System/Debug.cpp | 2 +- .../Source/Common/System/Geometry.cpp | 4 +- .../Source/Common/System/StackDump.cpp | 2 +- .../Source/Common/System/UnicodeString.cpp | 2 +- .../Source/Common/System/Upgrade.cpp | 2 +- .../GameEngine/Source/Common/Thing/Thing.cpp | 2 +- .../Source/Common/Thing/ThingFactory.cpp | 6 +- .../Source/Common/Thing/ThingTemplate.cpp | 12 ++-- .../Code/GameEngine/Source/Common/version.cpp | 14 ++-- .../GameClient/GUI/ControlBar/ControlBar.cpp | 4 +- .../GUICallbacks/Menus/LanGameOptionsMenu.cpp | 2 +- .../GUI/GUICallbacks/Menus/LanLobbyMenu.cpp | 4 +- .../GUI/GUICallbacks/Menus/MainMenu.cpp | 8 +-- .../GUI/GUICallbacks/Menus/ReplayMenu.cpp | 6 +- .../Menus/SkirmishGameOptionsMenu.cpp | 2 +- .../GUICallbacks/Menus/WOLGameSetupMenu.cpp | 8 +-- .../GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp | 6 +- .../Source/GameClient/GameClient.cpp | 6 +- .../GameEngine/Source/GameClient/GameText.cpp | 10 +-- .../GameEngine/Source/GameClient/InGameUI.cpp | 10 +-- .../GameEngine/Source/GameClient/MapUtil.cpp | 6 +- .../GameClient/MessageStream/CommandXlat.cpp | 12 ++-- .../GameClient/MessageStream/LookAtXlat.cpp | 30 ++++---- .../GameClient/MessageStream/MetaEvent.cpp | 8 +-- .../MessageStream/SelectionXlat.cpp | 10 +-- .../GameClient/MessageStream/WindowXlat.cpp | 4 +- .../Source/GameClient/SelectionInfo.cpp | 2 +- .../Debug Displayers/AudioDebugDisplay.cpp | 2 +- .../GameEngine/Source/GameLogic/AI/AI.cpp | 6 +- .../Source/GameLogic/AI/AIPathfind.cpp | 56 +++++++-------- .../Source/GameLogic/AI/AIPlayer.cpp | 2 +- .../Source/GameLogic/AI/AISkirmishPlayer.cpp | 2 +- .../Source/GameLogic/AI/AIStates.cpp | 10 +-- .../Source/GameLogic/AI/TurretAI.cpp | 4 +- .../Behavior/DumbProjectileBehavior.cpp | 4 +- .../Object/Contain/GarrisonContain.cpp | 2 +- .../GameLogic/Object/Contain/OpenContain.cpp | 2 +- .../Source/GameLogic/Object/Object.cpp | 14 ++-- .../GameLogic/Object/PartitionManager.cpp | 12 ++-- .../SpecialPower/SpecialPowerModule.cpp | 6 +- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 2 +- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Object/Update/FireSpreadUpdate.cpp | 2 +- .../GameLogic/Object/Update/HordeUpdate.cpp | 2 +- .../Update/MissileLauncherBuildingUpdate.cpp | 4 +- .../GameLogic/Object/Update/PhysicsUpdate.cpp | 2 +- .../Object/Update/StealthDetectorUpdate.cpp | 2 +- .../Object/Update/TensileFormationUpdate.cpp | 2 +- .../GameLogic/Object/Update/UpdateModule.cpp | 2 +- .../Source/GameLogic/Object/Weapon.cpp | 16 ++--- .../GameLogic/ScriptEngine/ScriptActions.cpp | 4 +- .../GameLogic/ScriptEngine/ScriptEngine.cpp | 4 +- .../Source/GameLogic/ScriptEngine/Scripts.cpp | 2 +- .../GameLogic/System/GameLogicDispatch.cpp | 8 +-- .../Source/GameNetwork/Connection.cpp | 10 +-- .../Source/GameNetwork/ConnectionManager.cpp | 14 ++-- .../GameSpy/StagingRoomGameInfo.cpp | 4 +- .../Source/GameNetwork/GameSpyChat.cpp | 10 +-- .../GameEngine/Source/GameNetwork/LANAPI.cpp | 2 +- .../Source/GameNetwork/LANAPIhandlers.cpp | 4 +- .../GameEngine/Source/GameNetwork/NAT.cpp | 2 +- .../GameEngine/Source/GameNetwork/Network.cpp | 16 ++--- .../Source/GameNetwork/Transport.cpp | 14 ++-- .../GameEngine/Source/GameNetwork/udp.cpp | 2 +- .../MilesAudioDevice/MilesAudioManager.h | 4 +- .../GameClient/Module/W3DModelDraw.h | 12 ++-- .../W3DDevice/GameClient/W3DDebugIcons.h | 4 +- .../Include/W3DDevice/GameClient/W3DDisplay.h | 6 +- .../W3DDevice/GameClient/W3DProjectedShadow.h | 2 +- .../GameClient/W3DVolumetricShadow.h | 2 +- .../MilesAudioDevice/MilesAudioManager.cpp | 10 +-- .../W3DDevice/Common/System/W3DRadar.cpp | 6 +- .../GameClient/Drawable/Draw/W3DModelDraw.cpp | 40 +++++------ .../Source/W3DDevice/GameClient/HeightMap.cpp | 2 +- .../GameClient/Shadow/W3DProjectedShadow.cpp | 2 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 2 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 4 +- .../W3DDevice/GameClient/W3DDebugIcons.cpp | 4 +- .../W3DDevice/GameClient/W3DDisplay.cpp | 26 +++---- .../Source/W3DDevice/GameClient/W3DScene.cpp | 4 +- .../W3DDevice/GameClient/W3DShaderManager.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DShroud.cpp | 18 ++--- .../W3DDevice/GameClient/W3DTerrainVisual.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DView.cpp | 16 ++--- Generals/Code/Main/WinMain.cpp | 2 +- .../Tools/GUIEdit/Include/GUIEditDisplay.h | 4 +- .../Code/Tools/WorldBuilder/src/OpenMap.cpp | 6 +- .../Code/Tools/WorldBuilder/src/SaveMap.cpp | 6 +- .../Tools/WorldBuilder/src/WHeightMapEdit.cpp | 2 +- .../Tools/WorldBuilder/src/WorldBuilder.cpp | 4 +- .../GameEngine/Include/Common/AsciiString.h | 2 +- .../Code/GameEngine/Include/Common/Debug.h | 2 +- .../GameEngine/Include/Common/DrawModule.h | 2 +- .../GameEngine/Include/Common/GameAudio.h | 4 +- .../GameEngine/Include/Common/GameCommon.h | 2 +- .../GameEngine/Include/Common/GameMemory.h | 6 +- .../Code/GameEngine/Include/Common/Geometry.h | 4 +- .../GameEngine/Include/Common/GlobalData.h | 2 +- .../GameEngine/Include/Common/MessageStream.h | 12 ++-- .../GameEngine/Include/Common/PerfTimer.h | 2 +- .../Code/GameEngine/Include/Common/Player.h | 8 +-- .../Code/GameEngine/Include/Common/Recorder.h | 2 +- .../Include/Common/SparseMatchFinder.h | 2 +- .../GameEngine/Include/Common/StackDump.h | 2 +- .../GameEngine/Include/Common/StateMachine.h | 2 +- .../Code/GameEngine/Include/Common/Thing.h | 2 +- .../GameEngine/Include/Common/ThingTemplate.h | 2 +- .../GameEngine/Include/Common/UnicodeString.h | 2 +- .../Include/GameClient/ControlBar.h | 2 +- .../Include/GameClient/DebugDisplay.h | 2 +- .../GameEngine/Include/GameClient/Display.h | 4 +- .../GameEngine/Include/GameClient/InGameUI.h | 2 +- .../Include/GameClient/SelectionXlat.h | 2 +- .../GameEngine/Include/GameClient/Shadow.h | 2 +- .../GameEngine/Include/GameLogic/AIPathfind.h | 4 +- .../GameEngine/Include/GameLogic/ArmorSet.h | 2 +- .../GameEngine/Include/GameLogic/GameLogic.h | 2 +- .../GameLogic/Module/DumbProjectileBehavior.h | 2 +- .../GameEngine/Include/GameLogic/Object.h | 4 +- .../Include/GameLogic/PartitionManager.h | 68 +++++++++---------- .../Include/GameLogic/ScriptEngine.h | 2 +- .../GameEngine/Include/GameLogic/WeaponSet.h | 2 +- .../Include/GameNetwork/Connection.h | 2 +- .../Include/GameNetwork/ConnectionManager.h | 2 +- .../Include/GameNetwork/NetCommandRef.h | 2 +- .../Include/GameNetwork/NetworkDefs.h | 2 +- .../Include/GameNetwork/NetworkInterface.h | 2 +- .../Include/GameNetwork/Transport.h | 2 +- .../Source/Common/Audio/GameAudio.cpp | 2 +- .../GameEngine/Source/Common/CommandLine.cpp | 50 +++++++------- .../GameEngine/Source/Common/GameEngine.cpp | 10 +-- .../GameEngine/Source/Common/GlobalData.cpp | 2 +- .../Source/Common/MessageStream.cpp | 16 ++--- .../Source/Common/NameKeyGenerator.cpp | 4 +- .../GameEngine/Source/Common/PerfTimer.cpp | 4 +- .../GameEngine/Source/Common/RTS/Player.cpp | 10 +-- .../GameEngine/Source/Common/Recorder.cpp | 14 ++-- .../Source/Common/StatsCollector.cpp | 6 +- .../Source/Common/System/AsciiString.cpp | 2 +- .../GameEngine/Source/Common/System/Debug.cpp | 4 +- .../Source/Common/System/GameMemory.cpp | 2 +- .../Source/Common/System/Geometry.cpp | 4 +- .../Source/Common/System/StackDump.cpp | 2 +- .../Source/Common/System/UnicodeString.cpp | 2 +- .../Source/Common/System/Upgrade.cpp | 2 +- .../GameEngine/Source/Common/Thing/Thing.cpp | 2 +- .../Source/Common/Thing/ThingFactory.cpp | 6 +- .../Source/Common/Thing/ThingTemplate.cpp | 12 ++-- .../Code/GameEngine/Source/Common/version.cpp | 14 ++-- .../GameClient/GUI/ControlBar/ControlBar.cpp | 4 +- .../GUICallbacks/Menus/LanGameOptionsMenu.cpp | 2 +- .../GUI/GUICallbacks/Menus/LanLobbyMenu.cpp | 4 +- .../GUI/GUICallbacks/Menus/MainMenu.cpp | 8 +-- .../GUI/GUICallbacks/Menus/ReplayMenu.cpp | 6 +- .../Menus/SkirmishGameOptionsMenu.cpp | 2 +- .../GUICallbacks/Menus/WOLGameSetupMenu.cpp | 8 +-- .../GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp | 6 +- .../Source/GameClient/GameClient.cpp | 6 +- .../GameEngine/Source/GameClient/GameText.cpp | 10 +-- .../GameEngine/Source/GameClient/InGameUI.cpp | 10 +-- .../GameEngine/Source/GameClient/MapUtil.cpp | 6 +- .../GameClient/MessageStream/CommandXlat.cpp | 12 ++-- .../GameClient/MessageStream/LookAtXlat.cpp | 30 ++++---- .../GameClient/MessageStream/MetaEvent.cpp | 8 +-- .../MessageStream/SelectionXlat.cpp | 14 ++-- .../GameClient/MessageStream/WindowXlat.cpp | 4 +- .../Source/GameClient/SelectionInfo.cpp | 2 +- .../Debug Displayers/AudioDebugDisplay.cpp | 2 +- .../GameEngine/Source/GameLogic/AI/AI.cpp | 6 +- .../Source/GameLogic/AI/AIPathfind.cpp | 58 ++++++++-------- .../Source/GameLogic/AI/AIPlayer.cpp | 4 +- .../Source/GameLogic/AI/AISkirmishPlayer.cpp | 4 +- .../Source/GameLogic/AI/AIStates.cpp | 10 +-- .../Source/GameLogic/AI/TurretAI.cpp | 4 +- .../Behavior/DumbProjectileBehavior.cpp | 4 +- .../Object/Contain/GarrisonContain.cpp | 2 +- .../GameLogic/Object/Contain/OpenContain.cpp | 2 +- .../Object/Die/RebuildHoleExposeDie.cpp | 2 +- .../Source/GameLogic/Object/Object.cpp | 14 ++-- .../GameLogic/Object/PartitionManager.cpp | 12 ++-- .../SpecialPower/SpecialPowerModule.cpp | 6 +- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 2 +- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Update/AIUpdate/SupplyTruckAIUpdate.cpp | 2 +- .../Object/Update/FireSpreadUpdate.cpp | 2 +- .../GameLogic/Object/Update/HordeUpdate.cpp | 2 +- .../Update/MissileLauncherBuildingUpdate.cpp | 4 +- .../GameLogic/Object/Update/PhysicsUpdate.cpp | 2 +- .../Object/Update/SpectreGunshipUpdate.cpp | 2 +- .../Object/Update/StealthDetectorUpdate.cpp | 2 +- .../Object/Update/TensileFormationUpdate.cpp | 2 +- .../GameLogic/Object/Update/UpdateModule.cpp | 2 +- .../Source/GameLogic/Object/Weapon.cpp | 18 ++--- .../GameLogic/ScriptEngine/ScriptActions.cpp | 4 +- .../GameLogic/ScriptEngine/ScriptEngine.cpp | 4 +- .../GameLogic/System/GameLogicDispatch.cpp | 8 +-- .../Source/GameNetwork/Connection.cpp | 10 +-- .../Source/GameNetwork/ConnectionManager.cpp | 14 ++-- .../GameSpy/StagingRoomGameInfo.cpp | 4 +- .../Source/GameNetwork/GameSpyChat.cpp | 10 +-- .../GameEngine/Source/GameNetwork/LANAPI.cpp | 2 +- .../Source/GameNetwork/LANAPIhandlers.cpp | 4 +- .../GameEngine/Source/GameNetwork/NAT.cpp | 2 +- .../GameEngine/Source/GameNetwork/Network.cpp | 16 ++--- .../Source/GameNetwork/Transport.cpp | 14 ++-- .../GameEngine/Source/GameNetwork/udp.cpp | 2 +- .../MilesAudioDevice/MilesAudioManager.h | 4 +- .../GameClient/Module/W3DModelDraw.h | 12 ++-- .../W3DDevice/GameClient/W3DDebugIcons.h | 4 +- .../Include/W3DDevice/GameClient/W3DDisplay.h | 6 +- .../W3DDevice/GameClient/W3DProjectedShadow.h | 2 +- .../GameClient/W3DVolumetricShadow.h | 2 +- .../MilesAudioDevice/MilesAudioManager.cpp | 10 +-- .../W3DDevice/Common/System/W3DRadar.cpp | 6 +- .../W3DDevice/GameClient/BaseHeightMap.cpp | 2 +- .../GameClient/Drawable/Draw/W3DModelDraw.cpp | 42 ++++++------ .../GameClient/Shadow/W3DProjectedShadow.cpp | 2 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 2 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 4 +- .../W3DDevice/GameClient/W3DDebugIcons.cpp | 4 +- .../W3DDevice/GameClient/W3DDisplay.cpp | 26 +++---- .../Source/W3DDevice/GameClient/W3DScene.cpp | 4 +- .../W3DDevice/GameClient/W3DShaderManager.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DShroud.cpp | 18 ++--- .../W3DDevice/GameClient/W3DTerrainVisual.cpp | 2 +- .../Source/W3DDevice/GameClient/W3DView.cpp | 16 ++--- GeneralsMD/Code/Main/WinMain.cpp | 4 +- .../Tools/GUIEdit/Include/GUIEditDisplay.h | 4 +- .../Code/Tools/WorldBuilder/src/OpenMap.cpp | 6 +- .../Code/Tools/WorldBuilder/src/SaveMap.cpp | 6 +- .../Tools/WorldBuilder/src/WHeightMapEdit.cpp | 2 +- .../Tools/WorldBuilder/src/WorldBuilder.cpp | 4 +- 281 files changed, 932 insertions(+), 932 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h index 255a306647..2c102bed47 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/always.h +++ b/Core/Libraries/Source/WWVegas/WWLib/always.h @@ -106,7 +106,7 @@ #endif -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) #define MSGW3DNEW(MSG) new( MSG, 0 ) #define MSGW3DNEWARRAY(MSG) new( MSG, 0 ) #define W3DNEW new("W3D_" __FILE__, 0) diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h index 8a6fddf751..23ba99ab6d 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h @@ -77,7 +77,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass protected: -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) const char* Msg; #endif T * Array; @@ -90,7 +90,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass template ShareBufferClass::ShareBufferClass(int count, const char* msg) : Count(count) -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) , Msg(msg) #endif { @@ -103,7 +103,7 @@ ShareBufferClass::ShareBufferClass(const ShareBufferClass & that) : Count(that.Count) { assert(Count > 0); -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) Msg = that.Msg; #endif Array = MSGW3DNEWARRAY(Msg) T[Count]; diff --git a/Core/Libraries/Source/debug/debug.h b/Core/Libraries/Source/debug/debug.h index f353fe3e3b..0d5bcea219 100644 --- a/Core/Libraries/Source/debug/debug.h +++ b/Core/Libraries/Source/debug/debug.h @@ -89,7 +89,7 @@ #endif // Define which libraries to use. -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE) +#if defined(RTS_DEBUG) || defined(RTS_PROFILE) # define HAS_ASSERTS # define HAS_LOGS #endif diff --git a/Core/Libraries/Source/debug/debug_macro.h b/Core/Libraries/Source/debug/debug_macro.h index aca31f80c8..63e940c353 100644 --- a/Core/Libraries/Source/debug/debug_macro.h +++ b/Core/Libraries/Source/debug/debug_macro.h @@ -45,7 +45,7 @@ This module defines a number of macros. Usually only these macros should be used to access any debug functionality. - All these macros are defined if either RTS_DEBUG or RTS_INTERNAL is defined. Otherwise + All these macros are defined if RTS_DEBUG is defined. Otherwise all of them (with the exception of DCHECK and DCHECK_MSG) will be removed. */ ///@{ @@ -57,7 +57,7 @@ returns false. The user will then have the choice of aborting the program, continuing once or continuing with completely ignoring that specific assertion. - Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined. + Assertions are completely removed if RTS_DEBUG is not defined. \param expr expression, trigger assert window if false */ @@ -73,7 +73,7 @@ \endcode For more information see the \ref debug_stream page. - Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined. + Assertions are completely removed if RTS_DEBUG is not defined. \param expr expression, trigger assert window if false \param msg custom message stream, see \ref debug_stream @@ -282,7 +282,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return; ///@} -#elif defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#elif defined(RTS_DEBUG) #define DASSERT(expr) \ ((void)( Debug::SkipNext() || \ diff --git a/Generals/Code/GameEngine/Include/Common/AsciiString.h b/Generals/Code/GameEngine/Include/Common/AsciiString.h index fcfb049f52..bc0ed31b03 100644 --- a/Generals/Code/GameEngine/Include/Common/AsciiString.h +++ b/Generals/Code/GameEngine/Include/Common/AsciiString.h @@ -89,7 +89,7 @@ class AsciiString // add a ctor/dtor, 'cuz they won't ever be called. struct AsciiStringData { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) const char* m_debugptr; // just makes it easier to read in the debugger #endif unsigned short m_refCount; // reference count diff --git a/Generals/Code/GameEngine/Include/Common/Debug.h b/Generals/Code/GameEngine/Include/Common/Debug.h index 829946295e..cccbd38200 100644 --- a/Generals/Code/GameEngine/Include/Common/Debug.h +++ b/Generals/Code/GameEngine/Include/Common/Debug.h @@ -64,7 +64,7 @@ class AsciiString; //#define DISABLE_DEBUG_LOGGING // by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on. -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS) +#if defined(RTS_DEBUG) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS) #define ALLOW_DEBUG_UTILS 1 #elif defined(DEBUG_LOGGING) || defined(DEBUG_CRASHING) || defined(DEBUG_STACKTRACE) || defined(DEBUG_PROFILE) // TheSuperHackers @tweak also turn on when any of the above options is already set. diff --git a/Generals/Code/GameEngine/Include/Common/DrawModule.h b/Generals/Code/GameEngine/Include/Common/DrawModule.h index 152b137d63..edb9142235 100644 --- a/Generals/Code/GameEngine/Include/Common/DrawModule.h +++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h @@ -77,7 +77,7 @@ class DrawModule : public DrawableModule virtual void releaseShadows(void) = 0; ///< frees all shadow resources used by this module - used by Options screen. virtual void allocateShadows(void) = 0; ///< create shadow resources if not already present. Used by Options screen. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void getRenderCost(RenderCost & rc) const { }; ///< estimates the render cost of this draw module #endif diff --git a/Generals/Code/GameEngine/Include/Common/GameAudio.h b/Generals/Code/GameEngine/Include/Common/GameAudio.h index 9897b6a45c..1e73606c11 100644 --- a/Generals/Code/GameEngine/Include/Common/GameAudio.h +++ b/Generals/Code/GameEngine/Include/Common/GameAudio.h @@ -136,7 +136,7 @@ class AudioManager : public SubsystemInterface public: AudioManager(); virtual ~AudioManager(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0; #endif @@ -375,7 +375,7 @@ class AudioManager : public SubsystemInterface // AudioManager that does nothing. Used for Headless Mode. class AudioManagerDummy : public AudioManager { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {} #endif virtual void stopAudio(AudioAffect which) {} diff --git a/Generals/Code/GameEngine/Include/Common/GameCommon.h b/Generals/Code/GameEngine/Include/Common/GameCommon.h index 54c6145432..32f7bd8fde 100644 --- a/Generals/Code/GameEngine/Include/Common/GameCommon.h +++ b/Generals/Code/GameEngine/Include/Common/GameCommon.h @@ -54,7 +54,7 @@ #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) #define NO_DUMP_PERF_STATS #else #define NO_DUMP_PERF_STATS diff --git a/Generals/Code/GameEngine/Include/Common/GameMemory.h b/Generals/Code/GameEngine/Include/Common/GameMemory.h index 21d41e7730..8f6bcff89d 100644 --- a/Generals/Code/GameEngine/Include/Common/GameMemory.h +++ b/Generals/Code/GameEngine/Include/Common/GameMemory.h @@ -53,12 +53,12 @@ #define DISABLE_MEMORYPOOL_CHECKPOINTING 1 #endif -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW) +#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW) #define MEMORYPOOL_DEBUG_CUSTOM_NEW #endif -//#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) -#if (defined(RTS_DEBUG)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) +//#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) +#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) #define MEMORYPOOL_DEBUG #endif diff --git a/Generals/Code/GameEngine/Include/Common/Geometry.h b/Generals/Code/GameEngine/Include/Common/Geometry.h index 3d6874a321..ff60a5e12d 100644 --- a/Generals/Code/GameEngine/Include/Common/Geometry.h +++ b/Generals/Code/GameEngine/Include/Common/Geometry.h @@ -67,7 +67,7 @@ static const char *GeometryNames[] = #endif // end DEFINE_GEOMETRY_NAMES //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) enum ExtentModType CPP_11(: Int) { EXTENTMOD_INVALID = 0, @@ -188,7 +188,7 @@ class GeometryInfo : public Snapshot // given an object with this geom, SET how far above the object's canonical position its max z should extend. void setMaxHeightAbovePosition(Real z); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void tweakExtents(ExtentModType extentModType, Real extentModAmount); AsciiString getDescriptiveString() const; #endif diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h index 6bc24acb76..e1f28e6d37 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -236,7 +236,7 @@ class GameMessage : public MemoryPoolObject MSG_META_CHAT_EVERYONE, ///< send chat msg to everyone (incl. observers) MSG_META_DIPLOMACY, ///< bring up diplomacy screen MSG_META_OPTIONS, ///< bring up options screen -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) MSG_META_HELP, ///< bring up help screen #endif @@ -274,7 +274,7 @@ class GameMessage : public MemoryPoolObject // META items that are really for debug/demo/development use only... // They do not get built into RELEASE builds. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS, ///< Toggles showing units behind buildings or not MSG_META_DEMO_TOGGLE_LETTERBOX, ///< enable/disable letterbox mode MSG_META_DEMO_TOGGLE_MESSAGE_TEXT, ///< toggle the text from the UI messages @@ -388,11 +388,11 @@ class GameMessage : public MemoryPoolObject MSG_META_DEBUG_WIN, ///< Instant Win MSG_META_DEMO_TOGGLE_DEBUG_STATS, ///< show/hide the debug stats /// @todo END section to REMOVE (not disable) for release -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) MSG_META_DEMO_TOGGLE_AUDIODEBUG, ///< show/hide the audio debug info -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS MSG_META_DEMO_PERFORM_STATISTICAL_DUMP, ///< dump performance stats for this frame to StatisticsDump.txt #endif//DUMP_PERF_STATS @@ -565,7 +565,7 @@ class GameMessage : public MemoryPoolObject MSG_BEGIN_DEBUG_NETWORK_MESSAGES = 1900, ///< network messages that exist only in debug/internal builds. all grouped separately. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // all debug/internal-only messages must go here. MSG_DEBUG_KILL_SELECTION, MSG_DEBUG_HURT_OBJECT, diff --git a/Generals/Code/GameEngine/Include/Common/PerfTimer.h b/Generals/Code/GameEngine/Include/Common/PerfTimer.h index fee64c7509..946c69f428 100644 --- a/Generals/Code/GameEngine/Include/Common/PerfTimer.h +++ b/Generals/Code/GameEngine/Include/Common/PerfTimer.h @@ -33,7 +33,7 @@ #include "Utility/intrin_compat.h" -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /* NOTE NOTE NOTE: never check this in with this enabled, since there is a nonzero time penalty for running in this mode. Only enable it for local builds for testing purposes! (srj) diff --git a/Generals/Code/GameEngine/Include/Common/Player.h b/Generals/Code/GameEngine/Include/Common/Player.h index 2011a247ea..235e1ce04a 100644 --- a/Generals/Code/GameEngine/Include/Common/Player.h +++ b/Generals/Code/GameEngine/Include/Common/Player.h @@ -307,7 +307,7 @@ class Player : public Snapshot void onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate ); ///< An upgrade just finished, do things like tell all objects to recheck UpgradeModules void onUpgradeRemoved(){} ///< An upgrade just got removed, this doesn't do anything now. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /// Prereq disabling cheat key void toggleIgnorePrereqs(){ m_DEMO_ignorePrereqs = !m_DEMO_ignorePrereqs; } Bool ignoresPrereqs() const { return m_DEMO_ignorePrereqs; } @@ -767,7 +767,7 @@ class Player : public Snapshot Real m_cashBountyPercent; /// @todo REMOVE (not disable) these cheat keys -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_DEMO_ignorePrereqs; ///< Can I ignore prereq checks? Bool m_DEMO_freeBuild; ///< Can I build everything for no money? Bool m_DEMO_instantBuild; ///< Can I build anything in one frame? diff --git a/Generals/Code/GameEngine/Include/Common/Recorder.h b/Generals/Code/GameEngine/Include/Common/Recorder.h index 7663b8dc91..cc5d193bab 100644 --- a/Generals/Code/GameEngine/Include/Common/Recorder.h +++ b/Generals/Code/GameEngine/Include/Common/Recorder.h @@ -78,7 +78,7 @@ class RecorderClass : public SubsystemInterface { UnsignedInt getPlaybackFrameCount() const { return m_playbackFrameCount; } ///< valid during playback only void stopPlayback(); ///< Stops playback. Its fine to call this even if not playing back a file. Bool simulateReplay(AsciiString filename); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool analyzeReplay( AsciiString filename ); #endif Bool isPlaybackInProgress() const; diff --git a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h index e3a933b502..a2eda17c68 100644 --- a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -36,7 +36,7 @@ #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #define SPARSEMATCH_DEBUG #else #undef SPARSEMATCH_DEBUG diff --git a/Generals/Code/GameEngine/Include/Common/StackDump.h b/Generals/Code/GameEngine/Include/Common/StackDump.h index 2a6b040ab6..c19680f461 100644 --- a/Generals/Code/GameEngine/Include/Common/StackDump.h +++ b/Generals/Code/GameEngine/Include/Common/StackDump.h @@ -31,7 +31,7 @@ #define IG_DEBUG_STACKTRACE 1 #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE) +#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE) // Writes a stackdump (provide a callback : gets called per line) // If callback is NULL then will write using OuputDebugString diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h index 96437e730a..7c138b03f7 100644 --- a/Generals/Code/GameEngine/Include/Common/StateMachine.h +++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h @@ -325,7 +325,7 @@ class StateMachine : public MemoryPoolObject, public Snapshot // StateReturnType internalSetState( StateID newStateID ); ///< for internal use only - change the current state of the machine -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnsignedInt peekSleepTill() const { return m_sleepTill; } #endif diff --git a/Generals/Code/GameEngine/Include/Common/Thing.h b/Generals/Code/GameEngine/Include/Common/Thing.h index 995b3e1e1c..0cc9119fc8 100644 --- a/Generals/Code/GameEngine/Include/Common/Thing.h +++ b/Generals/Code/GameEngine/Include/Common/Thing.h @@ -161,7 +161,7 @@ class Thing : public MemoryPoolObject // since ThingTemplates are shared between many, many Things, the Thing // should never be able to change it. OVERRIDE m_template; ///< reference back to template database -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) AsciiString m_templateName; #endif /* diff --git a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h index 38c88874d7..4b123c6573 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h @@ -286,7 +286,7 @@ class ModuleInfo return m_info.size(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool containsPartialName(const char* n) const { for (size_t i = 0; i < m_info.size(); i++) diff --git a/Generals/Code/GameEngine/Include/Common/UnicodeString.h b/Generals/Code/GameEngine/Include/Common/UnicodeString.h index 5f15a0e046..e455f71ba6 100644 --- a/Generals/Code/GameEngine/Include/Common/UnicodeString.h +++ b/Generals/Code/GameEngine/Include/Common/UnicodeString.h @@ -89,7 +89,7 @@ class UnicodeString // add a ctor/dtor, 'cuz they won't ever be called. struct UnicodeStringData { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) const WideChar* m_debugptr; // just makes it easier to read in the debugger #endif unsigned short m_refCount; // reference count diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index 47e96c62fc..ff4a2b2a99 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -1007,7 +1007,7 @@ class ControlBar : public SubsystemInterface Int m_remainingRadarAttackGlowFrames; GameWindow *m_radarAttackGlowWindow; -#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG ) +#if defined(RTS_DEBUG) UnsignedInt m_lastFrameMarkedDirty; UnsignedInt m_consecutiveDirtyFrames; #endif diff --git a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h index c156b900b9..39e4f70624 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -142,7 +142,7 @@ class DebugDisplay : public DebugDisplayInterface // displayers -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp ); #endif diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h index 1a873ce8e6..162909b6c4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Display.h +++ b/Generals/Code/GameEngine/Include/GameClient/Display.h @@ -92,7 +92,7 @@ class Display : public SubsystemInterface virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate) {}; virtual Bool testMinSpecRequirements(Bool *videoPassed, Bool *cpuPassed, Bool *memPassed,StaticGameLODLevel *idealVideoLevel=NULL, Real *cpuTime=NULL) {*videoPassed=*cpuPassed=*memPassed=true; return true;} virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) = 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void dumpAssetUsage(const char* mapname) = 0; #endif @@ -163,7 +163,7 @@ class Display : public SubsystemInterface virtual void clearShroud() = 0; ///< empty the entire shroud virtual void setBorderShroudLevel(UnsignedByte level) = 0; ///m_preloadAssets = TRUE; @@ -660,7 +660,7 @@ Int parsePreload( char *args[], int num ) #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseDisplayDebug(char *args[], int) { TheWritableGlobalData->m_displayDebug = TRUE; @@ -706,7 +706,7 @@ Int parseVTune ( char *args[], int num ) } /// end stuff for VTUNE -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) //============================================================================= //============================================================================= @@ -718,7 +718,7 @@ Int parseNoFX(char *args[], int) return 1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseNoShroud(char *args[], int) { TheWritableGlobalData->m_shroudOn = FALSE; @@ -741,7 +741,7 @@ Int parseNoMoveCamera(char *args[], int) return 1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseNoCinematic(char *args[], int) { TheWritableGlobalData->m_disableCameraMovement = true; @@ -774,7 +774,7 @@ Int parseNoShaders(char *args[], int) return 1; } -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) Int parseNoLogo(char *args[], int) { TheWritableGlobalData->m_playIntro = FALSE; @@ -817,7 +817,7 @@ Int parseWinCursors(char *args[], int num) Int parseQuickStart( char *args[], int num ) { -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) parseNoLogo( args, num ); #else //Kris: Patch 1.01 -- Allow release builds to skip the sizzle video, but still force the EA logo to show up. @@ -836,7 +836,7 @@ Int parseConstantDebug( char *args[], int num ) return 1; } -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) Int parseExtraLogging( char *args[], int num ) { TheWritableGlobalData->m_extraLogging = TRUE; @@ -863,7 +863,7 @@ Int parseShowTeamDot( char *args[], int num ) } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseSelectAll( char *args[], int num ) { TheWritableGlobalData->m_allowUnselectableSelection = TRUE; @@ -925,7 +925,7 @@ Int parseDemoLoadScreen(char *args[], int num) return 1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseSaveStats(char *args[], int num) { if (num > 1) @@ -937,7 +937,7 @@ Int parseSaveStats(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseSaveAllStats(char *args[], int num) { if (num > 1) @@ -950,7 +950,7 @@ Int parseSaveAllStats(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseLocalMOTD(char *args[], int num) { if (num > 1) @@ -962,7 +962,7 @@ Int parseLocalMOTD(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseCameraDebug(char *args[], int num) { TheWritableGlobalData->m_debugCamera = TRUE; @@ -971,7 +971,7 @@ Int parseCameraDebug(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseBenchmark(char *args[], int num) { if (num > 1) @@ -983,7 +983,7 @@ Int parseBenchmark(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS Int parseStats(char *args[], int num) { @@ -1174,7 +1174,7 @@ static CommandLineParam paramsForEngineInit[] = { "-quickstart", parseQuickStart }, { "-useWaveEditor", parseUseWaveEditor }, -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) { "-noaudio", parseNoAudio }, { "-map", parseMapName }, { "-nomusic", parseNoMusic }, @@ -1239,7 +1239,7 @@ static CommandLineParam paramsForEngineInit[] = // Number of frames between each CRC that is written to replay files in singleplayer games. { "-ReplayCRCInterval", parseReplayCRCInterval }, #endif -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) { "-saveAllStats", parseSaveAllStats }, { "-noDraw", parseNoDraw }, { "-nomilcap", parseNoMilCap }, @@ -1315,7 +1315,7 @@ static CommandLineParam paramsForEngineInit[] = //-allAdvice feature //{ "-allAdvice", parseAllAdvice }, -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) { "-preload", parsePreload }, #endif diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp index 0e4745c652..a97c1b1949 100644 --- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp @@ -306,7 +306,7 @@ void GameEngine::init() serviceWindowsOS(); - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) // If we're in Debug or Internal, load the Debug info as well. ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_OVERWRITE, NULL ); #endif @@ -385,7 +385,7 @@ void GameEngine::init() TheMetaMap->generateMetaMap(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ini.load("Data\\INI\\CommandMapDebug.ini", INI_LOAD_MULTIFILE, NULL); #endif @@ -607,7 +607,7 @@ void GameEngine::execute( void ) { DWORD prevTime = timeGetTime(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DWORD startTime = timeGetTime() / 1000; #endif @@ -624,7 +624,7 @@ void GameEngine::execute( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) { // enter only if in benchmark mode if (TheGlobalData->m_benchmarkTimer > 0) @@ -682,7 +682,7 @@ void GameEngine::execute( void ) // I'm disabling this in internal because many people need alt-tab capability. If you happen to be // doing performance tuning, please just change this on your local system. -MDC - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) ::Sleep(1); // give everyone else a tiny time slice. #endif diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index 6ee1ad6464..d6d0805caa 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -342,7 +342,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_META_CHAT_EVERYONE) CHECK_IF(MSG_META_DIPLOMACY) CHECK_IF(MSG_META_OPTIONS) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CHECK_IF(MSG_META_HELP) #endif CHECK_IF(MSG_META_TOGGLE_LOWER_DETAILS) @@ -375,7 +375,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_META_TOGGLE_PAUSE) CHECK_IF(MSG_META_STEP_FRAME) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CHECK_IF(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) CHECK_IF(MSG_META_DEMO_TOGGLE_LETTERBOX) CHECK_IF(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT) @@ -484,12 +484,12 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS) CHECK_IF(MSG_META_DEBUG_WIN) CHECK_IF(MSG_META_DEMO_TOGGLE_DEBUG_STATS) -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) CHECK_IF(MSG_META_DEMO_TOGGLE_AUDIODEBUG) -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS CHECK_IF(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) #endif//DUMP_PERF_STATS @@ -631,7 +631,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_SELF_DESTRUCT) CHECK_IF(MSG_CREATE_FORMATION) CHECK_IF(MSG_LOGIC_CRC) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CHECK_IF(MSG_DEBUG_KILL_SELECTION) CHECK_IF(MSG_DEBUG_HURT_OBJECT) CHECK_IF(MSG_DEBUG_KILL_OBJECT) @@ -962,7 +962,7 @@ void MessageStream::removeTranslator( TranslatorID id ) // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool isInvalidDebugCommand( GameMessage::Type t ) { @@ -1051,7 +1051,7 @@ void MessageStream::propagateMessages( void ) for( msg=m_firstMessage; msg; msg=next ) { if (ss->m_translator -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) && !isInvalidDebugCommand(msg->getType()) #endif ) diff --git a/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp b/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp index 639a6c5ab3..917dd08491 100644 --- a/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp +++ b/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp @@ -145,7 +145,7 @@ NameKeyType NameKeyGenerator::nameToKey(const char* nameString) NameKeyType result = b->m_key; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // reality-check to be sure our hasher isn't going bad. const Int maxThresh = 3; Int numOverThresh = 0; @@ -193,7 +193,7 @@ NameKeyType NameKeyGenerator::nameToLowercaseKey(const char* nameString) NameKeyType result = b->m_key; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // reality-check to be sure our hasher isn't going bad. const Int maxThresh = 3; Int numOverThresh = 0; diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp index 711e596260..bb86de4203 100644 --- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -512,7 +512,7 @@ void PerfTimer::outputInfo( void ) return; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec; double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1); double avgTimePerCall = totalTimeInMS / m_callCount; @@ -550,7 +550,7 @@ void PerfTimer::outputInfo( void ) //------------------------------------------------------------------------------------------------- void PerfTimer::showMetrics( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec; double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1); double avgTimePerCall = totalTimeInMS / m_callCount; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 0bc6767495..c2018e2bfa 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -425,7 +425,7 @@ void Player::init(const PlayerTemplate* pt) m_unitsShouldHunt = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_DEMO_ignorePrereqs = FALSE; m_DEMO_freeBuild = FALSE; m_DEMO_instantBuild = FALSE; @@ -2453,7 +2453,7 @@ Bool Player::canBuild(const ThingTemplate *tmplate) const prereqsOK = false; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (ignoresPrereqs()) prereqsOK = true; #endif diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp index 3ecf2981a5..ca0b7ca5fd 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -88,7 +88,7 @@ void RecorderClass::logGameStart(AsciiString options) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheNetwork && TheGlobalData->m_saveStats) { //if (TheLAN) @@ -149,7 +149,7 @@ void RecorderClass::logPlayerDisconnect(UnicodeString player, Int slot) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { unsigned long bufSize = MAX_COMPUTERNAME_LENGTH + 1; @@ -194,7 +194,7 @@ void RecorderClass::logCRCMismatch( void ) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { m_wasDesync = TRUE; @@ -249,7 +249,7 @@ void RecorderClass::logGameEnd( void ) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheNetwork && TheGlobalData->m_saveStats) { //if (TheLAN) @@ -280,7 +280,7 @@ void RecorderClass::logGameEnd( void ) void RecorderClass::cleanUpReplayFile( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { char fname[_MAX_PATH+1]; @@ -919,7 +919,7 @@ Bool RecorderClass::simulateReplay(AsciiString filename) return success; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool RecorderClass::analyzeReplay( AsciiString filename ) { m_doingAnalysis = TRUE; @@ -1583,7 +1583,7 @@ AsciiString RecorderClass::getReplayExtention() { */ AsciiString RecorderClass::getLastReplayFileName() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheNetwork && TheGlobalData->m_saveStats) { GameInfo *game = NULL; diff --git a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp index ed8acf1492..26ffa4ef19 100644 --- a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -108,7 +108,7 @@ void StatsCollector::reset( void ) { // make sure we have a stats Dir. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { AsciiString playtestDir = TheGlobalData->m_baseStatsDir; @@ -254,7 +254,7 @@ void StatsCollector::writeFileEnd( void ) fprintf(f, "===================================================\n"); fprintf(f, "* Times are in Game Seconds which are based off of frames. Current fps is set to %d\n", LOGICFRAMES_PER_SECOND); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_benchmarkTimer > 0) { fprintf(f, "\n*** BENCHMARK MODE STATS ***\n"); @@ -322,7 +322,7 @@ void StatsCollector::createFileName( void ) name.removeLastChar(); // m name.removeLastChar(); // . m_statsFileName.clear(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { m_statsFileName.set(TheGlobalData->m_baseStatsDir); diff --git a/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp b/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp index 743b493357..6f639e18ef 100644 --- a/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp @@ -145,7 +145,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData AsciiStringData* newData = (AsciiStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_AsciiString::ensureUniqueBufferOfSize"); newData->m_refCount = 1; newData->m_numCharsAllocated = (actualBytes - sizeof(AsciiStringData))/sizeof(char); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) newData->m_debugptr = newData->peek(); // just makes it easier to read in the debugger #endif diff --git a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp index a6ddb22718..c5d7ec915d 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp @@ -732,7 +732,7 @@ void ReleaseCrash(const char *reason) } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /* static */ char buff[8192]; // not so static so we can be threadsafe snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason); ::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR); diff --git a/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp b/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp index b7ee51728f..c93c30f32e 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp @@ -513,7 +513,7 @@ void GeometryInfo::calcBoundingStuff() }; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //============================================================================= void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmount) { @@ -537,7 +537,7 @@ void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmoun } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //============================================================================= AsciiString GeometryInfo::getDescriptiveString() const { diff --git a/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp b/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp index 1c0a319e14..d12b14dedf 100644 --- a/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp @@ -24,7 +24,7 @@ #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE) +#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE) #pragma pack(push, 8) diff --git a/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp index 04afddd18a..b08523232d 100644 --- a/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp @@ -96,7 +96,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa UnicodeStringData* newData = (UnicodeStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_UnicodeString::ensureUniqueBufferOfSize"); newData->m_refCount = 1; newData->m_numCharsAllocated = (actualBytes - sizeof(UnicodeStringData))/sizeof(WideChar); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) newData->m_debugptr = newData->peek(); // just makes it easier to read in the debugger #endif diff --git a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp index 83bb3fe742..c1d6c3f6bf 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -155,7 +155,7 @@ UpgradeTemplate::~UpgradeTemplate( void ) //------------------------------------------------------------------------------------------------- Int UpgradeTemplate::calcTimeToBuild( Player *player ) const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( player->buildsInstantly() ) { return 1; diff --git a/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp b/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp index 72e6208e76..f6157c85d8 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp @@ -63,7 +63,7 @@ Thing::Thing( const ThingTemplate *thingTemplate ) } // end if m_template = thingTemplate; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_templateName = thingTemplate->getName(); #endif m_transform.Make_Identity(); diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp index dcea6c05e4..27d9a79f09 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp @@ -358,7 +358,7 @@ Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatus } // end newDrawableByType -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString TheThingTemplateBeingParsedName; #endif @@ -367,7 +367,7 @@ AsciiString TheThingTemplateBeingParsedName; //------------------------------------------------------------------------------------------------- /*static*/ void ThingFactory::parseObjectDefinition( INI* ini, const AsciiString& name, const AsciiString& reskinFrom ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) TheThingTemplateBeingParsedName = name; #endif @@ -421,7 +421,7 @@ AsciiString TheThingTemplateBeingParsedName; thingTemplate->validate(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) TheThingTemplateBeingParsedName.clear(); #endif } diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp index 14f186d8c5..bfa6a90533 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp @@ -294,7 +294,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate, // there must be a module tag present, and it must be unique across all module infos // for this thing template // -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // get module info const Nugget *nugget; @@ -797,7 +797,7 @@ void ThingTemplate::parseArmorTemplateSet( INI* ini, void *instance, void * /*st ArmorTemplateSet ws; ws.parseArmorTemplateSet(ini); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES) { for (ArmorTemplateSetVector::const_iterator it = self->m_armorTemplateSets.begin(); it != self->m_armorTemplateSets.end(); ++it) @@ -825,7 +825,7 @@ void ThingTemplate::parseWeaponTemplateSet( INI* ini, void *instance, void * /*s WeaponTemplateSet ws; ws.parseWeaponTemplateSet(ini, self); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES) { for (WeaponTemplateSetVector::const_iterator it = self->m_weaponTemplateSets.begin(); it != self->m_weaponTemplateSets.end(); ++it) @@ -920,7 +920,7 @@ AIUpdateModuleData *ThingTemplate::friend_getAIModuleInfo(void) //------------------------------------------------------------------------------------------------- void ThingTemplate::validateAudio() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #define AUDIO_TEST(y) \ if (!get##y()->getEventName().isEmpty() && get##y()->getEventName().compareNoCase("NoSound") != 0) { \ @@ -1014,7 +1014,7 @@ void ThingTemplate::validate() validateAudio(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (getName() == "DefaultThingTemplate") return; @@ -1394,7 +1394,7 @@ Int ThingTemplate::calcTimeToBuild( const Player* player) const Real factionModifier = 1 + player->getProductionTimeChangePercent( getName() ); buildTime *= factionModifier; -#if defined (RTS_DEBUG) || defined (RTS_INTERNAL) +#if defined(RTS_DEBUG) if( player->buildsInstantly() ) { buildTime = 1; diff --git a/Generals/Code/GameEngine/Source/Common/version.cpp b/Generals/Code/GameEngine/Source/Common/version.cpp index fb77214457..71239231f3 100644 --- a/Generals/Code/GameEngine/Source/Common/version.cpp +++ b/Generals/Code/GameEngine/Source/Common/version.cpp @@ -41,7 +41,7 @@ Version::Version() m_localBuildNum = 0; m_buildUser = AsciiString("somebody"); m_buildLocation = AsciiString("somewhere"); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) m_showFullVersion = TRUE; #else m_showFullVersion = FALSE; @@ -70,15 +70,15 @@ UnsignedInt Version::getVersionNumber( void ) AsciiString Version::getAsciiVersion( void ) { AsciiString version; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (m_localBuildNum) version.format("%d.%d.%d.%d%c%c", m_major, m_minor, m_buildNum, m_localBuildNum, m_buildUser.getCharAt(0), m_buildUser.getCharAt(1)); else version.format("%d.%d.%d", m_major, m_minor, m_buildNum); -#else // defined RTS_DEBUG || defined RTS_INTERNAL +#else // defined(RTS_DEBUG) version.format("%d.%d", m_major, m_minor); -#endif // defined RTS_DEBUG || defined RTS_INTERNAL +#endif // defined(RTS_DEBUG) return version; } @@ -87,15 +87,15 @@ UnicodeString Version::getUnicodeVersion( void ) { UnicodeString version; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (!m_localBuildNum) version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum); else version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum, m_buildUser.getCharAt(0), m_buildUser.getCharAt(1)); -#else // defined RTS_DEBUG || defined RTS_INTERNAL +#else // defined(RTS_DEBUG) version.format(TheGameText->fetch("Version:Format2").str(), m_major, m_minor); -#endif // defined RTS_DEBUG || defined RTS_INTERNAL +#endif // defined(RTS_DEBUG) #ifdef RTS_DEBUG version.concat(UnicodeString(L" Debug")); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index f75a2c1bf9..392d79493a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -133,7 +133,7 @@ void ControlBar::markUIDirty( void ) { m_UIDirty = TRUE; -#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG ) +#if defined(RTS_DEBUG) UnsignedInt now = TheGameLogic->getFrame(); if( now == m_lastFrameMarkedDirty ) { @@ -933,7 +933,7 @@ ControlBar::ControlBar( void ) m_remainingRadarAttackGlowFrames = 0; m_radarAttackGlowWindow = NULL; -#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG ) +#if defined(RTS_DEBUG) m_lastFrameMarkedDirty = 0; m_consecutiveDirtyFrames = 0; #endif diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index 18230d6110..450240907d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -216,7 +216,7 @@ static void playerTooltip(GameWindow *window, } UnicodeString tooltip; tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str()); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnicodeString ip; ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP())); tooltip.concat(ip); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp index 246a8505d7..32aac39e5d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp @@ -312,7 +312,7 @@ static void playerTooltip(GameWindow *window, } UnicodeString tooltip; tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str()); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnicodeString ip; ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP())); tooltip.concat(ip); @@ -405,7 +405,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData ) { IPSource = L"Default local IP"; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnicodeString str; str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP)); GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index 6aa50ed99e..c3b063307e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -93,7 +93,7 @@ enum static Bool raiseMessageBoxes = TRUE; static Bool campaignSelected = FALSE; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) static NameKeyType campaignID = NAMEKEY_INVALID; static GameWindow *buttonCampaign = NULL; #ifdef TEST_COMPRESSION @@ -512,7 +512,7 @@ void MainMenuInit( WindowLayout *layout, void *userData ) showSelectiveButtons(SHOW_NONE); // Set up the version number -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) WinInstanceData instData; #ifdef TEST_COMPRESSION instData.init(); @@ -1233,7 +1233,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, if(buttonPushed) break; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if( control == buttonCampaign ) { buttonPushed = TRUE; @@ -1429,7 +1429,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, else if( controlID == exitID ) { // If we ever want to add a dialog before we exit out of the game, uncomment this line and kill the quitCallback() line below. -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) //Added By Sadullah Nader //Changed the preprocessing code to normal code diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp index 77fe4a1ff5..c3ddc3041e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp @@ -70,7 +70,7 @@ static Int initialGadgetDelay = 2; static Bool justEntered = FALSE; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) static GameWindow *buttonAnalyzeReplay = NULL; #endif @@ -354,7 +354,7 @@ void ReplayMenuInit( WindowLayout *layout, void *userData ) GadgetListBoxReset(listboxReplayFiles); PopulateReplayFileListbox(listboxReplayFiles); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) WinInstanceData instData; instData.init(); BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK ); @@ -610,7 +610,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg, GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if( controlID == buttonAnalyzeReplay->winGetWindowId() ) { if(listboxReplayFiles) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 2a5313e3ef..e9838fafda 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -418,7 +418,7 @@ static MessageBoxReturnType cancelStartBecauseOfNoCD( void *userData ) Bool IsFirstCDPresent(void) { -#if !defined(RTS_INTERNAL) && !defined(RTS_DEBUG) +#if !defined(RTS_DEBUG) return TheFileSystem->areMusicFilesOnCD(); #else return TRUE; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index e71dcb1db5..302abe11ec 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -70,7 +70,7 @@ extern std::list TheLobbyQueuedUTMs; extern void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) extern Bool g_debugSlots; void slotListDebugLog(const char *fmt, ...) { @@ -1781,7 +1781,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData) case PeerResponse::PEERRESPONSE_ROOMUTM: { sawImportantMessage = TRUE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (g_debugSlots) { DEBUG_LOG(("About to process a room UTM. Command is '%s', command options is '%s'\n", @@ -2335,7 +2335,7 @@ Bool handleGameSetupSlashCommands(UnicodeString uText) TheGameSpyInfo->sendChat(UnicodeString(uText.str()+4), TRUE, NULL); return TRUE; // was a slash command } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) else if (token == "slots") { g_debugSlots = !g_debugSlots; @@ -2349,7 +2349,7 @@ Bool handleGameSetupSlashCommands(UnicodeString uText) TheGameSpyPeerMessageQueue->addRequest( req ); return TRUE; } -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) return FALSE; // not a slash command } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp index e7ef96d9e7..27a74906ac 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp @@ -128,7 +128,7 @@ static Int groupRoomToJoin = 0; static Int initialGadgetDelay = 2; static Bool justEntered = FALSE; -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) Bool g_fakeCRC = FALSE; Bool g_debugSlots = FALSE; #endif @@ -197,7 +197,7 @@ Bool handleLobbySlashCommands(UnicodeString uText) return TRUE; // was a slash command } */ -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) else if (token == "fakecrc") { g_fakeCRC = !g_fakeCRC; @@ -1552,7 +1552,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, { // bad crc. don't go. DEBUG_LOG(("WOLLobbyMenuSystem - CRC mismatch with the game I'm trying to join. My CRC's - EXE:0x%08X INI:0x%08X Their CRC's - EXE:0x%08x INI:0x%08x\n", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC, roomToJoin->getExeCRC(), roomToJoin->getIniCRC())); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_netMinPlayers) { GSMessageBoxOk(TheGameText->fetch("GUI:JoinFailedDefault"), TheGameText->fetch("GUI:JoinFailedCRCMismatch")); diff --git a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp index 1508354a89..9d639e17da 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -614,7 +614,7 @@ void GameClient::update( void ) if (!freezeTime) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) #else if (true) @@ -645,7 +645,7 @@ void GameClient::update( void ) while (draw) { // update() could free the Drawable, so go ahead and grab 'next' Drawable* next = draw->getNextDrawable(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) #else if (true) @@ -682,7 +682,7 @@ void GameClient::update( void ) } } -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) // need to draw the first frame, then don't draw again until TheGlobalData->m_noDraw if (TheGlobalData->m_noDraw > TheGameLogic->getFrame() && TheGameLogic->getFrame() > 0) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index 60c67155a9..7ae6f28ccf 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -64,7 +64,7 @@ // Externals //---------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool g_useStringFile = TRUE; #endif @@ -165,7 +165,7 @@ class GameTextManager : public GameTextInterface StringInfo *m_stringInfo; StringLookUp *m_stringLUT; Bool m_initialized; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_jabberWockie; Bool m_munkee; #endif @@ -246,7 +246,7 @@ GameTextManager::GameTextManager() m_stringLUT(NULL), m_initialized(FALSE), m_noStringList(NULL), -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_jabberWockie(FALSE), m_munkee(FALSE), m_useStringFile(g_useStringFile), @@ -299,7 +299,7 @@ void GameTextManager::init( void ) m_initialized = TRUE; m_maxLabelLen = 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if(TheGlobalData) { m_jabberWockie = TheGlobalData->m_jabberOn; @@ -703,7 +703,7 @@ void GameTextManager::translateCopy( WideChar *outbuf, Char *inbuf ) { Int slash = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if ( m_jabberWockie ) { static Char buffer[MAX_UITEXT_LENGTH*2]; diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index a980032a9c..99fb712174 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -2176,7 +2176,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg ) } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #define AI_DEBUG_TOOLTIPS 1 #ifdef AI_DEBUG_TOOLTIPS @@ -2185,7 +2185,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg ) #include "GameLogic/AIPathfind.h" #endif // AI_DEBUG_TOOLTIPS -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) //------------------------------------------------------------------------------------------------- /** Details of what is mouse hovered over right now are in this message. Terrain might result @@ -2257,7 +2257,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg ) else m_mousedOverDrawableID = draw->getID(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //Extra hacky, sorry, but I need to use this in constantdebug report +#if defined(RTS_DEBUG) //Extra hacky, sorry, but I need to use this in constantdebug report if ( TheGlobalData->m_constantDebugUpdate == TRUE ) m_mousedOverDrawableID = draw->getID(); #endif @@ -2483,7 +2483,7 @@ void InGameUI::createCommandHint( const GameMessage *msg ) { const Object* obj = draw->getObject(); Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); #else ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); @@ -4839,7 +4839,7 @@ void InGameUI::addFloatingText(const UnicodeString& text,const Coord3D *pos, Col //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) inline Bool isClose(Real a, Real b) { return fabs(a-b) <= 1.0f; } inline Bool isClose(const Coord3D& a, const Coord3D& b) { diff --git a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp index 67d4714ff8..681bc1dfe0 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp @@ -460,7 +460,7 @@ void MapCache::updateCache( void ) writeCacheINI( TRUE ); } loadStandardMaps(); // we shall overwrite info from matching user maps to prevent munkees from getting rowdy :) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheLocalFileSystem->doesFileExist(getMapDir().str())) { // only create the map cache file if "Maps" exist @@ -499,7 +499,7 @@ void MapCache::loadStandardMaps(void) INI ini; AsciiString fname; fname.format("%s\\%s", getMapDir().str(), m_mapCacheName); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) File *fp = TheFileSystem->openFile(fname.str(), File::READ); if (fp != NULL) { @@ -507,7 +507,7 @@ void MapCache::loadStandardMaps(void) fp = NULL; #endif ini.load( fname, INI_LOAD_OVERWRITE, NULL ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) } #endif } diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 1d2324140d..26d5f27eb7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -88,7 +88,7 @@ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /*non-static*/ Real TheSkateDistOverride = 0.0f; void countObjects(Object *obj, void *userData) @@ -2203,7 +2203,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage return DESTROY_MESSAGE; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ExtentModType extentModType = EXTENTMOD_INVALID; Real extentModAmount = 0.0f; #endif @@ -3444,7 +3444,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage } // end case GameMessage::MSG_MOUSE_LEFT_CLICK -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //------------------------------------------------------------------------- BEGIN DEMO MESSAGES //------------------------------------------------------------------------- BEGIN DEMO MESSAGES //------------------------------------------------------------------------- BEGIN DEMO MESSAGES @@ -4635,11 +4635,11 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //--------------------------------------------------------------------------- END DEMO MESSAGES //--------------------------------------------------------------------------- END DEMO MESSAGES //--------------------------------------------------------------------------- END DEMO MESSAGES -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) //------------------------------------------------------------------------DEMO MESSAGES //----------------------------------------------------------------------------------------- -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG: { if (TheDisplay->getDebugDisplayCallback() == AudioDebugDisplay) @@ -4650,7 +4650,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage break; } -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS //------------------------------------------------------------------------DEMO MESSAGES diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp index 075d588302..0ddbe1c695 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -337,7 +337,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage m_anchor = msg->getArgument( 0 )->pixel; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // adjust the field of view if (m_isChangingFOV) { @@ -495,7 +495,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage } // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_PITCH: { DEBUG_ASSERTCRASH(!m_isPitching, ("hmm, mismatched m_isPitching")); @@ -503,10 +503,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage disp = DESTROY_MESSAGE; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_END_ADJUST_PITCH: { DEBUG_ASSERTCRASH(m_isPitching, ("hmm, mismatched m_isPitching")); @@ -514,19 +514,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage disp = DESTROY_MESSAGE; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_DESHROUD: { ThePartitionManager->revealMapForPlayerPermanently( ThePlayerList->getLocalPlayer()->getPlayerIndex() ); break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_ENSHROUD: { // Need to first undo the permanent Look laid down by DEMO_DESHROUD, then blast a shroud dollop. @@ -534,10 +534,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage ThePartitionManager->shroudMapForPlayer( ThePlayerList->getLocalPlayer()->getPlayerIndex() ); break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_FOV: { DEBUG_ASSERTCRASH(!m_isChangingFOV, ("hmm, mismatched m_isChangingFOV")); @@ -545,17 +545,17 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage m_anchor = m_currentPos; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_END_ADJUST_FOV: { DEBUG_ASSERTCRASH(m_isChangingFOV, ("hmm, mismatched m_isChangingFOV")); m_isChangingFOV = false; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_SAVE_VIEW1: @@ -599,7 +599,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage } //----------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_LOCK_CAMERA_TO_PLANES: { Drawable *first = NULL; @@ -660,7 +660,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage disp = DESTROY_MESSAGE; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) } // end switch diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp index d5dad6e4ad..6070be9c66 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp @@ -171,7 +171,7 @@ static const LookupListRec GameMessageMetaTypeNames[] = { "TOGGLE_PAUSE", GameMessage::MSG_META_TOGGLE_PAUSE }, { "STEP_FRAME", GameMessage::MSG_META_STEP_FRAME }, -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) { "HELP", GameMessage::MSG_META_HELP }, { "DEMO_INSTANT_QUIT", GameMessage::MSG_META_DEMO_INSTANT_QUIT }, @@ -292,12 +292,12 @@ static const LookupListRec GameMessageMetaTypeNames[] = { "DEBUG_DUMP_ALL_PLAYER_OBJECTS", GameMessage::MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS }, { "DEMO_WIN", GameMessage::MSG_META_DEBUG_WIN }, { "DEMO_TOGGLE_DEBUG_STATS", GameMessage::MSG_META_DEMO_TOGGLE_DEBUG_STATS }, -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) { "DEMO_TOGGLE_AUDIODEBUG", GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG }, -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS { "DEMO_PERFORM_STATISTICAL_DUMP", GameMessage::MSG_META_DEMO_PERFORM_STATISTICAL_DUMP }, #endif//DUMP_PERF_STATS diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index 17e6f43923..cee8bf15c0 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -60,7 +60,7 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) static Bool TheHurtSelectionMode = false; static Bool TheHandOfGodSelectionMode = false; static Bool TheDebugSelectionMode = false; @@ -778,7 +778,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa if (newDrawablesSelected == 1 && draw) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheHandOfGodSelectionMode && draw) { Object* obj = draw->getObject(); @@ -1192,7 +1192,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE: { @@ -1203,7 +1203,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEMO_TOGGLE_HURT_ME_MODE: { @@ -1214,7 +1214,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEMO_DEBUG_SELECTION: { diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp index b09cadd95f..91652bf961 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp @@ -70,7 +70,7 @@ // PRIVATE FUNCTIONS ////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats extern ICoord2D TheMousePos; #endif @@ -213,7 +213,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage { // all window events have the position of the mouse as arg 0 ICoord2D mousePos = msg->getArgument( 0 )->pixel; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats TheMousePos.x = mousePos.x; TheMousePos.y = mousePos.y; #endif diff --git a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp index a905b8d634..a76866bea7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp @@ -337,7 +337,7 @@ void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& outMask) Bool addDrawableToList( Drawable *draw, void *userData ) { PickDrawableStruct *pds = (PickDrawableStruct *) userData; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_allowUnselectableSelection) { pds->drawableListToFill->push_back(draw); return TRUE; diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp index af2862ec9f..40db7ee5ad 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp @@ -105,7 +105,7 @@ static void printFunc( char *text ) // AudioDebugDisplay //============================================================================ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void AudioDebugDisplay ( DebugDisplayInterface *dd, void *, FILE *fp = NULL ) { TheAudio->audioDebugDisplay( dd, NULL, fp ); diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp index c458e3e951..2be019d634 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -534,7 +534,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter return true; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; } #endif }; @@ -564,7 +564,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter return false; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterWithinAttackRange"; } #endif }; @@ -870,7 +870,7 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { // ICK. This really nasty statement is used so that we only initialize this color once. diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index 70dcb88ae0..aa5c15c915 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -335,7 +335,7 @@ void Path::xfer( Xfer *xfer ) xfer->xferBool(&m_blockedByAlly); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -2516,7 +2516,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye DEBUG_LOG(("Time to calculate zones %f, cells %d\n", timeToUpdate, (globalBounds.hi.x-globalBounds.lo.x)*(globalBounds.hi.y-globalBounds.lo.y))); #endif #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI && false) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -2830,7 +2830,7 @@ Bool PathfindLayer::isUnused(void) /** * Draws debug cell info. */ -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) void PathfindLayer::doDebugIcons(void) { if (isUnused()) return; extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -4204,7 +4204,7 @@ void Pathfinder::debugShowSearch( Bool pathFound ) if (!TheGlobalData->m_debugAI) { return; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); // show all explored cells for debugging @@ -5189,7 +5189,7 @@ Bool Pathfinder::queueForPath(ObjectID id) return true; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) void Pathfinder::doDebugIcons(void) { const Int FRAMES_TO_SHOW_OBSTACLES = 100; extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -5440,7 +5440,7 @@ void Pathfinder::processPathfindQueue(void) #endif #endif } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) doDebugIcons(); #endif @@ -6137,7 +6137,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe } // failure - goal cannot be reached -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) #ifdef INTENSE_DEBUG DEBUG_LOG(("internal find path FAILURE...\n")); #endif @@ -6285,7 +6285,7 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi path->optimizeGroundPath( isCrusher, pathDiameter ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -6330,7 +6330,7 @@ Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *go prependCells(path, fromPos, goalCell, true); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -6604,7 +6604,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from, DEBUG_LOG((" time %d msec %d cells", (::GetTickCount()-startTimeMS), cellCount)); DEBUG_LOG((" SUCCESS\n")); #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool show = TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS; if (show) debugShowSearch(true); @@ -6776,7 +6776,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from, #ifdef INTENSE_DEBUG DEBUG_LOG((" FAILURE\n")); #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -7156,7 +7156,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu m_isTunneling = false; // construct and return path Path *path = buildHierachicalPath( from, goalCell ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS; show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS); if (show) { @@ -7191,7 +7191,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu return path; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) #if 0 Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS; show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS); @@ -7358,7 +7358,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu m_isTunneling = false; // construct and return path Path *path = buildHierachicalPath( from, closestCell ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) #if 0 if (TheGlobalData->m_debugAI) { @@ -7392,7 +7392,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu } // failure - goal cannot be reached -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -7799,7 +7799,7 @@ Bool Pathfinder::pathDestination( Object *obj, const LocomotorSet& locomotorSet } } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (closestCell) { debugShowSearch(true); *dest = closestPos; @@ -8351,7 +8351,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid)); DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) debugShowSearch(false); #endif @@ -8399,7 +8399,7 @@ Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask a // cleanup the path by checking line of sight path->optimize(obj, acceptableSurfaces, blocked); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -9737,7 +9737,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj, } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) debugShowSearch(true); #endif @@ -9813,7 +9813,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet // until goal is found. // -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); if (TheGlobalData->m_debugAI) { @@ -9836,7 +9836,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet info.radius = radius; info.considerTransient = blocked; info.acceptableSurfaces = locomotorSet.getValidSurfaces(); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { RGBColor color; color.setFromInt(0); @@ -9924,7 +9924,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet DEBUG_LOG(("patchPath Pathfind failed -- ")); DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { debugShowSearch(true); } @@ -9974,7 +9974,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot } */ if (m_isMapReady == false) return NULL; // Should always be ok. -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Int startTimeMS = ::GetTickCount(); #endif @@ -10164,7 +10164,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot #endif if (show) debugShowSearch(true); - #if defined RTS_DEBUG || defined RTS_INTERNAL + #if defined(RTS_DEBUG) //DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f)); #endif // construct and return path @@ -10220,7 +10220,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot cleanOpenAndClosedLists(); return path; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount)); DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y)); DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); @@ -10243,7 +10243,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor { //CRCDEBUG_LOG(("Pathfinder::findSafePath()\n")); if (m_isMapReady == false) return NULL; // Should always be ok. -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Int startTimeMS = ::GetTickCount(); #endif @@ -10350,7 +10350,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor #endif if (show) debugShowSearch(true); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) //DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f)); #endif // construct and return path @@ -10381,7 +10381,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor TheScriptEngine->AppendDebugMessage("Overflowed Safe path", false); #endif #if 0 -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount)); DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y)); DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp index 8843df1099..24924be21f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp @@ -621,7 +621,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp index 209ad2c428..a90c6141d1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp @@ -668,7 +668,7 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName, Real c = cos(angle); // TheSuperHackers @info helmutbuhler 21/04/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_LOG(("Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c)); DEBUG_LOG(("Offset is %f %f, new is %f, %f \n", offset.x, offset.y, diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp index dd606b0309..92b86efc66 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -848,7 +848,7 @@ AsciiString AIStateMachine::getCurrentStateName(void) const StateReturnType AIStateMachine::updateStateMachine() { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) Bool idle = getOwner()->getAI()->isIdle(); if( !idle && TheGlobalData->m_extraLogging ) DEBUG_LOG( ("%d - %s::update() start - %s", TheGameLogic->getFrame(), getCurrentStateName().str(), getOwner()->getTemplate()->getName().str() ) ); @@ -868,7 +868,7 @@ StateReturnType AIStateMachine::updateStateMachine() if (status==STATE_CONTINUE) { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( !idle && TheGlobalData->m_extraLogging ) DEBUG_LOG( (" - RETURN EARLY STATE_CONTINUE\n") ); #endif @@ -882,7 +882,7 @@ StateReturnType AIStateMachine::updateStateMachine() StateReturnType retType = StateMachine::updateStateMachine(); //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) AsciiString result; if( TheGlobalData->m_extraLogging ) { @@ -4024,7 +4024,7 @@ StateReturnType AIFollowWaypointPathState::update() if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) { if (m_currentWaypoint) { // TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str())); #endif @@ -4101,7 +4101,7 @@ StateReturnType AIFollowWaypointPathState::update() if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) { if (m_currentWaypoint) { // TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str())); #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index d4afcff4dc..95d82a8f76 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -667,7 +667,7 @@ UpdateSleepTime TurretAI::updateTurretAI() { USE_PERF_TIMER(TurretAI) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(!m_enabled || m_turretStateMachine->peekSleepTill() == 0 || m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret")); @@ -726,7 +726,7 @@ UpdateSleepTime TurretAI::updateTurretAI() m_sleepUntil = now + subMachineSleep; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(!m_enabled || m_turretStateMachine->peekSleepTill() == 0 || m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret")); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp index 8b548c9b75..9e15994e1f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp @@ -446,7 +446,7 @@ Bool DumbProjectileBehavior::calcFlightPath(Bool recalcNumSegments) flightCurve.getSegmentPoints( m_flightPathSegments, &m_flightPath ); DEBUG_ASSERTCRASH(m_flightPathSegments == m_flightPath.size(), ("m_flightPathSegments mismatch")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( TheGlobalData->m_debugProjectilePath ) displayFlightPath(); #endif @@ -669,7 +669,7 @@ UpdateSleepTime DumbProjectileBehavior::update() // ------------------------------------------------------------------------------------------------ /** displayFlightPath for debugging */ // ------------------------------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void DumbProjectileBehavior::displayFlightPath() { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp index 45a9ff0409..a65f0a5411 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp @@ -90,7 +90,7 @@ Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex, const Coord3D *targetPos ) { // TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited")); #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 1dde1bf222..20f6b837b3 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -279,7 +279,7 @@ void OpenContain::addToContain( Object *rider ) if( rider == NULL ) return; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( !isValidContainerFor( rider, false ) ) { Object *reportObject = rider; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp index ec326f9fb1..b2aa157e49 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -198,7 +198,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu m_formationID(NO_FORMATION_ID), m_isReceivingDifficultyBonus(FALSE) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_hasDiedAlready = false; #endif //Modules have not been created yet! @@ -492,7 +492,7 @@ void Object::initObject() // Kris -- All missiles must be projectiles! This is the perfect place to assert them! // srj: yes, but only in debug... -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( !isKindOf( KINDOF_PROJECTILE ) ) { if( isKindOf( KINDOF_SMALL_MISSILE ) || isKindOf( KINDOF_BALLISTIC_MISSILE ) ) @@ -3850,7 +3850,7 @@ void Object::xfer( Xfer *xfer ) //m_body; //m_ai; //m_physics; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //m_hasDiedAlready; #endif @@ -4014,7 +4014,7 @@ void Object::onCapture( Player *oldOwner, Player *newOwner ) void Object::onDie( DamageInfo *damageInfo ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(m_hasDiedAlready == false, ("Object::onDie has been called multiple times. This is invalid. jkmcd")); m_hasDiedAlready = true; #endif @@ -4476,7 +4476,7 @@ void Object::unshroud() //------------------------------------------------------------------------------------------------- Real Object::getVisionRange() const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { Vector3 pos(m_visionRange, 0, 0); @@ -4512,7 +4512,7 @@ Real Object::getShroudClearingRange() const shroudClearingRange = getGeometryInfo().getBoundingCircleRadius(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { Vector3 pos(shroudClearingRange, 0, 0); @@ -4569,7 +4569,7 @@ void Object::setShroudClearingRange( Real newShroudClearingRange ) //------------------------------------------------------------------------------------------------- Real Object::getShroudRange() const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { Vector3 pos(m_shroudRange, 0, 0); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index ee8fb1636f..daa02602bd 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -2133,7 +2133,7 @@ void PartitionData::invalidateShroudedStatusForAllPlayers() } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) static AsciiString theObjName; #endif @@ -2143,7 +2143,7 @@ Int PartitionData::calcMaxCoiForShape(GeometryType geom, Real majorRadius, Real Int result; if (isSmall) { - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) Int chk = calcMaxCoiForShape(geom, majorRadius, minorRadius, false); (void)chk; DEBUG_ASSERTCRASH(chk <= 4, ("Small objects should be <= 4 cells, but I calced %s as %d\n",theObjName.str(),chk)); @@ -2192,7 +2192,7 @@ Int PartitionData::calcMaxCoiForObject() Real majorRadius = obj->getGeometryInfo().getMajorRadius(); Real minorRadius = obj->getGeometryInfo().getMinorRadius(); Bool isSmall = obj->getGeometryInfo().getIsSmall(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) theObjName = obj->getTemplate()->getName(); #endif return calcMaxCoiForShape(geom, majorRadius, minorRadius, isSmall); @@ -2778,7 +2778,7 @@ void PartitionManager::update() processPendingUndoShroudRevealQueue(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugThreatMap) { if (TheGameLogic->getFrame() % TheGlobalData->m_debugThreatMapTileDuration) @@ -2838,7 +2838,7 @@ void PartitionManager::update() } } } -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) } // end update //------------------------------------------------------------------------------ @@ -3167,7 +3167,7 @@ void PartitionManager::calcRadiusVec() } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int total = 0; for (Int i = 0; i <= m_maxGcoRadius; ++i) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp index 0c902f45bf..afd2681925 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp @@ -269,7 +269,7 @@ Bool SpecialPowerModule::isModuleForPower( const SpecialPowerTemplate *specialPo //------------------------------------------------------------------------------------------------- Bool SpecialPowerModule::isReady() const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // this is a cheat ... remove this for release! if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) return TRUE; @@ -301,7 +301,7 @@ Bool SpecialPowerModule::isReady() const //------------------------------------------------------------------------------------------------- Real SpecialPowerModule::getPercentReady() const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) return 1.0f; #endif @@ -349,7 +349,7 @@ Real SpecialPowerModule::getPercentReady() const //------------------------------------------------------------------------------------------------- void SpecialPowerModule::startPowerRecharge() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // this is a cheat ... remove this for release! if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) return; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp index 38977d58fd..871f430357 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -131,7 +131,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter public: PartitionFilterHasParkingPlace(ObjectID id) : m_id(id) { } protected: -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; } #endif virtual Bool allow(Object *objOther) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index a42ec56267..6064adfd4d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -862,7 +862,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter PartitionFilterIsValidCarriage(Object* obj, const RailroadBehaviorModuleData* data) : m_obj(obj), m_data(data) { } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; } #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp index c004860d70..9b4f823a72 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp @@ -51,7 +51,7 @@ class PartitionFilterFlammable : public PartitionFilter PartitionFilterFlammable(){ } virtual Bool allow(Object *objOther); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterFlammable"; } #endif }; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 9cafdfb74b..2f758a3b38 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -74,7 +74,7 @@ class PartitionFilterHordeMember : public PartitionFilter PartitionFilterHordeMember(Object* obj, const HordeUpdateModuleData* data) : m_obj(obj), m_data(data) { } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterHordeMember"; } #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp index 123c3f3855..68f8a36261 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp @@ -200,7 +200,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst) //------------------------------------------------------------------------------------------------- Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || m_doorState == DOOR_OPEN, ("door is not fully open when specialpower is fired!")); #endif @@ -246,7 +246,7 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void ) switchToState(m_timeoutState); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || !(m_specialPowerModule->isReady() && m_doorState != DOOR_OPEN), ("door is not fully open when specialpower is ready!")); #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp index 22e6733de2..46b7813894 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp @@ -299,7 +299,7 @@ Real PhysicsBehavior::getZFriction() const void PhysicsBehavior::applyForce( const Coord3D *force ) { // TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n")); #endif if (_isnan(force->x) || _isnan(force->y) || _isnan(force->z)) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp index 542bc31fa8..bd5b9ebad6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp @@ -115,7 +115,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter virtual Bool allow(Object *objOther); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; } #endif }; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp index 208b6feafd..ddf34c16d3 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp @@ -71,7 +71,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter public: PartitionFilterTensileFormationMember( Object* obj ) : m_obj( obj ) { } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; } #endif virtual Bool allow( Object *objOther ) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp index 6f824db51e..3546ba5598 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp @@ -111,7 +111,7 @@ void UpdateModule::xfer( Xfer *xfer ) // extend base class BehaviorModule::xfer( xfer ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /* this is a fix for the following scenario: diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp index c25d0a522f..41b7d41adf 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp @@ -729,7 +729,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) AsciiString targetStr; if( TheGlobalData->m_extraLogging ) { @@ -752,7 +752,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate if (sourceObj == NULL || (victimObj == NULL && victimPos == NULL)) { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("FAIL 1 (sourceObj %d == NULL || (victimObj %d == NULL && victimPos %d == NULL)\n", sourceObj != 0, victimObj != 0, victimPos != 0) ); #endif @@ -831,7 +831,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate //DEBUG_ASSERTCRASH(distSqr < 5*5 || distSqr < attackRangeSqr*1.2f, ("*** victim is out of range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(attackRangeSqr))); //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("FAIL 2 (distSqr %.2f > attackRangeSqr %.2f)\n", distSqr, attackRangeSqr ) ); #endif @@ -853,7 +853,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate DEBUG_ASSERTCRASH(distSqr > minAttackRangeSqr*0.8f, ("*** victim is closer than min attack range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(minAttackRangeSqr))); //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("FAIL 3 (distSqr %.2f< minAttackRangeSqr %.2f - 0.5f && !isProjectileDetonation %d)\n", distSqr, minAttackRangeSqr, isProjectileDetonation ) ); #endif @@ -949,7 +949,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate dealDamageInternal(sourceID, damageID, damagePos, bonus, isProjectileDetonation); //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("EARLY 4 (delayed damage applied now)\n") ); #endif @@ -970,7 +970,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate } //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("EARLY 5 (delaying damage applied until frame %d)\n", when ) ); #endif @@ -1085,7 +1085,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate projectile->setPosition(&projectileDestination); } //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("DONE\n") ); #endif @@ -1569,7 +1569,7 @@ void WeaponStore::postProcessLoad() if (weapon->m_projectileName.isNone()) weapon->m_projectileName.clear(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!weapon->getFireSound().getEventName().isEmpty() && weapon->getFireSound().getEventName().compareNoCase("NoSound") != 0) { DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&weapon->getFireSound()), ("Invalid FireSound %s in Weapon '%s'.", weapon->getFireSound().getEventName().str(), weapon->getName().str())); diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp index a055d86181..a6186d4de6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp @@ -3160,7 +3160,7 @@ void ScriptActions::doMergeTeamIntoTeam(const AsciiString& teamSrcName, const As //------------------------------------------------------------------------------------------------- void ScriptActions::doDisableInput() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_disableScriptedInputDisabling) #endif { @@ -3648,7 +3648,7 @@ void ScriptActions::doUnfreezeTime(void) //------------------------------------------------------------------------------------------------- void ScriptActions::doMilitaryCaption(const AsciiString& briefing, Int duration) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_disableMilitaryCaption) duration = 1; #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index bf26a630e1..8932c45b36 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -5651,7 +5651,7 @@ void ScriptEngine::setCounter( ScriptAction *pAction ) //------------------------------------------------------------------------------------------------- void ScriptEngine::setFade( ScriptAction *pAction ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_disableCameraFade) { m_fade = FADE_NONE; @@ -8612,7 +8612,7 @@ void ScriptEngine::loadPostProcess( void ) } // end loadPostProcess -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) void ScriptEngine::debugVictory( void ) { ScriptAction *action = newInstance(ScriptAction)(ScriptAction::VICTORY); diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index adb932da12..d5a01ea36a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -2367,7 +2367,7 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf pScriptAction->m_actionType = (enum ScriptActionType)file.readInt(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) const ActionTemplate* at = TheScriptEngine->getActionTemplate(pScriptAction->m_actionType); if (at && (at->getName().isEmpty() || (at->getName().compareNoCase("(placeholder)") == 0))) { DEBUG_CRASH(("Invalid Script Action found in script '%s'\n", pScript->getName().str())); diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 6d4b8a5229..8b6c56b855 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -445,7 +445,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) case GameMessage::MSG_CLEAR_GAME_DATA: { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheDisplay && TheGlobalData->m_dumpAssetUsage) TheDisplay->dumpAssetUsage(TheGlobalData->m_mapName.str()); #endif @@ -908,7 +908,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) break; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //--------------------------------------------------------------------------------------------- case GameMessage::MSG_DEBUG_KILL_SELECTION: { @@ -1974,13 +1974,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) if (thisPlayer->isLocalPlayer()) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // don't even put this in release, cause someone might hack it. if (!TheDebugIgnoreSyncErrors) { #endif m_shouldValidateCRCs = TRUE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) } #endif } diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp index ec280ad224..2461eeb70f 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp @@ -206,14 +206,14 @@ void Connection::sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay) { if (ref != NULL) { /* -#if ((defined(RTS_DEBUG)) || (defined(RTS_INTERNAL))) +#if defined(RTS_DEBUG) if (msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) { DEBUG_LOG(("Connection::sendNetCommandMsg - added game command %d to net command list for frame %d.\n", msg->getID(), msg->getExecutionFrame())); } else if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) { DEBUG_LOG(("Connection::sendNetCommandMsg - added frame info for frame %d\n", msg->getExecutionFrame())); } -#endif // RTS_DEBUG || RTS_INTERNAL +#endif // RTS_DEBUG */ ref->setRelay(relay); @@ -371,7 +371,7 @@ NetCommandRef * Connection::processAck(UnsignedShort commandID, UnsignedByte ori return NULL; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool doDebug = FALSE; if (temp->getCommand()->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) { doDebug = TRUE; @@ -384,7 +384,7 @@ NetCommandRef * Connection::processAck(UnsignedShort commandID, UnsignedByte ori m_averageLatency += lat / CONNECTION_LATENCY_HISTORY_LENGTH; m_latencies[index] = lat; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug == TRUE) { DEBUG_LOG(("Connection::processAck - disconnect frame command %d found, removing from command list.\n", commandID)); } @@ -411,7 +411,7 @@ void Connection::doRetryMetrics() { } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void Connection::debugPrintCommands() { NetCommandRef *ref = m_netCommandList->getFirstMessage(); while (ref != NULL) { diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp index db31ab380d..a8bf159a9a 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp @@ -832,14 +832,14 @@ void ConnectionManager::processFrameInfo(NetFrameCommandMsg *msg) { * it doesn't keep resending it. */ void ConnectionManager::processAckStage1(NetCommandMsg *msg) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE; #endif UnsignedByte playerID = msg->getPlayerID(); NetCommandRef *ref = NULL; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug == TRUE) { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processAck - processing ack for command %d from player %d\n", ((NetAckStage1CommandMsg *)msg)->getCommandID(), playerID)); } @@ -1040,7 +1040,7 @@ void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) { } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE; #endif @@ -1050,7 +1050,7 @@ void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) { ackmsg = bothmsg; commandID = bothmsg->getCommandID(); originalPlayerID = bothmsg->getOriginalPlayerID(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug) { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack both for command %d from player %d\n", bothmsg->getCommandID(), bothmsg->getOriginalPlayerID())); } @@ -1060,7 +1060,7 @@ void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) { ackmsg = stage1msg; commandID = stage1msg->getCommandID(); originalPlayerID = stage1msg->getOriginalPlayerID(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug) { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack stage 1 for command %d from player %d\n", stage1msg->getCommandID(), stage1msg->getOriginalPlayerID())); } @@ -2331,7 +2331,7 @@ Int ConnectionManager::getSlotAverageFPS(Int slot) { return m_fpsAverages[slot]; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void ConnectionManager::debugPrintConnectionCommands() { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - begin commands\n")); for (Int i = 0; i < MAX_SLOTS; ++i) { @@ -2363,7 +2363,7 @@ void ConnectionManager::notifyOthersOfCurrentFrame(Int frame) { msg->detach(); DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - start screen on debug stuff\n")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) debugPrintConnectionCommands(); #endif } diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp index 1abd24963d..3c3bed3c0a 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp @@ -575,7 +575,7 @@ void GameSpyStagingRoom::startGame(Int gameID) } } -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) if (numHumans < 2) { launchGame(); @@ -583,7 +583,7 @@ void GameSpyStagingRoom::startGame(Int gameID) TheGameSpyInfo->leaveStagingRoom(); } else -//#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#endif // defined(RTS_DEBUG) { TheNAT = NEW NAT(); TheNAT->attachSlotList(m_slot, getLocalSlotNum(), m_localIP); diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp index 2a6fb008ec..908f56b37e 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp @@ -135,7 +135,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo case L'r': case L'R': remainder.nextToken(&token); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (token.compareNoCase(L"raw") == 0) { // Send raw IRC commands (Ascii only) @@ -149,7 +149,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo } #endif break; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) case L'k': case L'K': remainder.nextToken(&token); @@ -194,7 +194,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo } return true; // show it anyway } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) else if (token.compareNoCase(L"oper") == 0) { // Send raw IRC oper command @@ -245,7 +245,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo return true; // show it anyway } break; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) case L'c': case L'C': remainder.nextToken(&token); @@ -262,7 +262,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo return true; // show it anyway } break; -#endif // RTS_DEBUG || defined RTS_INTERNAL +#endif // RTS_DEBUG } } */ diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp index efe58934a2..1d6214326f 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp @@ -258,7 +258,7 @@ AsciiString GetMessageTypeString(UnsignedInt type) void LANAPI::checkMOTD( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_useLocalMOTD) { // for a playtest, let's log some play statistics, eh? diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp index 4a0f0af0a1..b9a978fcbc 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp @@ -232,7 +232,7 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP ) Bool canJoin = true; // see if the CRCs match -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_netMinPlayers > 0) { #endif if (msg->GameToJoin.iniCRC != TheGlobalData->m_iniCRC || @@ -247,7 +247,7 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP ) reply.GameNotJoined.playerIP = senderIP; canJoin = false; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) } #endif diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp index 224ea73123..feb93ccc69 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp @@ -571,7 +571,7 @@ void NAT::establishConnectionPaths() { } // sanity check -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) for (i = 0; i < m_numNodes; ++i) { DEBUG_ASSERTCRASH(connectionAssigned[i] == TRUE, ("connection number %d not assigned", i)); } diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp index 4e8863cb9c..2f499ff032 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp @@ -147,7 +147,7 @@ class Network : public NetworkInterface void loadProgressComplete( void ); void sendTimeOutGameStart( void ); -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) // Disconnect screen testing virtual void toggleNetworkOn(); #endif @@ -214,7 +214,7 @@ class Network : public NetworkInterface std::list m_playersToDisconnect; GameWindow *m_messageWindow; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_networkOn; #endif }; @@ -274,7 +274,7 @@ Network::Network() m_conMgr = NULL; m_messageWindow = NULL; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_networkOn = TRUE; #endif } @@ -357,7 +357,7 @@ void Network::init() DEBUG_LOG(("FRAMES_TO_KEEP = %d\n", FRAMES_TO_KEEP)); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_networkOn = TRUE; #endif @@ -687,7 +687,7 @@ void Network::update( void ) // m_frameDataReady = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (m_networkOn == FALSE) { return; } @@ -721,7 +721,7 @@ void Network::update( void ) void Network::liteupdate() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (m_networkOn == FALSE) { return; } @@ -745,7 +745,7 @@ void Network::endOfGameCheck() { DEBUG_LOG(("Network::endOfGameCheck - about to show the shell\n")); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) else { m_conMgr->debugPrintConnectionCommands(); } @@ -1007,7 +1007,7 @@ Int Network::getSlotAverageFPS(Int slot) { return -1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void Network::toggleNetworkOn() { if (m_networkOn == TRUE) { m_networkOn = FALSE; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp index 85ef1b713b..2599111bb8 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp @@ -131,7 +131,7 @@ Bool Transport::init( UnsignedInt ip, UnsignedShort port ) { m_outBuffer[i].length = 0; m_inBuffer[i].length = 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_delayedInBuffer[i].message.length = 0; #endif } @@ -149,7 +149,7 @@ Bool Transport::init( UnsignedInt ip, UnsignedShort port ) m_port = port; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_latencyAverage > 0 || TheGlobalData->m_latencyNoise) m_useLatency = true; @@ -245,7 +245,7 @@ Bool Transport::doSend() { } } // for (i=0; iRead(buf, MAX_MESSAGE_LEN, &from)) > 0 ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // Packet loss simulation if (m_usePacketLoss) { @@ -329,7 +329,7 @@ Bool Transport::doRecv() for (int i=0; i SetAsciiString; typedef SetAsciiString::iterator SetAsciiStringIt; SetAsciiString m_allEventsLoaded; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h index 7305c4e073..cf879177e7 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -175,7 +175,7 @@ struct ModelConditionInfo Int m_fxBone; ///< the FX bone for this barrel (zero == no bone) Int m_muzzleFlashBone; ///< the muzzle-flash subobj bone for this barrel (zero == none) Matrix3D m_projectileOffsetMtx; ///< where the projectile fires from -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString m_muzzleFlashBoneName; #endif @@ -190,7 +190,7 @@ struct ModelConditionInfo m_fxBone = 0; m_muzzleFlashBone = 0; m_projectileOffsetMtx.Make_Identity(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) m_muzzleFlashBoneName.clear(); #endif } @@ -199,7 +199,7 @@ struct ModelConditionInfo }; typedef std::vector WeaponBarrelInfoVec; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString m_description; #endif std::vector m_conditionsYesVec; @@ -248,7 +248,7 @@ struct ModelConditionInfo inline Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(m_conditionsYesVec.size() > 0, ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); } inline const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) inline AsciiString getDescription() const { return m_description; } #endif @@ -350,7 +350,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface virtual void releaseShadows(void); ///< frees all shadow resources used by this module - used by Options screen. virtual void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void getRenderCost(RenderCost & rc) const; ///< estimates the render cost of this draw module void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const; #endif @@ -508,7 +508,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface void adjustAnimSpeedToMovementSpeed(); static void hideAllMuzzleFlashes(const ModelConditionInfo* state, RenderObjClass* renderObject); void hideAllHeadlights(Bool hide); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //art wants to see buildings without flags as a test. +#if defined(RTS_DEBUG) //art wants to see buildings without flags as a test. void hideGarrisonFlags(Bool hide); #endif }; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h index de0823f65e..8633bddd4f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -33,7 +33,7 @@ #include "vertmaterial.h" #include "Lib/BaseType.h" -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) struct DebugIcon; // /// W3DDebugIcons: Draws huge numbers of debug icons for pathfinding quickly. @@ -76,6 +76,6 @@ class W3DDebugIcons : public RenderObjClass public: static void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); }; -#endif // RTS_DEBUG or RTS_INTERNAL +#endif // RTS_DEBUG #endif // end __W3D_DEBUG_ICONS_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index b88aa035fd..37d2333c47 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -71,7 +71,7 @@ class W3DDisplay : public Display virtual void getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres, Int *bitDepth); ///removeShadow(this);} ///m_preloadReport) { @@ -123,7 +123,7 @@ AudioHandle MilesAudioManager::addAudioEvent( const AudioEventRTS *eventToAdd ) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //------------------------------------------------------------------------------------------------- void MilesAudioManager::audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp ) { @@ -463,7 +463,7 @@ void MilesAudioManager::postProcessLoad() //------------------------------------------------------------------------------------------------- void MilesAudioManager::reset() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) dumpAllAssetsUsed(); m_allEventsLoaded.clear(); #endif @@ -3060,7 +3060,7 @@ void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted ) //------------------------------------------------------------------------------------------------- U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (sizeof(U32) != sizeof(File*)) { RELEASE_CRASH(("streamingFileOpen - This function requires work in order to compile on non 32-bit platforms.\n")); } @@ -3320,7 +3320,7 @@ Bool AudioFileCache::freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNee } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //------------------------------------------------------------------------------------------------- void MilesAudioManager::dumpAllAssetsUsed() { diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp index e2f99f55f6..3dbdb1989e 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp @@ -1279,7 +1279,7 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain ) //------------------------------------------------------------------------------------------------- void W3DRadar::clearShroud() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_shroudOn) return; #endif @@ -1299,7 +1299,7 @@ void W3DRadar::clearShroud() //------------------------------------------------------------------------------------------------- void W3DRadar::setShroudLevel(Int shroudX, Int shroudY, CellShroudStatus setting) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_shroudOn) return; #endif @@ -1436,7 +1436,7 @@ void W3DRadar::draw( Int pixelX, Int pixelY, Int width, Int height ) TheDisplay->drawImage( m_overlayImage, ul.x, ul.y, lr.x, lr.y ); // draw the shroud image -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( TheGlobalData->m_shroudOn ) #else if (true) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp index effb187669..ea3f381eef 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp @@ -80,7 +80,7 @@ static inline Bool isValidTimeToCalcLogicStuff() //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(DEBUG_CRC) && (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(DEBUG_CRC) && defined(RTS_DEBUG) #include class LogClass { @@ -199,11 +199,11 @@ LogClass BonePosLog("bonePositions.txt"); //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) extern AsciiString TheThingTemplateBeingParsedName; #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) extern Real TheSkateDistOverride; #endif @@ -466,7 +466,7 @@ static Bool findSingleSubObj(RenderObjClass* robj, const AsciiString& boneName, if (test == childObject) { boneIndex = robj->Get_Sub_Object_Bone_Index(0, subObj); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) test->Release_Ref(); test = robj->Get_Sub_Object_On_Bone(0, boneIndex); DEBUG_ASSERTCRASH(test != NULL && test == childObject, ("*** ASSET ERROR: Hmm, bone problem")); @@ -746,7 +746,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const { sprintf(buffer, "%s%02d", mfName.str(), i); findPristineBone(NAMEKEY(buffer), &info.m_muzzleFlashBone); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) if (info.m_muzzleFlashBone) info.m_muzzleFlashBoneName = buffer; #endif @@ -794,7 +794,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const if (!mfName.isEmpty()) findPristineBone(NAMEKEY(mfName), &info.m_muzzleFlashBone); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) if (info.m_muzzleFlashBone) info.m_muzzleFlashBoneName = mfName; #endif @@ -959,7 +959,7 @@ void ModelConditionInfo::loadAnimations() const void ModelConditionInfo::clear() { int i; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_description.clear(); #endif m_conditionsYesVec.clear(); @@ -1448,7 +1448,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void info.m_conditionsYesVec.clear(); info.m_conditionsYesVec.push_back(blankConditions); - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) info.m_description.clear(); info.m_description.concat(TheThingTemplateBeingParsedName); info.m_description.concat(" DEFAULT"); @@ -1479,7 +1479,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void } info.m_transitionSig = buildTransitionSig(firstKey, secondKey); - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) info.m_description.clear(); info.m_description.concat(TheThingTemplateBeingParsedName); info.m_description.concat(" TRANSITION: "); @@ -1503,7 +1503,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void ModelConditionFlags conditionsYes; - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) AsciiString description; conditionsYes.parse(ini, &description); @@ -1555,7 +1555,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void // } ModelConditionFlags conditionsYes; - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) + #if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString description; conditionsYes.parse(ini, &description); @@ -1844,18 +1844,18 @@ void W3DModelDraw::setShadowsEnabled(Bool enable) } /**collect some stats about the rendering cost of this draw module */ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DModelDraw::getRenderCost(RenderCost & rc) const { getRenderCostRecursive(rc,m_renderObject); if (m_shadow) m_shadow->getRenderCost(rc); } -#endif //RTS_DEBUG || RTS_INTERNAL +#endif //RTS_DEBUG /**recurse through sub-objs to collect stats about the rendering cost of this draw module */ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const { if (robj == NULL) return; @@ -1892,7 +1892,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) } } } -#endif //RTS_DEBUG || RTS_INTERNAL +#endif //RTS_DEBUG //------------------------------------------------------------------------------------------------- void W3DModelDraw::setFullyObscuredByShroud(Bool fullyObscured) @@ -2211,7 +2211,7 @@ Real W3DModelDraw::getCurAnimDistanceCovered() const if (m_curState != NULL && m_whichAnimInCurState >= 0) { const W3DAnimationInfo& animInfo = m_curState->m_animations[m_whichAnimInCurState]; - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) if (TheSkateDistOverride != 0.0f) return TheSkateDistOverride; #endif @@ -2758,7 +2758,7 @@ void W3DModelDraw::nukeCurrentRender(Matrix3D* xform) } //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //art wants to see buildings without flags as a test. +#if defined(RTS_DEBUG) //art wants to see buildings without flags as a test. void W3DModelDraw::hideGarrisonFlags(Bool hide) { if (!m_renderObject) @@ -2984,7 +2984,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState) rebuildWeaponRecoilInfo(newState); doHideShowSubObjs(&newState->m_hideShowVec); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //art wants to see buildings without flags as a test. +#if defined(RTS_DEBUG) //art wants to see buildings without flags as a test. if (TheGlobalData->m_hideGarrisonFlags && draw->isKindOf(KINDOF_STRUCTURE)) hideGarrisonFlags(TRUE); #endif @@ -3214,7 +3214,7 @@ Bool W3DModelDraw::getProjectileLaunchOffset( //BONEPOS_LOG(("can't find best info\n")); return false; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CRCDEBUG_LOG(("W3DModelDraw::getProjectileLaunchOffset() for %s\n", stateToUse->getDescription().str())); #endif @@ -4181,7 +4181,7 @@ void W3DModelDrawModuleData::xfer( Xfer *x ) { ModelConditionInfo *info = &(*it); x->xferByte(&(info->m_validStuff)); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) x->xferAsciiString(&(info->m_description)); #endif if (info->m_validStuff) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp index 307065155f..12d4f430fb 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp @@ -1370,7 +1370,7 @@ HeightMapRenderObjClass::HeightMapRenderObjClass(void) m_roadBuffer = NEW W3DRoadBuffer; #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) m_shroud = NEW W3DShroud; #else diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp index 67a7499408..8e0ea9fe11 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp @@ -2099,7 +2099,7 @@ void W3DProjectedShadowManager::removeAllShadows(void) } // end for } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DProjectedShadow::getRenderCost(RenderCost & rc) const { if (TheGlobalData->m_useShadowDecals && m_isEnabled && !m_isInvisibleEnabled) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index 6135448919..40aaabac13 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -1166,7 +1166,7 @@ void W3DVolumetricShadow::updateOptimalExtrusionPadding(void) // getRenderCost ============================================================ // Returns number of draw calls for this shadow. // ============================================================================ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DVolumetricShadow::getRenderCost(RenderCost & rc) const { Int drawCount = 0; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp index 0a433082b0..6abf20269e 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp @@ -206,7 +206,7 @@ TextureClass *W3DAssetManager::Get_Texture( // extern std::vector preloadTextureNamesGlobalHack; // preloadTextureNamesGlobalHack.push_back(tex->Get_Texture_Name()); // } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_preloadReport) { //loading a new asset and app is requesting a log of all loaded assets. @@ -963,7 +963,7 @@ bool W3DAssetManager::Load_3D_Assets( const char * filename ) bool result = WW3DAssetManager::Load_3D_Assets(filename); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (result && TheGlobalData->m_preloadReport) { //loading a new asset and app is requesting a log of all loaded assets. diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp index 5f68c4fec0..7125f97952 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp @@ -53,7 +53,7 @@ #include "Common/MapObject.h" #include "WW3D2/dx8wrapper.h" -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Texturing, no zbuffer, disabled zbuffer write, primary gradient, alpha blending #define SC_OPAQUE ( SHADE_CNST(ShaderClass::PASS_ALWAYS, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \ @@ -312,4 +312,4 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo) } } -#endif // RTS_DEBUG or RTS_INTERNAL \ No newline at end of file +#endif // RTS_DEBUG \ No newline at end of file diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index b86ea5bf2a..3a8ed72575 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -277,7 +277,7 @@ void StatDumpClass::dumpStats() fprintf( m_fp, "\n" ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) TheAudio->audioDebugDisplay( NULL, NULL, m_fp ); fprintf( m_fp, "\n" ); #endif @@ -349,7 +349,7 @@ W3DDisplay::W3DDisplay() m_2DScene = NULL; m_3DInterfaceScene = NULL; m_averageFPS = TheGlobalData->m_framesPerSecondLimit; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_timerAtCumuFPSStart = 0; #endif for (i=0; im_wireframe ) m_3DScene->Set_Polygon_Mode( SceneClass::LINE ); #endif @@ -855,7 +855,7 @@ void W3DDisplay::updateAverageFPS(void) Int64 freq64 = getPerformanceCounterFrequency(); Int64 time64 = getPerformanceCounter(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGameLogic->getFrame() == START_CUMU_FRAME) { m_timerAtCumuFPSStart = time64; @@ -897,7 +897,7 @@ void W3DDisplay::updateAverageFPS(void) lastUpdateTime64 = time64; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats ICoord2D TheMousePos; #endif @@ -991,7 +991,7 @@ void W3DDisplay::gatherDebugStats( void ) double ms = 1000.0f/fps; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) double cumuTime = ((double)(time64 - m_timerAtCumuFPSStart) / (double)(freq64)); if (cumuTime < 0.0) cumuTime = 0.0; Int numFrames = (Int)TheGameLogic->getFrame() - (Int)START_CUMU_FRAME; @@ -1287,7 +1287,7 @@ void W3DDisplay::gatherDebugStats( void ) } Object *object = NULL; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats Drawable *draw = TheTacticalView->pickDrawable(&TheMousePos, FALSE, (PickType)0xffffffff ); #else Drawable *draw = TheGameClient->findDrawableByID( TheInGameUI->getMousedOverDrawableID() ); @@ -1396,7 +1396,7 @@ void W3DDisplay::gatherDebugStats( void ) draw->getPosition()->z ); // (gth) compute some stats about the rendering cost of this drawable -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) RenderCost rcost; for (DrawModule** dm = draw->getDrawModules(); *dm; ++dm) { @@ -1653,7 +1653,7 @@ void W3DDisplay::draw( void ) // compute debug statistics for display later if ( m_debugDisplayCallback == StatDebugDisplay -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) || TheGlobalData->m_benchmarkTimer > 0 #endif ) @@ -1887,7 +1887,7 @@ void W3DDisplay::draw( void ) drawCurrentDebugDisplay(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_benchmarkTimer > 0) { drawFPSStats(); @@ -1895,7 +1895,7 @@ void W3DDisplay::draw( void ) #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugShowGraphicalFramerate) { drawFramerateBar(); @@ -3040,7 +3040,7 @@ void W3DDisplay::toggleMovieCapture(void) } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) static FILE *AssetDumpFile=NULL; @@ -3193,7 +3193,7 @@ void W3DDisplay::doSmartAssetPurgeAndPreload(const char* usageFileName) //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DDisplay::dumpAssetUsage(const char* mapname) { if (!m_assetManager || !mapname || !*mapname) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp index 663422b29f..b8d49b810a 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp @@ -99,7 +99,7 @@ RTS3DScene::RTS3DScene() m_scratchLight = NEW_REF( LightClass, (LightClass::DIRECTIONAL) ); // REF_PTR_SET(m_globalLight[lightIndex], pLight); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) m_shroudMaterialPass = NEW_REF(W3DShroudMaterialPassClass,()); else @@ -753,7 +753,7 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I if (drawInfo) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_shroudOn) ss = OBJECTSHROUD_CLEAR; #endif diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp index 5fff58239b..6990205eec 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp @@ -1071,7 +1071,7 @@ Int ShroudTextureShader::set(Int stage) if (stage == 0) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaSpriteShader); else diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp index 6b25f48ec3..be441cbf74 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp @@ -149,7 +149,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi memset(m_finalFogData,0,srcWidth*srcHeight); #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) m_pSrcTexture = DX8Wrapper::_Create_DX8_Surface(srcWidth,srcHeight, WW3D_FORMAT_A4R4G4B4); else @@ -173,7 +173,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi //clear entire texture to black memset(m_srcTextureData,0,m_srcTexturePitch*srcHeight); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) fillShroudData(TheGlobalData->m_shroudAlpha); //initialize shroud to a known value #endif @@ -227,7 +227,7 @@ Bool W3DShroud::ReAcquireResources(void) // Create destination texture (stored in video memory). // Since we control the video memory copy, we can do partial updates more efficiently. Or do shift blits. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) m_pDstTexture = MSGNEW("TextureClass") TextureClass(m_dstTextureWidth,m_dstTextureHeight,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1, TextureClass::POOL_DEFAULT); else @@ -259,7 +259,7 @@ W3DShroudLevel W3DShroud::getShroudLevel(Int x, Int y) { UnsignedShort pixel=*(UnsignedShort *)((Byte *)m_srcTextureData + x*2 + y*m_srcTexturePitch); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) //in this mode, alpha channel holds intensity return (W3DShroudLevel)((1.0f-((Real)(pixel >> 12)/15.0f))*255.0f); @@ -284,7 +284,7 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO if (level < TheGlobalData->m_shroudAlpha) level = TheGlobalData->m_shroudAlpha; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) { ///@todo: optimize this case if we end up using fog shroud. @@ -349,7 +349,7 @@ void W3DShroud::fillShroudData(W3DShroudLevel level) if (level < TheGlobalData->m_shroudAlpha) level = TheGlobalData->m_shroudAlpha; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //convert value to pixel format if (TheGlobalData && TheGlobalData->m_fogOfWarOn) { @@ -412,7 +412,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu if (level < TheGlobalData->m_shroudAlpha) level = TheGlobalData->m_shroudAlpha; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //convert value to pixel format if (TheGlobalData && TheGlobalData->m_fogOfWarOn) { @@ -520,7 +520,7 @@ void W3DShroud::render(CameraClass *cam) if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK) return; //device not ready to render anything -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn != m_drawFogOfWar) { //fog state has changed since last time shroud system was initialized @@ -580,7 +580,7 @@ void W3DShroud::render(CameraClass *cam) { for (Int x=0; xm_fogOfWarOn) { dataDest[x]=((TheGlobalData->m_shroudColor.getAsInt()>>4)&0xf) | (((TheGlobalData->m_shroudColor.getAsInt()>>12)&0xf)<<4) | (((TheGlobalData->m_shroudColor.getAsInt()>>20)&0xf)<<8) | ((((255-(dataSrc[x] & 0xff))>>4)&0xf)<<12); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp index 67487cfbf6..b89ca162d1 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp @@ -310,7 +310,7 @@ Bool W3DTerrainVisual::load( AsciiString filename ) if (W3DDisplay::m_3DScene != NULL) W3DDisplay::m_3DScene->Add_Render_Object( m_terrainRenderObject ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Icon drawing utility object for pathfinding. if (W3DDisplay::m_3DScene != NULL) { diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp index 80e0da060c..c4445e49c4 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp @@ -438,7 +438,7 @@ void W3DView::setCameraTransform( void ) } m_3DCamera->Set_Clip_Planes(nearZ, farZ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_useCameraConstraints) #endif { @@ -461,7 +461,7 @@ void W3DView::setCameraTransform( void ) } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_3DCamera->Set_View_Plane( m_FOV, -1 ); #endif @@ -579,7 +579,7 @@ static void drawTerrainNormal( Drawable *draw, void *userData ) } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // ------------------------------------------------------------------------------------------------ // Draw a crude circle. Appears on top of any world geometry // ------------------------------------------------------------------------------------------------ @@ -845,7 +845,7 @@ static void drawablePostDraw( Drawable *draw, void *userData ) Object* obj = draw->getObject(); Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); #else ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); @@ -863,7 +863,7 @@ static void drawablePostDraw( Drawable *draw, void *userData ) draw->drawIconUI(); //} -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // debug collision extents if( TheGlobalData->m_showCollisionExtents ) drawDrawableExtents( draw, userData ); @@ -1521,7 +1521,7 @@ void W3DView::draw( void ) } // end if, show debug AI -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( TheGlobalData->m_debugCamera ) { UnsignedInt c = 0xaaffffff; @@ -1591,7 +1591,7 @@ void W3DView::draw( void ) drawable = drawable->getNextDrawable(); } } -#endif // DEBUG or INTERNAL +#endif // RTS_DEBUG Region3D axisAlignedRegion; getAxisAlignedViewRegion(axisAlignedRegion); @@ -1836,7 +1836,7 @@ void W3DView::setFieldOfView( Real angle ) { View::setFieldOfView( angle ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // this is only for testing, and recalculating the // camera every frame is wasteful setCameraTransform(); diff --git a/Generals/Code/Main/WinMain.cpp b/Generals/Code/Main/WinMain.cpp index 5d30943d84..5f75bf1a91 100644 --- a/Generals/Code/Main/WinMain.cpp +++ b/Generals/Code/Main/WinMain.cpp @@ -845,7 +845,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, #ifdef MEMORYPOOL_DEBUG TheMemoryPoolFactory->debugMemoryReport(REPORT_POOLINFO | REPORT_POOL_OVERFLOW | REPORT_SIMPLE_LEAKS, 0, 0); #endif - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) TheMemoryPoolFactory->memoryPoolUsageReport("AAAMemStats"); #endif diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 9d2966ac5b..1a9a3ee651 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -117,11 +117,11 @@ class GUIEditDisplay : public Display virtual void preloadTextureAssets( AsciiString texture ) {} virtual void toggleLetterBox(void) {} virtual void enableLetterBox(Bool enable) {} -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void dumpModelAssets(const char *path) {} #endif virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) {} -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void dumpAssetUsage(const char* mapname) {} #endif diff --git a/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp b/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp index fc8e8f6b85..9511b204b8 100644 --- a/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp @@ -33,7 +33,7 @@ OpenMap::OpenMap(TOpenMapInfo *pInfo, CWnd* pParent /*=NULL*/) m_pInfo(pInfo) { m_pInfo->browse = false; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE); #else m_usingSystemDir = FALSE; @@ -110,7 +110,7 @@ void OpenMap::OnOK() void OpenMap::populateMapListbox( Bool systemMaps ) { m_usingSystemDir = systemMaps; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir); #endif @@ -190,7 +190,7 @@ BOOL OpenMap::OnInitDialog() if (pUserMaps != NULL) pUserMaps->SetCheck( !m_usingSystemDir ); -#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL) +#if !defined(RTS_DEBUG) if (pSystemMaps) pSystemMaps->ShowWindow( FALSE ); if (pUserMaps) diff --git a/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp b/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp index 4618ee3604..bfe66e525f 100644 --- a/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp @@ -32,7 +32,7 @@ SaveMap::SaveMap(TSaveMapInfo *pInfo, CWnd* pParent /*=NULL*/) : CDialog(SaveMap::IDD, pParent), m_pInfo(pInfo) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_pInfo->usingSystemDir = m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE); #else m_pInfo->usingSystemDir = m_usingSystemDir = FALSE; @@ -121,7 +121,7 @@ void SaveMap::OnBrowse() void SaveMap::populateMapListbox( Bool systemMaps ) { m_pInfo->usingSystemDir = m_usingSystemDir = systemMaps; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir); #endif @@ -225,7 +225,7 @@ BOOL SaveMap::OnInitDialog() if (pUserMaps != NULL) pUserMaps->SetCheck( !m_usingSystemDir ); -#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL) +#if !defined(RTS_DEBUG) if (pSystemMaps) pSystemMaps->ShowWindow( FALSE ); if (pUserMaps) diff --git a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index 7ac9f21c63..87f8fa53b8 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp @@ -388,7 +388,7 @@ void WorldHeightMapEdit::loadBaseImages(void) { /// @todo - take this out when we are done evaluating terrain textures. -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) loadDirectoryOfImages("..\\TestArt\\TestTerrain"); #endif diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 390572b651..8fab5c554e 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -334,7 +334,7 @@ BOOL CWorldBuilderApp::InitInstance() initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini"); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_MULTIFILE, NULL ); #endif @@ -406,7 +406,7 @@ BOOL CWorldBuilderApp::InitInstance() DEBUG_ASSERTCRASH(!TheGlobalData->m_useHalfHeightMap, ("TheGlobalData->m_useHalfHeightMap : Don't use this setting in WB.")); TheWritableGlobalData->m_useHalfHeightMap = false; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // WB never uses the shroud. TheWritableGlobalData->m_shroudOn = FALSE; #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h b/GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h index 9b304aa980..1abeabb7b3 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h @@ -89,7 +89,7 @@ class AsciiString // add a ctor/dtor, 'cuz they won't ever be called. struct AsciiStringData { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) const char* m_debugptr; // just makes it easier to read in the debugger #endif unsigned short m_refCount; // reference count diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h b/GeneralsMD/Code/GameEngine/Include/Common/Debug.h index fe873feeaf..dcb898fb0a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Debug.h @@ -70,7 +70,7 @@ class AsciiString; #define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a) // by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on. -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS) +#if defined(RTS_DEBUG) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS) #define ALLOW_DEBUG_UTILS 1 #elif defined(DEBUG_LOGGING) || defined(DEBUG_CRASHING) || defined(DEBUG_STACKTRACE) || defined(DEBUG_PROFILE) // TheSuperHackers @tweak also turn on when any of the above options is already set. diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h index 317470d196..8727d9a026 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h @@ -78,7 +78,7 @@ class DrawModule : public DrawableModule virtual void releaseShadows(void) = 0; ///< frees all shadow resources used by this module - used by Options screen. virtual void allocateShadows(void) = 0; ///< create shadow resources if not already present. Used by Options screen. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void getRenderCost(RenderCost & rc) const { }; ///< estimates the render cost of this draw module #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h b/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h index fea92a0ee1..4e73694854 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h @@ -136,7 +136,7 @@ class AudioManager : public SubsystemInterface public: AudioManager(); virtual ~AudioManager(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0; #endif @@ -376,7 +376,7 @@ class AudioManager : public SubsystemInterface // AudioManager that does nothing. Used for Headless Mode. class AudioManagerDummy : public AudioManager { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {} #endif virtual void stopAudio(AudioAffect which) {} diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h index 7d48670358..6e938c7010 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h @@ -60,7 +60,7 @@ #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) #define DUMP_PERF_STATS #else #define NO_DUMP_PERF_STATS diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h b/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h index 557d4ffbc7..375ef02d5b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h @@ -53,12 +53,12 @@ #define DISABLE_MEMORYPOOL_CHECKPOINTING 1 #endif -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW) +#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW) #define MEMORYPOOL_DEBUG_CUSTOM_NEW #endif -//#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) -#if (defined(RTS_DEBUG)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) +//#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) +#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG) #define MEMORYPOOL_DEBUG #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h index a9c475bbf8..95a8d93a4b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h @@ -67,7 +67,7 @@ static const char *GeometryNames[] = #endif // end DEFINE_GEOMETRY_NAMES //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) enum ExtentModType CPP_11(: Int) { EXTENTMOD_INVALID = 0, @@ -188,7 +188,7 @@ class GeometryInfo : public Snapshot // given an object with this geom, SET how far above the object's canonical position its max z should extend. void setMaxHeightAbovePosition(Real z); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void tweakExtents(ExtentModType extentModType, Real extentModAmount); AsciiString getDescriptiveString() const; #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h index 0f5f15b5fc..e7218c70c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h @@ -476,7 +476,7 @@ class GlobalData : public SubsystemInterface Real m_keyboardCameraRotateSpeed; ///< How fast the camera rotates when rotated via keyboard controls. Int m_playStats; ///< Int whether we want to log play stats or not, if <= 0 then we don't log -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) Bool m_specialPowerUsesDelay ; #endif Bool m_TiVOFastMode; ///< When true, the client speeds up the framerate... set by HOTKEY! diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h index aac0d19d60..c1698320c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h @@ -236,7 +236,7 @@ class GameMessage : public MemoryPoolObject MSG_META_CHAT_EVERYONE, ///< send chat msg to everyone (incl. observers) MSG_META_DIPLOMACY, ///< bring up diplomacy screen MSG_META_OPTIONS, ///< bring up options screen -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) MSG_META_HELP, ///< bring up help screen #endif @@ -300,7 +300,7 @@ class GameMessage : public MemoryPoolObject // META items that are really for debug/demo/development use only... // They do not get built into RELEASE builds. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS, ///< Toggles showing units behind buildings or not MSG_META_DEMO_TOGGLE_LETTERBOX, ///< enable/disable letterbox mode MSG_META_DEMO_TOGGLE_MESSAGE_TEXT, ///< toggle the text from the UI messages @@ -418,11 +418,11 @@ class GameMessage : public MemoryPoolObject MSG_META_DEBUG_WIN, ///< Instant Win MSG_META_DEMO_TOGGLE_DEBUG_STATS, ///< show/hide the debug stats /// @todo END section to REMOVE (not disable) for release -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) MSG_META_DEMO_TOGGLE_AUDIODEBUG, ///< show/hide the audio debug info -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS MSG_META_DEMO_PERFORM_STATISTICAL_DUMP, ///< dump performance stats for this frame to StatisticsDump.txt #endif//DUMP_PERF_STATS @@ -597,7 +597,7 @@ class GameMessage : public MemoryPoolObject MSG_BEGIN_DEBUG_NETWORK_MESSAGES = 1900, ///< network messages that exist only in debug/internal builds. all grouped separately. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) // all debug/internal-only messages must go here. MSG_DEBUG_KILL_SELECTION, MSG_DEBUG_HURT_OBJECT, diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h index 1a1ba1fddb..428c2e592e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h @@ -33,7 +33,7 @@ #include "Utility/intrin_compat.h" -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /* NOTE NOTE NOTE: never check this in with this enabled, since there is a nonzero time penalty for running in this mode. Only enable it for local builds for testing purposes! (srj) diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Player.h b/GeneralsMD/Code/GameEngine/Include/Common/Player.h index 849c4d6f25..d5a1f4676b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Player.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Player.h @@ -327,7 +327,7 @@ class Player : public Snapshot void onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate ); ///< An upgrade just finished, do things like tell all objects to recheck UpgradeModules void onUpgradeRemoved(){} ///< An upgrade just got removed, this doesn't do anything now. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /// Prereq disabling cheat key void toggleIgnorePrereqs(){ m_DEMO_ignorePrereqs = !m_DEMO_ignorePrereqs; } Bool ignoresPrereqs() const { return m_DEMO_ignorePrereqs; } @@ -338,7 +338,7 @@ class Player : public Snapshot #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) /// No time building cheat key void toggleInstantBuild(){ m_DEMO_instantBuild = !m_DEMO_instantBuild; } Bool buildsInstantly() const { return m_DEMO_instantBuild; } @@ -802,12 +802,12 @@ class Player : public Snapshot Real m_cashBountyPercent; /// @todo REMOVE (not disable) these cheat keys -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_DEMO_ignorePrereqs; ///< Can I ignore prereq checks? Bool m_DEMO_freeBuild; ///< Can I build everything for no money? #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) Bool m_DEMO_instantBuild; ///< Can I build anything in one frame? #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h index a29187c96a..cf237d1c0a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h @@ -78,7 +78,7 @@ class RecorderClass : public SubsystemInterface { UnsignedInt getPlaybackFrameCount() const { return m_playbackFrameCount; } ///< valid during playback only void stopPlayback(); ///< Stops playback. Its fine to call this even if not playing back a file. Bool simulateReplay(AsciiString filename); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool analyzeReplay( AsciiString filename ); #endif Bool isPlaybackInProgress() const; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h index 3f1f696617..ff1aeb557d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -36,7 +36,7 @@ #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #define SPARSEMATCH_DEBUG #else #undef SPARSEMATCH_DEBUG diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h index e9f994b9c8..d8110cf247 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h @@ -30,7 +30,7 @@ #ifndef IG_DEGBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif // Unsure about this one -ML 3/25/03 -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE) +#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE) // Writes a stackdump (provide a callback : gets called per line) // If callback is NULL then will write using OuputDebugString diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h index 9153dc5cd0..7c7a072788 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h @@ -327,7 +327,7 @@ class StateMachine : public MemoryPoolObject, public Snapshot // StateReturnType internalSetState( StateID newStateID ); ///< for internal use only - change the current state of the machine -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnsignedInt peekSleepTill() const { return m_sleepTill; } #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h index a9590666a4..4fae79f465 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h @@ -161,7 +161,7 @@ class Thing : public MemoryPoolObject // since ThingTemplates are shared between many, many Things, the Thing // should never be able to change it. OVERRIDE m_template; ///< reference back to template database -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) AsciiString m_templateName; #endif /* diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h index 2764437135..76554e821b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h @@ -286,7 +286,7 @@ class ModuleInfo return m_info.size(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool containsPartialName(const char* n) const { for (size_t i = 0; i < m_info.size(); i++) diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UnicodeString.h b/GeneralsMD/Code/GameEngine/Include/Common/UnicodeString.h index b0ef11bd8f..7038d31e98 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/UnicodeString.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/UnicodeString.h @@ -89,7 +89,7 @@ class UnicodeString // add a ctor/dtor, 'cuz they won't ever be called. struct UnicodeStringData { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) const WideChar* m_debugptr; // just makes it easier to read in the debugger #endif unsigned short m_refCount; // reference count diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index 08938bc3d3..d625d1f4a3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -1027,7 +1027,7 @@ class ControlBar : public SubsystemInterface Int m_remainingRadarAttackGlowFrames; GameWindow *m_radarAttackGlowWindow; -#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG ) +#if defined(RTS_DEBUG) UnsignedInt m_lastFrameMarkedDirty; UnsignedInt m_consecutiveDirtyFrames; #endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h index 9d1e61c789..ff8c3a143d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -142,7 +142,7 @@ class DebugDisplay : public DebugDisplayInterface // displayers -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp ); #endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h index 92775c7e36..0c9c9cf01e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h @@ -92,7 +92,7 @@ class Display : public SubsystemInterface virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate) {}; virtual Bool testMinSpecRequirements(Bool *videoPassed, Bool *cpuPassed, Bool *memPassed,StaticGameLODLevel *idealVideoLevel=NULL, Real *cpuTime=NULL) {*videoPassed=*cpuPassed=*memPassed=true; return true;} virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) = 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void dumpAssetUsage(const char* mapname) = 0; #endif @@ -163,7 +163,7 @@ class Display : public SubsystemInterface virtual void clearShroud() = 0; ///< empty the entire shroud virtual void setBorderShroudLevel(UnsignedByte level) = 0; ///m_preloadAssets = TRUE; @@ -660,7 +660,7 @@ Int parsePreload( char *args[], int num ) #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseDisplayDebug(char *args[], int) { TheWritableGlobalData->m_displayDebug = TRUE; @@ -706,7 +706,7 @@ Int parseVTune ( char *args[], int num ) } /// end stuff for VTUNE -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) //============================================================================= //============================================================================= @@ -718,7 +718,7 @@ Int parseNoFX(char *args[], int) return 1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseNoShroud(char *args[], int) { TheWritableGlobalData->m_shroudOn = FALSE; @@ -741,7 +741,7 @@ Int parseNoMoveCamera(char *args[], int) return 1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseNoCinematic(char *args[], int) { TheWritableGlobalData->m_disableCameraMovement = true; @@ -774,7 +774,7 @@ Int parseNoShaders(char *args[], int) return 1; } -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) Int parseNoLogo(char *args[], int) { TheWritableGlobalData->m_playIntro = FALSE; @@ -817,7 +817,7 @@ Int parseWinCursors(char *args[], int num) Int parseQuickStart( char *args[], int num ) { -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) parseNoLogo( args, num ); #else //Kris: Patch 1.01 -- Allow release builds to skip the sizzle video, but still force the EA logo to show up. @@ -836,7 +836,7 @@ Int parseConstantDebug( char *args[], int num ) return 1; } -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) Int parseExtraLogging( char *args[], int num ) { TheWritableGlobalData->m_extraLogging = TRUE; @@ -863,7 +863,7 @@ Int parseShowTeamDot( char *args[], int num ) } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseSelectAll( char *args[], int num ) { TheWritableGlobalData->m_allowUnselectableSelection = TRUE; @@ -925,7 +925,7 @@ Int parseDemoLoadScreen(char *args[], int num) return 1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseSaveStats(char *args[], int num) { if (num > 1) @@ -937,7 +937,7 @@ Int parseSaveStats(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseSaveAllStats(char *args[], int num) { if (num > 1) @@ -950,7 +950,7 @@ Int parseSaveAllStats(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseLocalMOTD(char *args[], int num) { if (num > 1) @@ -962,7 +962,7 @@ Int parseLocalMOTD(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseCameraDebug(char *args[], int num) { TheWritableGlobalData->m_debugCamera = TRUE; @@ -971,7 +971,7 @@ Int parseCameraDebug(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int parseBenchmark(char *args[], int num) { if (num > 1) @@ -983,7 +983,7 @@ Int parseBenchmark(char *args[], int num) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS Int parseStats(char *args[], int num) { @@ -1174,7 +1174,7 @@ static CommandLineParam paramsForEngineInit[] = { "-quickstart", parseQuickStart }, { "-useWaveEditor", parseUseWaveEditor }, -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) { "-noaudio", parseNoAudio }, { "-map", parseMapName }, { "-nomusic", parseNoMusic }, @@ -1239,7 +1239,7 @@ static CommandLineParam paramsForEngineInit[] = // Number of frames between each CRC that is written to replay files in singleplayer games. { "-ReplayCRCInterval", parseReplayCRCInterval }, #endif -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) { "-saveAllStats", parseSaveAllStats }, { "-noDraw", parseNoDraw }, { "-nomilcap", parseNoMilCap }, @@ -1315,7 +1315,7 @@ static CommandLineParam paramsForEngineInit[] = //-allAdvice feature //{ "-allAdvice", parseAllAdvice }, -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) { "-preload", parsePreload }, #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp index d50d11c163..26bcd92119 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp @@ -377,7 +377,7 @@ void GameEngine::init() serviceWindowsOS(); - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) // If we're in Debug or Internal, load the Debug info as well. ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_OVERWRITE, NULL ); #endif @@ -533,7 +533,7 @@ void GameEngine::init() TheMetaMap->generateMetaMap(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ini.load("Data\\INI\\CommandMapDebug.ini", INI_LOAD_MULTIFILE, NULL); #endif @@ -780,7 +780,7 @@ void GameEngine::execute( void ) { DWORD prevTime = timeGetTime(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DWORD startTime = timeGetTime() / 1000; #endif @@ -797,7 +797,7 @@ void GameEngine::execute( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) { // enter only if in benchmark mode if (TheGlobalData->m_benchmarkTimer > 0) @@ -855,7 +855,7 @@ void GameEngine::execute( void ) // I'm disabling this in internal because many people need alt-tab capability. If you happen to be // doing performance tuning, please just change this on your local system. -MDC - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) ::Sleep(1); // give everyone else a tiny time slice. #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index 4ef49c0e36..d5384e0ab0 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -543,7 +543,7 @@ GlobalData::GlobalData() m_theOriginal = this; m_next = NULL; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) m_specialPowerUsesDelay = TRUE; #endif m_TiVOFastMode = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index b25cb4b995..81eeb47fab 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -342,7 +342,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_META_CHAT_EVERYONE) CHECK_IF(MSG_META_DIPLOMACY) CHECK_IF(MSG_META_OPTIONS) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CHECK_IF(MSG_META_HELP) #endif CHECK_IF(MSG_META_TOGGLE_LOWER_DETAILS) @@ -401,7 +401,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_META_TOGGLE_PAUSE) CHECK_IF(MSG_META_STEP_FRAME) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CHECK_IF(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) CHECK_IF(MSG_META_DEMO_TOGGLE_LETTERBOX) CHECK_IF(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT) @@ -514,12 +514,12 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE) CHECK_IF(MSG_META_DEBUG_WIN) CHECK_IF(MSG_META_DEMO_TOGGLE_DEBUG_STATS) -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) CHECK_IF(MSG_META_DEMO_TOGGLE_AUDIODEBUG) -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS CHECK_IF(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) #endif//DUMP_PERF_STATS @@ -662,7 +662,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CHECK_IF(MSG_SELF_DESTRUCT) CHECK_IF(MSG_CREATE_FORMATION) CHECK_IF(MSG_LOGIC_CRC) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CHECK_IF(MSG_DEBUG_KILL_SELECTION) CHECK_IF(MSG_DEBUG_HURT_OBJECT) CHECK_IF(MSG_DEBUG_KILL_OBJECT) @@ -995,7 +995,7 @@ void MessageStream::removeTranslator( TranslatorID id ) // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool isInvalidDebugCommand( GameMessage::Type t ) { @@ -1083,7 +1083,7 @@ void MessageStream::propagateMessages( void ) for( msg=m_firstMessage; msg; msg=next ) { if (ss->m_translator -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) && !isInvalidDebugCommand(msg->getType()) #endif ) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp b/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp index e5578488ee..71eb01b149 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp @@ -145,7 +145,7 @@ NameKeyType NameKeyGenerator::nameToKey(const char* nameString) NameKeyType result = b->m_key; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // reality-check to be sure our hasher isn't going bad. const Int maxThresh = 3; Int numOverThresh = 0; @@ -193,7 +193,7 @@ NameKeyType NameKeyGenerator::nameToLowercaseKey(const char* nameString) NameKeyType result = b->m_key; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // reality-check to be sure our hasher isn't going bad. const Int maxThresh = 3; Int numOverThresh = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp index f60dfa2118..c015087cb0 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -592,7 +592,7 @@ void PerfTimer::outputInfo( void ) return; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec; double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1); double avgTimePerCall = totalTimeInMS / m_callCount; @@ -630,7 +630,7 @@ void PerfTimer::outputInfo( void ) //------------------------------------------------------------------------------------------------- void PerfTimer::showMetrics( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec; double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1); double avgTimePerCall = totalTimeInMS / m_callCount; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index aa0685fbff..34ab9806b1 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -426,12 +426,12 @@ void Player::init(const PlayerTemplate* pt) m_unitsShouldHunt = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_DEMO_ignorePrereqs = FALSE; m_DEMO_freeBuild = FALSE; #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) m_DEMO_instantBuild = FALSE; #endif @@ -1287,7 +1287,7 @@ static void doFindSpecialPowerSourceObject( Object *obj, void *userData ) { UnsignedInt readyFrame = spmInterface->getReadyFrame(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) // Everything is ready if timers are debug off'd if( ! TheGlobalData->m_specialPowerUsesDelay ) readyFrame = 0; @@ -1344,7 +1344,7 @@ static void doCountSpecialPowersReady( Object *obj, void *userData ) UnsignedInt readyFrame = spmInterface->getReadyFrame(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) // Everything is ready if timers are debug off'd if( ! TheGlobalData->m_specialPowerUsesDelay ) readyFrame = 0; @@ -2938,7 +2938,7 @@ Bool Player::canBuild(const ThingTemplate *tmplate) const prereqsOK = false; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (ignoresPrereqs()) prereqsOK = true; #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index bf2fac9b34..7578c2f8e5 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -88,7 +88,7 @@ void RecorderClass::logGameStart(AsciiString options) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheNetwork && TheGlobalData->m_saveStats) { //if (TheLAN) @@ -149,7 +149,7 @@ void RecorderClass::logPlayerDisconnect(UnicodeString player, Int slot) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { unsigned long bufSize = MAX_COMPUTERNAME_LENGTH + 1; @@ -194,7 +194,7 @@ void RecorderClass::logCRCMismatch( void ) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { m_wasDesync = TRUE; @@ -249,7 +249,7 @@ void RecorderClass::logGameEnd( void ) fseek(m_file, fileSize, SEEK_SET); DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheNetwork && TheGlobalData->m_saveStats) { //if (TheLAN) @@ -280,7 +280,7 @@ void RecorderClass::logGameEnd( void ) void RecorderClass::cleanUpReplayFile( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { char fname[_MAX_PATH+1]; @@ -921,7 +921,7 @@ Bool RecorderClass::simulateReplay(AsciiString filename) return success; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool RecorderClass::analyzeReplay( AsciiString filename ) { m_doingAnalysis = TRUE; @@ -1586,7 +1586,7 @@ AsciiString RecorderClass::getReplayExtention() { */ AsciiString RecorderClass::getLastReplayFileName() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheNetwork && TheGlobalData->m_saveStats) { GameInfo *game = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp index 646e5b30a1..0d6e080350 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -108,7 +108,7 @@ void StatsCollector::reset( void ) { // make sure we have a stats Dir. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { AsciiString playtestDir = TheGlobalData->m_baseStatsDir; @@ -254,7 +254,7 @@ void StatsCollector::writeFileEnd( void ) fprintf(f, "===================================================\n"); fprintf(f, "* Times are in Game Seconds which are based off of frames. Current fps is set to %d\n", LOGICFRAMES_PER_SECOND); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_benchmarkTimer > 0) { fprintf(f, "\n*** BENCHMARK MODE STATS ***\n"); @@ -322,7 +322,7 @@ void StatsCollector::createFileName( void ) name.removeLastChar(); // m name.removeLastChar(); // . m_statsFileName.clear(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_saveStats) { m_statsFileName.set(TheGlobalData->m_baseStatsDir); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp index 7250d53b5a..60b757f5e0 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp @@ -145,7 +145,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData AsciiStringData* newData = (AsciiStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_AsciiString::ensureUniqueBufferOfSize"); newData->m_refCount = 1; newData->m_numCharsAllocated = (actualBytes - sizeof(AsciiStringData))/sizeof(char); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) newData->m_debugptr = newData->peek(); // just makes it easier to read in the debugger #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp index 6bc9dfb5cc..93b52a8cce 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp @@ -700,7 +700,7 @@ void ReleaseCrash(const char *reason) ShowWindow(ApplicationHWnd, SW_HIDE); } } -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) // /* static */ char buff[8192]; // not so static so we can be threadsafe // snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);/ // ::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR); @@ -744,7 +744,7 @@ void ReleaseCrash(const char *reason) ShowWindow(ApplicationHWnd, SW_HIDE); } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /* static */ char buff[8192]; // not so static so we can be threadsafe snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason); ::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp index 9f2be7cbb6..309527ff54 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp @@ -2243,7 +2243,7 @@ void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes #endif #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // check alignment if (unsigned(result)&3) throw ERROR_OUT_OF_MEMORY; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp index 09b7242cf5..ff2aafcbd6 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp @@ -513,7 +513,7 @@ void GeometryInfo::calcBoundingStuff() }; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //============================================================================= void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmount) { @@ -537,7 +537,7 @@ void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmoun } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //============================================================================= AsciiString GeometryInfo::getDescriptiveString() const { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp index a0ed36025f..07dd3bd6f2 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp @@ -24,7 +24,7 @@ #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE) +#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE) #pragma pack(push, 8) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp index 7de7ee3b98..2aa1232104 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp @@ -96,7 +96,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa UnicodeStringData* newData = (UnicodeStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_UnicodeString::ensureUniqueBufferOfSize"); newData->m_refCount = 1; newData->m_numCharsAllocated = (actualBytes - sizeof(UnicodeStringData))/sizeof(WideChar); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) newData->m_debugptr = newData->peek(); // just makes it easier to read in the debugger #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp index b436ac54c2..f59d309175 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -156,7 +156,7 @@ UpgradeTemplate::~UpgradeTemplate( void ) //------------------------------------------------------------------------------------------------- Int UpgradeTemplate::calcTimeToBuild( Player *player ) const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) if( player->buildsInstantly() ) { return 1; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp index d55ecef21b..9d180eb475 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp @@ -63,7 +63,7 @@ Thing::Thing( const ThingTemplate *thingTemplate ) } // end if m_template = thingTemplate; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_templateName = thingTemplate->getName(); #endif m_transform.Make_Identity(); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp index 6b18f42095..0f856581b6 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp @@ -361,7 +361,7 @@ Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatus } // end newDrawableByType -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString TheThingTemplateBeingParsedName; #endif @@ -370,7 +370,7 @@ AsciiString TheThingTemplateBeingParsedName; //------------------------------------------------------------------------------------------------- /*static*/ void ThingFactory::parseObjectDefinition( INI* ini, const AsciiString& name, const AsciiString& reskinFrom ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) TheThingTemplateBeingParsedName = name; #endif @@ -429,7 +429,7 @@ AsciiString TheThingTemplateBeingParsedName; thingTemplate->resolveNames(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) TheThingTemplateBeingParsedName.clear(); #endif } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp index 10f181ff2e..fbf5f99fb8 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp @@ -304,7 +304,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate, // there must be a module tag present, and it must be unique across all module infos // for this thing template // -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // get module info const Nugget *nugget; @@ -903,7 +903,7 @@ void ThingTemplate::parseArmorTemplateSet( INI* ini, void *instance, void * /*st ArmorTemplateSet ws; ws.parseArmorTemplateSet(ini); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES) { for (ArmorTemplateSetVector::const_iterator it = self->m_armorTemplateSets.begin(); it != self->m_armorTemplateSets.end(); ++it) @@ -931,7 +931,7 @@ void ThingTemplate::parseWeaponTemplateSet( INI* ini, void *instance, void * /*s WeaponTemplateSet ws; ws.parseWeaponTemplateSet(ini, self); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES) { for (WeaponTemplateSetVector::const_iterator it = self->m_weaponTemplateSets.begin(); it != self->m_weaponTemplateSets.end(); ++it) @@ -1063,7 +1063,7 @@ AIUpdateModuleData *ThingTemplate::friend_getAIModuleInfo(void) //------------------------------------------------------------------------------------------------- void ThingTemplate::validateAudio() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #define AUDIO_TEST(y) \ if (!get##y()->getEventName().isEmpty() && get##y()->getEventName().compareNoCase("NoSound") != 0) { \ @@ -1153,7 +1153,7 @@ void ThingTemplate::validate() validateAudio(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (getName() == "DefaultThingTemplate") return; @@ -1549,7 +1549,7 @@ Int ThingTemplate::calcTimeToBuild( const Player* player) const Real factionModifier = 1 + player->getProductionTimeChangePercent( getName() ); buildTime *= factionModifier; -#if defined (RTS_DEBUG) || defined (RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) if( player->buildsInstantly() ) { buildTime = 1; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/version.cpp b/GeneralsMD/Code/GameEngine/Source/Common/version.cpp index 923b7a204c..46caa6b115 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/version.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/version.cpp @@ -41,7 +41,7 @@ Version::Version() m_localBuildNum = 0; m_buildUser = AsciiString("somebody"); m_buildLocation = AsciiString("somewhere"); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) m_showFullVersion = TRUE; #else m_showFullVersion = FALSE; @@ -70,15 +70,15 @@ UnsignedInt Version::getVersionNumber( void ) AsciiString Version::getAsciiVersion( void ) { AsciiString version; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (m_localBuildNum) version.format("%d.%d.%d.%d%c%c", m_major, m_minor, m_buildNum, m_localBuildNum, m_buildUser.getCharAt(0), m_buildUser.getCharAt(1)); else version.format("%d.%d.%d", m_major, m_minor, m_buildNum); -#else // defined RTS_DEBUG || defined RTS_INTERNAL +#else // defined(RTS_DEBUG) version.format("%d.%d", m_major, m_minor); -#endif // defined RTS_DEBUG || defined RTS_INTERNAL +#endif // defined(RTS_DEBUG) return version; } @@ -87,15 +87,15 @@ UnicodeString Version::getUnicodeVersion( void ) { UnicodeString version; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (!m_localBuildNum) version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum); else version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum, m_buildUser.getCharAt(0), m_buildUser.getCharAt(1)); -#else // defined RTS_DEBUG || defined RTS_INTERNAL +#else // defined(RTS_DEBUG) version.format(TheGameText->fetch("Version:Format2").str(), m_major, m_minor); -#endif // defined RTS_DEBUG || defined RTS_INTERNAL +#endif // defined(RTS_DEBUG) #ifdef RTS_DEBUG version.concat(UnicodeString(L" Debug")); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index d9cc4136ce..e3ea035d06 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -134,7 +134,7 @@ void ControlBar::markUIDirty( void ) { m_UIDirty = TRUE; -#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG ) +#if defined(RTS_DEBUG) UnsignedInt now = TheGameLogic->getFrame(); if( now == m_lastFrameMarkedDirty ) { @@ -956,7 +956,7 @@ ControlBar::ControlBar( void ) m_remainingRadarAttackGlowFrames = 0; m_radarAttackGlowWindow = NULL; -#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG ) +#if defined(RTS_DEBUG) m_lastFrameMarkedDirty = 0; m_consecutiveDirtyFrames = 0; #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index a9a0be113a..361767ca89 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -223,7 +223,7 @@ static void playerTooltip(GameWindow *window, } UnicodeString tooltip; tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str()); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnicodeString ip; ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP())); tooltip.concat(ip); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp index 129973bab0..32e74af675 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp @@ -354,7 +354,7 @@ static void playerTooltip(GameWindow *window, } UnicodeString tooltip; tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str()); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnicodeString ip; ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP())); tooltip.concat(ip); @@ -447,7 +447,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData ) { IPSource = L"Default local IP"; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) UnicodeString str; str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP)); GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index b8b652ee27..9baa46e384 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -96,7 +96,7 @@ enum static Bool raiseMessageBoxes = TRUE; static Bool campaignSelected = FALSE; -#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE +#if defined(RTS_DEBUG) || defined RTS_PROFILE static NameKeyType campaignID = NAMEKEY_INVALID; static GameWindow *buttonCampaign = NULL; #ifdef TEST_COMPRESSION @@ -549,7 +549,7 @@ void MainMenuInit( WindowLayout *layout, void *userData ) showSelectiveButtons(SHOW_NONE); // Set up the version number -#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE +#if defined(RTS_DEBUG) || defined RTS_PROFILE WinInstanceData instData; #ifdef TEST_COMPRESSION instData.init(); @@ -1295,7 +1295,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, if(buttonPushed) break; -#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE +#if defined(RTS_DEBUG) || defined RTS_PROFILE if( control == buttonCampaign ) { buttonPushed = TRUE; @@ -1513,7 +1513,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, else if( controlID == exitID ) { // If we ever want to add a dialog before we exit out of the game, uncomment this line and kill the quitCallback() line below. -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) //Added By Sadullah Nader //Changed the preprocessing code to normal code diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp index be7be46882..6e5a5d0396 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp @@ -70,7 +70,7 @@ static Int initialGadgetDelay = 2; static Bool justEntered = FALSE; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) static GameWindow *buttonAnalyzeReplay = NULL; #endif @@ -354,7 +354,7 @@ void ReplayMenuInit( WindowLayout *layout, void *userData ) GadgetListBoxReset(listboxReplayFiles); PopulateReplayFileListbox(listboxReplayFiles); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) WinInstanceData instData; instData.init(); BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK ); @@ -610,7 +610,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg, GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if( controlID == buttonAnalyzeReplay->winGetWindowId() ) { if(listboxReplayFiles) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index d459d69114..e7e5c15d84 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -473,7 +473,7 @@ static MessageBoxReturnType cancelStartBecauseOfNoCD( void *userData ) Bool IsFirstCDPresent(void) { -#if !defined(RTS_INTERNAL) && !defined(RTS_DEBUG) +#if !defined(RTS_DEBUG) return TheFileSystem->areMusicFilesOnCD(); #else return TRUE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index 36bb297619..72ad5aa648 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -72,7 +72,7 @@ extern std::list TheLobbyQueuedUTMs; extern void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) extern Bool g_debugSlots; void slotListDebugLog(const char *fmt, ...) { @@ -1959,7 +1959,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData) case PeerResponse::PEERRESPONSE_ROOMUTM: { sawImportantMessage = TRUE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (g_debugSlots) { DEBUG_LOG(("About to process a room UTM. Command is '%s', command options is '%s'\n", @@ -2523,7 +2523,7 @@ Bool handleGameSetupSlashCommands(UnicodeString uText) TheGameSpyInfo->sendChat(UnicodeString(uText.str()+4), TRUE, NULL); return TRUE; // was a slash command } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) else if (token == "slots") { g_debugSlots = !g_debugSlots; @@ -2537,7 +2537,7 @@ Bool handleGameSetupSlashCommands(UnicodeString uText) TheGameSpyPeerMessageQueue->addRequest( req ); return TRUE; } -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) return FALSE; // not a slash command } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp index c680e133bb..d9add5e2d0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp @@ -128,7 +128,7 @@ static Int groupRoomToJoin = 0; static Int initialGadgetDelay = 2; static Bool justEntered = FALSE; -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) Bool g_fakeCRC = FALSE; Bool g_debugSlots = FALSE; #endif @@ -197,7 +197,7 @@ Bool handleLobbySlashCommands(UnicodeString uText) return TRUE; // was a slash command } */ -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) else if (token == "fakecrc") { g_fakeCRC = !g_fakeCRC; @@ -1571,7 +1571,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, { // bad crc. don't go. DEBUG_LOG(("WOLLobbyMenuSystem - CRC mismatch with the game I'm trying to join. My CRC's - EXE:0x%08X INI:0x%08X Their CRC's - EXE:0x%08x INI:0x%08x\n", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC, roomToJoin->getExeCRC(), roomToJoin->getIniCRC())); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_netMinPlayers) { GSMessageBoxOk(TheGameText->fetch("GUI:JoinFailedDefault"), TheGameText->fetch("GUI:JoinFailedCRCMismatch")); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp index 522779806d..b8a444231d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -652,7 +652,7 @@ void GameClient::update( void ) if (!freezeTime) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) #else if (true) @@ -683,7 +683,7 @@ void GameClient::update( void ) while (draw) { // update() could free the Drawable, so go ahead and grab 'next' Drawable* next = draw->getNextDrawable(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) #else if (true) @@ -720,7 +720,7 @@ void GameClient::update( void ) } } -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) // need to draw the first frame, then don't draw again until TheGlobalData->m_noDraw if (TheGlobalData->m_noDraw > TheGameLogic->getFrame() && TheGameLogic->getFrame() > 0) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp index fbb673ee49..a8dfa2f324 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp @@ -64,7 +64,7 @@ // Externals //---------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool g_useStringFile = TRUE; #endif @@ -165,7 +165,7 @@ class GameTextManager : public GameTextInterface StringInfo *m_stringInfo; StringLookUp *m_stringLUT; Bool m_initialized; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_jabberWockie; Bool m_munkee; #endif @@ -246,7 +246,7 @@ GameTextManager::GameTextManager() m_stringLUT(NULL), m_initialized(FALSE), m_noStringList(NULL), -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_jabberWockie(FALSE), m_munkee(FALSE), m_useStringFile(g_useStringFile), @@ -299,7 +299,7 @@ void GameTextManager::init( void ) m_initialized = TRUE; m_maxLabelLen = 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if(TheGlobalData) { m_jabberWockie = TheGlobalData->m_jabberOn; @@ -703,7 +703,7 @@ void GameTextManager::translateCopy( WideChar *outbuf, Char *inbuf ) { Int slash = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if ( m_jabberWockie ) { static Char buffer[MAX_UITEXT_LENGTH*2]; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index 41c3f58b55..19662d0d8c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -2232,7 +2232,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg ) } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #define AI_DEBUG_TOOLTIPS 1 #ifdef AI_DEBUG_TOOLTIPS @@ -2241,7 +2241,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg ) #include "GameLogic/AIPathfind.h" #endif // AI_DEBUG_TOOLTIPS -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) //------------------------------------------------------------------------------------------------- /** Details of what is mouse hovered over right now are in this message. Terrain might result @@ -2317,7 +2317,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg ) else m_mousedOverDrawableID = draw->getID(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //Extra hacky, sorry, but I need to use this in constantdebug report +#if defined(RTS_DEBUG) //Extra hacky, sorry, but I need to use this in constantdebug report if ( TheGlobalData->m_constantDebugUpdate == TRUE ) m_mousedOverDrawableID = draw->getID(); #endif @@ -2543,7 +2543,7 @@ void InGameUI::createCommandHint( const GameMessage *msg ) { const Object* obj = draw->getObject(); Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); #else ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); @@ -5011,7 +5011,7 @@ void InGameUI::addFloatingText(const UnicodeString& text,const Coord3D *pos, Col //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) inline Bool isClose(Real a, Real b) { return fabs(a-b) <= 1.0f; } inline Bool isClose(const Coord3D& a, const Coord3D& b) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp index 08efb7a139..386aab3cc4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp @@ -462,7 +462,7 @@ void MapCache::updateCache( void ) writeCacheINI( TRUE ); } loadStandardMaps(); // we shall overwrite info from matching user maps to prevent munkees from getting rowdy :) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheLocalFileSystem->doesFileExist(getMapDir().str())) { // only create the map cache file if "Maps" exist @@ -501,7 +501,7 @@ void MapCache::loadStandardMaps(void) INI ini; AsciiString fname; fname.format("%s\\%s", getMapDir().str(), m_mapCacheName); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) File *fp = TheFileSystem->openFile(fname.str(), File::READ); if (fp != NULL) { @@ -509,7 +509,7 @@ void MapCache::loadStandardMaps(void) fp = NULL; #endif ini.load( fname, INI_LOAD_OVERWRITE, NULL ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) } #endif } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 83a014d02c..057d9387ac 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -92,7 +92,7 @@ #define dont_ALLOW_ALT_F4 -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /*non-static*/ Real TheSkateDistOverride = 0.0f; void countObjects(Object *obj, void *userData) @@ -2350,7 +2350,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage return DESTROY_MESSAGE; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ExtentModType extentModType = EXTENTMOD_INVALID; Real extentModAmount = 0.0f; #endif @@ -3846,7 +3846,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //------------------------------------------------------------------------------- DEMO MESSAGES -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //------------------------------------------------------------------------- BEGIN DEMO MESSAGES //------------------------------------------------------------------------- BEGIN DEMO MESSAGES //------------------------------------------------------------------------- BEGIN DEMO MESSAGES @@ -5159,11 +5159,11 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //--------------------------------------------------------------------------- END DEMO MESSAGES //--------------------------------------------------------------------------- END DEMO MESSAGES //--------------------------------------------------------------------------- END DEMO MESSAGES -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) //------------------------------------------------------------------------DEMO MESSAGES //----------------------------------------------------------------------------------------- -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG: { if (TheDisplay->getDebugDisplayCallback() == AudioDebugDisplay) @@ -5174,7 +5174,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage break; } -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS //------------------------------------------------------------------------DEMO MESSAGES diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp index 0942418e53..455ac9ea75 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -336,7 +336,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage m_anchor = msg->getArgument( 0 )->pixel; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // adjust the field of view if (m_isChangingFOV) { @@ -494,7 +494,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage } // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_PITCH: { DEBUG_ASSERTCRASH(!m_isPitching, ("hmm, mismatched m_isPitching")); @@ -502,10 +502,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage disp = DESTROY_MESSAGE; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_END_ADJUST_PITCH: { DEBUG_ASSERTCRASH(m_isPitching, ("hmm, mismatched m_isPitching")); @@ -513,16 +513,16 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage disp = DESTROY_MESSAGE; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_DESHROUD: { ThePartitionManager->revealMapForPlayerPermanently( ThePlayerList->getLocalPlayer()->getPlayerIndex() ); break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) @@ -537,7 +537,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage #endif // #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_ENSHROUD: { // Need to first undo the permanent Look laid down by DEMO_DESHROUD, then blast a shroud dollop. @@ -545,10 +545,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage ThePartitionManager->shroudMapForPlayer( ThePlayerList->getLocalPlayer()->getPlayerIndex() ); break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_FOV: { //DEBUG_ASSERTCRASH(!m_isChangingFOV, ("hmm, mismatched m_isChangingFOV")); @@ -556,17 +556,17 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage m_anchor = m_currentPos; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) // ------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_END_ADJUST_FOV: { // DEBUG_ASSERTCRASH(m_isChangingFOV, ("hmm, mismatched m_isChangingFOV")); m_isChangingFOV = false; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_SAVE_VIEW1: @@ -610,7 +610,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage } //----------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) case GameMessage::MSG_META_DEMO_LOCK_CAMERA_TO_PLANES: { Drawable *first = NULL; @@ -671,7 +671,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage disp = DESTROY_MESSAGE; break; } -#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // #if defined(RTS_DEBUG) } // end switch diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp index e0fbccc24f..b6932b0045 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp @@ -205,7 +205,7 @@ static const LookupListRec GameMessageMetaTypeNames[] = #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) { "HELP", GameMessage::MSG_META_HELP }, { "DEMO_TOGGLE_BEHIND_BUILDINGS", GameMessage::MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS }, @@ -330,12 +330,12 @@ static const LookupListRec GameMessageMetaTypeNames[] = { "DEBUG_OBJECT_ID_PERFORMANCE", GameMessage::MSG_META_DEBUG_OBJECT_ID_PERFORMANCE }, { "DEBUG_DRAWABLE_ID_PERFORMANCE", GameMessage::MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE }, { "DEBUG_SLEEPY_UPDATE_PERFORMANCE", GameMessage::MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE }, -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) { "DEMO_TOGGLE_AUDIODEBUG", GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG }, -#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS { "DEMO_PERFORM_STATISTICAL_DUMP", GameMessage::MSG_META_DEMO_PERFORM_STATISTICAL_DUMP }, #endif//DUMP_PERF_STATS diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index 170f18d005..ea77ff674d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -62,11 +62,11 @@ //----------------------------------------------------------------------------- // Lorenzen changed this to a member of SelectionTranslator, providing external access // name ly in rebuildholeexposedie, where we decide whether to create GLA Holes when hand-of-Godding -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +//#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) //static Bool TheHandOfGodSelectionMode = false; //#endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) static Bool TheHurtSelectionMode = false; static Bool TheDebugSelectionMode = false; #endif @@ -279,7 +279,7 @@ SelectionTranslator::SelectionTranslator() TheSelectionTranslator = this; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) m_HandOfGodSelectionMode = FALSE; #endif } @@ -830,7 +830,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (m_HandOfGodSelectionMode && draw) @@ -1276,7 +1276,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE: { @@ -1304,7 +1304,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEMO_TOGGLE_HURT_ME_MODE: { @@ -1318,7 +1318,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //----------------------------------------------------------------------------------------- case GameMessage::MSG_META_DEMO_DEBUG_SELECTION: { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp index a7ca35948a..6db8f3808d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp @@ -70,7 +70,7 @@ // PRIVATE FUNCTIONS ////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats extern ICoord2D TheMousePos; #endif @@ -231,7 +231,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage { // all window events have the position of the mouse as arg 0 ICoord2D mousePos = msg->getArgument( 0 )->pixel; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats TheMousePos.x = mousePos.x; TheMousePos.y = mousePos.y; #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp index aa44e82eba..069742ad16 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp @@ -339,7 +339,7 @@ void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& outMask) Bool addDrawableToList( Drawable *draw, void *userData ) { PickDrawableStruct *pds = (PickDrawableStruct *) userData; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_allowUnselectableSelection) { pds->drawableListToFill->push_back(draw); return TRUE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp index ee540455da..6927f775f5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp @@ -105,7 +105,7 @@ static void printFunc( char *text ) // AudioDebugDisplay //============================================================================ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void AudioDebugDisplay ( DebugDisplayInterface *dd, void *, FILE *fp = NULL ) { TheAudio->audioDebugDisplay( dd, NULL, fp ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp index a6b75be9e7..b34072f8b0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -537,7 +537,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter return true; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; } #endif }; @@ -567,7 +567,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter return false; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterWithinAttackRange"; } #endif }; @@ -873,7 +873,7 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { // ICK. This really nasty statement is used so that we only initialize this color once. diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index 5d6a9b2323..e3f64daab0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -353,7 +353,7 @@ void Path::xfer( Xfer *xfer ) xfer->xferBool(&m_blockedByAlly); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -2793,7 +2793,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye #endif #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI == AI_DEBUG_ZONES) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -2938,7 +2938,7 @@ void PathfindZoneManager::updateZonesForModify(PathfindCell **map, PathfindLayer //DEBUG_LOG(("Time to update zones %f, cells %d\n", timeToUpdate, (globalBounds.hi.x-globalBounds.lo.x)*(globalBounds.hi.y-globalBounds.lo.y))); #endif #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI==AI_DEBUG_ZONES) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -3262,7 +3262,7 @@ Bool PathfindLayer::isUnused(void) /** * Draws debug cell info. */ -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) void PathfindLayer::doDebugIcons(void) { if (isUnused()) return; extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -4696,7 +4696,7 @@ void Pathfinder::debugShowSearch( Bool pathFound ) if (!TheGlobalData->m_debugAI) { return; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); // show all explored cells for debugging @@ -5688,7 +5688,7 @@ Bool Pathfinder::queueForPath(ObjectID id) return true; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) void Pathfinder::doDebugIcons(void) { const Int FRAMES_TO_SHOW_OBSTACLES = 100; extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -5958,7 +5958,7 @@ void Pathfinder::processPathfindQueue(void) #endif #endif } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) doDebugIcons(); #endif @@ -6659,7 +6659,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe } // failure - goal cannot be reached -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) #ifdef INTENSE_DEBUG DEBUG_LOG(("internal find path FAILURE...\n")); #endif @@ -6807,7 +6807,7 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi path->optimizeGroundPath( isCrusher, pathDiameter ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -6871,7 +6871,7 @@ Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *go } } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -7152,7 +7152,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from, DEBUG_LOG((" time %d msec %d cells", (::GetTickCount()-startTimeMS), cellCount)); DEBUG_LOG((" SUCCESS\n")); #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool show = TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS; if (show) debugShowSearch(true); @@ -7324,7 +7324,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from, #ifdef INTENSE_DEBUG DEBUG_LOG((" FAILURE\n")); #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -7718,7 +7718,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu m_isTunneling = false; // construct and return path Path *path = buildHierachicalPath( from, goalCell ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS; show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS); if (show) { @@ -7753,7 +7753,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu return path; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) #if 0 Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS; show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS); @@ -7920,7 +7920,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu m_isTunneling = false; // construct and return path Path *path = buildHierachicalPath( from, closestCell ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) #if 0 if (TheGlobalData->m_debugAI) { @@ -7954,7 +7954,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu } // failure - goal cannot be reached -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -8423,7 +8423,7 @@ Bool Pathfinder::pathDestination( Object *obj, const LocomotorSet& locomotorSet } } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (closestCell) { debugShowSearch(true); *dest = closestPos; @@ -8978,7 +8978,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid)); DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); #endif -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) debugShowSearch(false); #endif @@ -9026,7 +9026,7 @@ Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask a // cleanup the path by checking line of sight path->optimize(obj, acceptableSurfaces, blocked); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -10386,7 +10386,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj, } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) debugShowSearch(true); #endif @@ -10462,7 +10462,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet // until goal is found. // -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); if (TheGlobalData->m_debugAI) { @@ -10485,7 +10485,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet info.radius = radius; info.considerTransient = blocked; info.acceptableSurfaces = locomotorSet.getValidSurfaces(); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { RGBColor color; color.setFromInt(0); @@ -10573,7 +10573,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet DEBUG_LOG(("patchPath Pathfind failed -- ")); DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI) { debugShowSearch(true); } @@ -10623,7 +10623,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot } */ if (m_isMapReady == false) return NULL; // Should always be ok. -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Int startTimeMS = ::GetTickCount(); #endif @@ -10813,7 +10813,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot #endif if (show) debugShowSearch(true); - #if defined RTS_DEBUG || defined RTS_INTERNAL + #if defined(RTS_DEBUG) //DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f)); #endif // put parent cell onto closed list - its evaluation is finished @@ -10927,7 +10927,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot cleanOpenAndClosedLists(); return path; } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount)); DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y)); DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); @@ -10950,7 +10950,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor { //CRCDEBUG_LOG(("Pathfinder::findSafePath()\n")); if (m_isMapReady == false) return NULL; // Should always be ok. -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Int startTimeMS = ::GetTickCount(); #endif @@ -11057,7 +11057,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor #endif if (show) debugShowSearch(true); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) //DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f)); #endif // construct and return path @@ -11088,7 +11088,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor TheScriptEngine->AppendDebugMessage("Overflowed Safe path", false); #endif #if 0 -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount)); DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y)); DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f)); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp index 20169b28e0..676380ca7c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp @@ -628,7 +628,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS) { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); @@ -2603,7 +2603,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu AIUpdateInterface *ai = unit->getAIUpdateInterface(); if (ai) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Coord3D pos = *unit->getPosition(); Coord3D to = teamProto->getTemplateInfo()->m_homeLocation; DEBUG_LOG(("Moving unit from %f,%f to %f,%f\n", pos.x, pos.y , to.x, to.y )); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp index ecac82a36d..9eccc23c26 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp @@ -677,7 +677,7 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName, Real c = cos(angle); // TheSuperHackers @info helmutbuhler 21/04/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_LOG(("buildAIBaseDefenseStructure -- Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c)); DEBUG_LOG(("buildAIBaseDefenseStructure -- Offset is %f %f, Final Position is %f, %f \n", offset.x, offset.y, @@ -808,7 +808,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr AIUpdateInterface *ai = unit->getAIUpdateInterface(); if (ai) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Coord3D pos = *unit->getPosition(); Coord3D to = teamProto->getTemplateInfo()->m_homeLocation; DEBUG_LOG(("Moving unit from %f,%f to %f,%f\n", pos.x, pos.y , to.x, to.y )); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp index b96e72695b..609e8e6110 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -853,7 +853,7 @@ AsciiString AIStateMachine::getCurrentStateName(void) const StateReturnType AIStateMachine::updateStateMachine() { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) Bool idle = getOwner()->getAI()->isIdle(); if( !idle && TheGlobalData->m_extraLogging ) DEBUG_LOG( ("%d - %s::update() start - %s", TheGameLogic->getFrame(), getCurrentStateName().str(), getOwner()->getTemplate()->getName().str() ) ); @@ -873,7 +873,7 @@ StateReturnType AIStateMachine::updateStateMachine() if (status==STATE_CONTINUE) { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( !idle && TheGlobalData->m_extraLogging ) DEBUG_LOG( (" - RETURN EARLY STATE_CONTINUE\n") ); #endif @@ -887,7 +887,7 @@ StateReturnType AIStateMachine::updateStateMachine() StateReturnType retType = StateMachine::updateStateMachine(); //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) AsciiString result; if( TheGlobalData->m_extraLogging ) { @@ -4145,7 +4145,7 @@ StateReturnType AIFollowWaypointPathState::update() if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) { if (m_currentWaypoint) { // TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str())); #endif @@ -4222,7 +4222,7 @@ StateReturnType AIFollowWaypointPathState::update() if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) { if (m_currentWaypoint) { // TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str())); #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index ddc0f58ac9..e01105498d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -684,7 +684,7 @@ UpdateSleepTime TurretAI::updateTurretAI() { USE_PERF_TIMER(TurretAI) -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(!m_enabled || m_turretStateMachine->peekSleepTill() == 0 || m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret")); @@ -743,7 +743,7 @@ UpdateSleepTime TurretAI::updateTurretAI() m_sleepUntil = now + subMachineSleep; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(!m_enabled || m_turretStateMachine->peekSleepTill() == 0 || m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret")); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp index 62d523e409..a186fc683b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp @@ -449,7 +449,7 @@ Bool DumbProjectileBehavior::calcFlightPath(Bool recalcNumSegments) flightCurve.getSegmentPoints( m_flightPathSegments, &m_flightPath ); DEBUG_ASSERTCRASH(m_flightPathSegments == m_flightPath.size(), ("m_flightPathSegments mismatch")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( TheGlobalData->m_debugProjectilePath ) displayFlightPath(); #endif @@ -696,7 +696,7 @@ UpdateSleepTime DumbProjectileBehavior::update() // ------------------------------------------------------------------------------------------------ /** displayFlightPath for debugging */ // ------------------------------------------------------------------------------------------------ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void DumbProjectileBehavior::displayFlightPath() { extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp index 9fa5ae720b..55525ee75a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp @@ -91,7 +91,7 @@ Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex, const Coord3D *targetPos ) { // TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited")); #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 084ee7b3ef..9488e48806 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -301,7 +301,7 @@ void OpenContain::addToContain( Object *rider ) wasSelected = TRUE; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( !isValidContainerFor( rider, false ) ) { Object *reportObject = rider; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp index 5e6fcf4d9f..2741cd86d6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp @@ -102,7 +102,7 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo ) return; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) if(TheSelectionTranslator->isHandOfGodSelectionMode()) { if ( getObject()->isKindOf( KINDOF_STRUCTURE ) ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp index 9b1681e0a1..334b84b754 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -217,7 +217,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu m_visionSpiedMask (PLAYERMASK_NONE), m_numTriggerAreasActive(0) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_hasDiedAlready = false; #endif //Modules have not been created yet! @@ -564,7 +564,7 @@ void Object::initObject() // Kris -- All missiles must be projectiles! This is the perfect place to assert them! // srj: yes, but only in debug... -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( !isKindOf( KINDOF_PROJECTILE ) ) { if( isKindOf( KINDOF_SMALL_MISSILE ) || isKindOf( KINDOF_BALLISTIC_MISSILE ) ) @@ -4380,7 +4380,7 @@ void Object::xfer( Xfer *xfer ) //m_body; //m_ai; //m_physics; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //m_hasDiedAlready; #endif @@ -4546,7 +4546,7 @@ void Object::onDie( DamageInfo *damageInfo ) checkAndDetonateBoobyTrap(NULL);// Already dying, so no need to handle death case of explosion -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) DEBUG_ASSERTCRASH(m_hasDiedAlready == false, ("Object::onDie has been called multiple times. This is invalid. jkmcd")); m_hasDiedAlready = true; #endif @@ -5096,7 +5096,7 @@ void Object::unshroud() //------------------------------------------------------------------------------------------------- Real Object::getVisionRange() const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { Vector3 pos(m_visionRange, 0, 0); @@ -5132,7 +5132,7 @@ Real Object::getShroudClearingRange() const shroudClearingRange = getGeometryInfo().getBoundingCircleRadius(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { Vector3 pos(shroudClearingRange, 0, 0); @@ -5189,7 +5189,7 @@ void Object::setShroudClearingRange( Real newShroudClearingRange ) //------------------------------------------------------------------------------------------------- Real Object::getShroudRange() const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugVisibility) { Vector3 pos(m_shroudRange, 0, 0); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 2a107bd5f8..49a10b94b1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -2137,7 +2137,7 @@ void PartitionData::invalidateShroudedStatusForAllPlayers() } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) static AsciiString theObjName; #endif @@ -2151,7 +2151,7 @@ Int PartitionData::calcMaxCoiForShape(GeometryType geom, Real majorRadius, Real //M Lorenzen 8/26/03 // if (isSmall) // { -// #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +// #if defined(RTS_DEBUG) // Int chk = calcMaxCoiForShape(geom, majorRadius, minorRadius, false); // DEBUG_ASSERTCRASH(chk <= 4, ("Small objects should be <= 4 cells, but I calced %s as %d\n",theObjName.str(),chk)); // #endif @@ -2199,7 +2199,7 @@ Int PartitionData::calcMaxCoiForObject() Real majorRadius = obj->getGeometryInfo().getMajorRadius(); Real minorRadius = obj->getGeometryInfo().getMinorRadius(); Bool isSmall = obj->getGeometryInfo().getIsSmall(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) theObjName = obj->getTemplate()->getName(); #endif return calcMaxCoiForShape(geom, majorRadius, minorRadius, isSmall); @@ -2785,7 +2785,7 @@ void PartitionManager::update() processPendingUndoShroudRevealQueue(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugThreatMap) { if (TheGameLogic->getFrame() % TheGlobalData->m_debugThreatMapTileDuration) @@ -2845,7 +2845,7 @@ void PartitionManager::update() } } } -#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#endif // defined(RTS_DEBUG) } // end update //------------------------------------------------------------------------------ @@ -3200,7 +3200,7 @@ void PartitionManager::calcRadiusVec() } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Int total = 0; for (Int i = 0; i <= m_maxGcoRadius; ++i) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp index 963e5c04e3..5156e45d27 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp @@ -287,7 +287,7 @@ Bool SpecialPowerModule::isModuleForPower( const SpecialPowerTemplate *specialPo //------------------------------------------------------------------------------------------------- Bool SpecialPowerModule::isReady() const { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) // this is a cheat ... remove this for release! if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) return TRUE; @@ -325,7 +325,7 @@ Real SpecialPowerModule::getPercentReady() const return 0.99999f; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) return 1.0f; #endif @@ -387,7 +387,7 @@ Bool SpecialPowerModule::isScriptOnly() const //------------------------------------------------------------------------------------------------- void SpecialPowerModule::startPowerRecharge() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) // this is a cheat ... remove this for release! if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) return; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp index 85d4bf6239..bf339c58e6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -149,7 +149,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter public: PartitionFilterHasParkingPlace(ObjectID id) : m_id(id) { } protected: -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; } #endif virtual Bool allow(Object *objOther) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index 6c03043ba6..be39ae7e9c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -902,7 +902,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter PartitionFilterIsValidCarriage(Object* obj, const RailroadBehaviorModuleData* data) : m_obj(obj), m_data(data) { } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; } #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp index 09c6e1e853..e1fab79ab3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp @@ -42,7 +42,7 @@ #include "GameClient/InGameUI.h" -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) #define NO_DEBUG_SUPPLY_STATE #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp index e645bd874e..56b848bc51 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp @@ -51,7 +51,7 @@ class PartitionFilterFlammable : public PartitionFilter PartitionFilterFlammable(){ } virtual Bool allow(Object *objOther); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterFlammable"; } #endif }; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 89ebfa138a..fc1758c69e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -74,7 +74,7 @@ class PartitionFilterHordeMember : public PartitionFilter PartitionFilterHordeMember(Object* obj, const HordeUpdateModuleData* data) : m_obj(obj), m_data(data) { } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterHordeMember"; } #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp index 22ce07a6a6..46de1c8c92 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp @@ -215,7 +215,7 @@ Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const Specia return FALSE; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || m_doorState == DOOR_OPEN, ("door is not fully open when specialpower is fired!")); #endif @@ -262,7 +262,7 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void ) switchToState(m_timeoutState); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || !(m_specialPowerModule->isReady() && m_doorState != DOOR_OPEN), ("door is not fully open when specialpower is ready!")); #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp index b680fe4e2f..417e361d84 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp @@ -317,7 +317,7 @@ Real PhysicsBehavior::getZFriction() const void PhysicsBehavior::applyForce( const Coord3D *force ) { // TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC +#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n")); #endif if (_isnan(force->x) || _isnan(force->y) || _isnan(force->z)) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp index fa3ce8f3f4..815cd9d47b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp @@ -339,7 +339,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter return true; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; } #endif }; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp index 09d173d51f..cf0ed253b4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp @@ -116,7 +116,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter virtual Bool allow(Object *objOther); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; } #endif }; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp index c45127202f..5772aee5c9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp @@ -71,7 +71,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter public: PartitionFilterTensileFormationMember( Object* obj ) : m_obj( obj ) { } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; } #endif virtual Bool allow( Object *objOther ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp index e5e40bb329..df0c80774a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp @@ -111,7 +111,7 @@ void UpdateModule::xfer( Xfer *xfer ) // extend base class BehaviorModule::xfer( xfer ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) /* this is a fix for the following scenario: diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp index f63a6b73de..86f33017ae 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp @@ -760,7 +760,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) AsciiString targetStr; if( TheGlobalData->m_extraLogging ) { @@ -783,7 +783,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate if (sourceObj == NULL || (victimObj == NULL && victimPos == NULL)) { //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("FAIL 1 (sourceObj %d == NULL || (victimObj %d == NULL && victimPos %d == NULL)\n", sourceObj != 0, victimObj != 0, victimPos != 0) ); #endif @@ -862,7 +862,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate //DEBUG_ASSERTCRASH(distSqr < 5*5 || distSqr < attackRangeSqr*1.2f, ("*** victim is out of range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(attackRangeSqr))); //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("FAIL 2 (distSqr %.2f > attackRangeSqr %.2f)\n", distSqr, attackRangeSqr ) ); #endif @@ -884,7 +884,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate DEBUG_ASSERTCRASH(distSqr > minAttackRangeSqr*0.8f, ("*** victim is closer than min attack range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(minAttackRangeSqr))); //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("FAIL 3 (distSqr %.2f< minAttackRangeSqr %.2f - 0.5f && !isProjectileDetonation %d)\n", distSqr, minAttackRangeSqr, isProjectileDetonation ) ); #endif @@ -1051,7 +1051,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate } //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("EARLY 4 (delayed damage applied now)\n") ); #endif @@ -1072,7 +1072,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate } //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("EARLY 5 (delaying damage applied until frame %d)\n", when ) ); #endif @@ -1163,7 +1163,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate } //-extraLogging - #if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) + #if defined(RTS_DEBUG) if( TheGlobalData->m_extraLogging ) DEBUG_LOG( ("DONE\n") ); #endif @@ -1715,7 +1715,7 @@ void WeaponStore::postProcessLoad() if (weapon->m_projectileName.isNone()) weapon->m_projectileName.clear(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!weapon->getFireSound().getEventName().isEmpty() && weapon->getFireSound().getEventName().compareNoCase("NoSound") != 0) { DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&weapon->getFireSound()), ("Invalid FireSound %s in Weapon '%s'.", weapon->getFireSound().getEventName().str(), weapon->getName().str())); @@ -2989,7 +2989,7 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v #endif } -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) // Real muzzleHeight = attachTransform.Get_Z_Translation(); // DEBUG_ASSERTCRASH( muzzleHeight > 0.001f, ("YOUR TURRET HAS A VERY LOW PROJECTILE LAUNCH POSITION, BUT FOUND A VALID BONE. DID YOU PICK THE WRONG ONE? %s", launcher->getTemplate()->getName().str())); //#endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp index 2cd1c9310f..e32db66969 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp @@ -3256,7 +3256,7 @@ void ScriptActions::doMergeTeamIntoTeam(const AsciiString& teamSrcName, const As //------------------------------------------------------------------------------------------------- void ScriptActions::doDisableInput() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_disableScriptedInputDisabling) #endif { @@ -3911,7 +3911,7 @@ void ScriptActions::doUnfreezeTime(void) //------------------------------------------------------------------------------------------------- void ScriptActions::doMilitaryCaption(const AsciiString& briefing, Int duration) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_disableMilitaryCaption) duration = 1; #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index ac9abfe9a6..a337ada8cc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -6372,7 +6372,7 @@ void ScriptEngine::setCounter( ScriptAction *pAction ) //------------------------------------------------------------------------------------------------- void ScriptEngine::setFade( ScriptAction *pAction ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_disableCameraFade) { m_fade = FADE_NONE; @@ -9335,7 +9335,7 @@ void ScriptEngine::loadPostProcess( void ) } // end loadPostProcess -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) void ScriptEngine::debugVictory( void ) { ScriptAction *action = newInstance(ScriptAction)(ScriptAction::VICTORY); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 2ee2eb8895..7c51aba5b2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -454,7 +454,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) case GameMessage::MSG_CLEAR_GAME_DATA: { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheDisplay && TheGlobalData->m_dumpAssetUsage) TheDisplay->dumpAssetUsage(TheGlobalData->m_mapName.str()); #endif @@ -934,7 +934,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) break; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined (_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined (_ALLOW_DEBUG_CHEATS_IN_RELEASE) //--------------------------------------------------------------------------------------------- case GameMessage::MSG_DEBUG_KILL_SELECTION: { @@ -2002,13 +2002,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) if (thisPlayer->isLocalPlayer()) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // don't even put this in release, cause someone might hack it. if (!TheDebugIgnoreSyncErrors) { #endif m_shouldValidateCRCs = TRUE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) } #endif } diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp index 744b5ebec8..aa32354aff 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp @@ -206,14 +206,14 @@ void Connection::sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay) { if (ref != NULL) { /* -#if ((defined(RTS_DEBUG)) || (defined(RTS_INTERNAL))) +#if defined(RTS_DEBUG) if (msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) { DEBUG_LOG(("Connection::sendNetCommandMsg - added game command %d to net command list for frame %d.\n", msg->getID(), msg->getExecutionFrame())); } else if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) { DEBUG_LOG(("Connection::sendNetCommandMsg - added frame info for frame %d\n", msg->getExecutionFrame())); } -#endif // RTS_DEBUG || RTS_INTERNAL +#endif // RTS_DEBUG */ ref->setRelay(relay); @@ -371,7 +371,7 @@ NetCommandRef * Connection::processAck(UnsignedShort commandID, UnsignedByte ori return NULL; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool doDebug = FALSE; if (temp->getCommand()->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) { doDebug = TRUE; @@ -384,7 +384,7 @@ NetCommandRef * Connection::processAck(UnsignedShort commandID, UnsignedByte ori m_averageLatency += lat / CONNECTION_LATENCY_HISTORY_LENGTH; m_latencies[index] = lat; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug == TRUE) { DEBUG_LOG(("Connection::processAck - disconnect frame command %d found, removing from command list.\n", commandID)); } @@ -411,7 +411,7 @@ void Connection::doRetryMetrics() { } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void Connection::debugPrintCommands() { NetCommandRef *ref = m_netCommandList->getFirstMessage(); while (ref != NULL) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp index 3877a3ac16..3b22ea06fa 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp @@ -832,14 +832,14 @@ void ConnectionManager::processFrameInfo(NetFrameCommandMsg *msg) { * it doesn't keep resending it. */ void ConnectionManager::processAckStage1(NetCommandMsg *msg) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE; #endif UnsignedByte playerID = msg->getPlayerID(); NetCommandRef *ref = NULL; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug == TRUE) { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processAck - processing ack for command %d from player %d\n", ((NetAckStage1CommandMsg *)msg)->getCommandID(), playerID)); } @@ -1040,7 +1040,7 @@ void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) { } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE; #endif @@ -1050,7 +1050,7 @@ void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) { ackmsg = bothmsg; commandID = bothmsg->getCommandID(); originalPlayerID = bothmsg->getOriginalPlayerID(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug) { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack both for command %d from player %d\n", bothmsg->getCommandID(), bothmsg->getOriginalPlayerID())); } @@ -1060,7 +1060,7 @@ void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) { ackmsg = stage1msg; commandID = stage1msg->getCommandID(); originalPlayerID = stage1msg->getOriginalPlayerID(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (doDebug) { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack stage 1 for command %d from player %d\n", stage1msg->getCommandID(), stage1msg->getOriginalPlayerID())); } @@ -2317,7 +2317,7 @@ Int ConnectionManager::getSlotAverageFPS(Int slot) { return m_fpsAverages[slot]; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void ConnectionManager::debugPrintConnectionCommands() { DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - begin commands\n")); for (Int i = 0; i < MAX_SLOTS; ++i) { @@ -2349,7 +2349,7 @@ void ConnectionManager::notifyOthersOfCurrentFrame(Int frame) { msg->detach(); DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - start screen on debug stuff\n")); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) debugPrintConnectionCommands(); #endif } diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp index 94ef2f7c83..9e2ed1253e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp @@ -575,7 +575,7 @@ void GameSpyStagingRoom::startGame(Int gameID) } } -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) if (numHumans < 2) { launchGame(); @@ -583,7 +583,7 @@ void GameSpyStagingRoom::startGame(Int gameID) TheGameSpyInfo->leaveStagingRoom(); } else -//#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#endif // defined(RTS_DEBUG) { TheNAT = NEW NAT(); TheNAT->attachSlotList(m_slot, getLocalSlotNum(), m_localIP); diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp index 1aeda9e891..9ef3bff860 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp @@ -135,7 +135,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo case L'r': case L'R': remainder.nextToken(&token); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) if (token.compareNoCase(L"raw") == 0) { // Send raw IRC commands (Ascii only) @@ -149,7 +149,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo } #endif break; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) case L'k': case L'K': remainder.nextToken(&token); @@ -194,7 +194,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo } return true; // show it anyway } -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) else if (token.compareNoCase(L"oper") == 0) { // Send raw IRC oper command @@ -245,7 +245,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo return true; // show it anyway } break; -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) case L'c': case L'C': remainder.nextToken(&token); @@ -262,7 +262,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo return true; // show it anyway } break; -#endif // RTS_DEBUG || defined RTS_INTERNAL +#endif // RTS_DEBUG } } */ diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp index ee01616839..60830041de 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp @@ -258,7 +258,7 @@ AsciiString GetMessageTypeString(UnsignedInt type) void LANAPI::checkMOTD( void ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_useLocalMOTD) { // for a playtest, let's log some play statistics, eh? diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp index 05fd55fde5..10fe65b78e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp @@ -232,7 +232,7 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP ) Bool canJoin = true; // see if the CRCs match -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_netMinPlayers > 0) { #endif /* if (msg->GameToJoin.iniCRC != TheGlobalData->m_iniCRC || @@ -248,7 +248,7 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP ) canJoin = false; } */ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) } #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp index bf8b42b27d..e7a41405b6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp @@ -571,7 +571,7 @@ void NAT::establishConnectionPaths() { } // sanity check -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) for (i = 0; i < m_numNodes; ++i) { DEBUG_ASSERTCRASH(connectionAssigned[i] == TRUE, ("connection number %d not assigned", i)); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp index 6c1318260a..b24f5e7c46 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp @@ -147,7 +147,7 @@ class Network : public NetworkInterface void loadProgressComplete( void ); void sendTimeOutGameStart( void ); -#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) +#if defined(RTS_DEBUG) // Disconnect screen testing virtual void toggleNetworkOn(); #endif @@ -214,7 +214,7 @@ class Network : public NetworkInterface std::list m_playersToDisconnect; GameWindow *m_messageWindow; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_networkOn; #endif }; @@ -274,7 +274,7 @@ Network::Network() m_conMgr = NULL; m_messageWindow = NULL; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_networkOn = TRUE; #endif } @@ -357,7 +357,7 @@ void Network::init() DEBUG_LOG(("FRAMES_TO_KEEP = %d\n", FRAMES_TO_KEEP)); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_networkOn = TRUE; #endif @@ -687,7 +687,7 @@ void Network::update( void ) // m_frameDataReady = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (m_networkOn == FALSE) { return; } @@ -721,7 +721,7 @@ void Network::update( void ) void Network::liteupdate() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (m_networkOn == FALSE) { return; } @@ -745,7 +745,7 @@ void Network::endOfGameCheck() { DEBUG_LOG(("Network::endOfGameCheck - about to show the shell\n")); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) else { m_conMgr->debugPrintConnectionCommands(); } @@ -1011,7 +1011,7 @@ Int Network::getSlotAverageFPS(Int slot) { return -1; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void Network::toggleNetworkOn() { if (m_networkOn == TRUE) { m_networkOn = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp index d3556b8dd5..baf8e3aa06 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp @@ -131,7 +131,7 @@ Bool Transport::init( UnsignedInt ip, UnsignedShort port ) { m_outBuffer[i].length = 0; m_inBuffer[i].length = 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_delayedInBuffer[i].message.length = 0; #endif } @@ -149,7 +149,7 @@ Bool Transport::init( UnsignedInt ip, UnsignedShort port ) m_port = port; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_latencyAverage > 0 || TheGlobalData->m_latencyNoise) m_useLatency = true; @@ -245,7 +245,7 @@ Bool Transport::doSend() { } } // for (i=0; iRead(buf, MAX_MESSAGE_LEN, &from)) > 0 ) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // Packet loss simulation if (m_usePacketLoss) { @@ -329,7 +329,7 @@ Bool Transport::doRecv() for (int i=0; i SetAsciiString; typedef SetAsciiString::iterator SetAsciiStringIt; SetAsciiString m_allEventsLoaded; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h index 741f926519..bce3cb8b14 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -176,7 +176,7 @@ struct ModelConditionInfo Int m_fxBone; ///< the FX bone for this barrel (zero == no bone) Int m_muzzleFlashBone; ///< the muzzle-flash subobj bone for this barrel (zero == none) Matrix3D m_projectileOffsetMtx; ///< where the projectile fires from -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString m_muzzleFlashBoneName; #endif @@ -191,7 +191,7 @@ struct ModelConditionInfo m_fxBone = 0; m_muzzleFlashBone = 0; m_projectileOffsetMtx.Make_Identity(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) m_muzzleFlashBoneName.clear(); #endif } @@ -200,7 +200,7 @@ struct ModelConditionInfo }; typedef std::vector WeaponBarrelInfoVec; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString m_description; #endif std::vector m_conditionsYesVec; @@ -249,7 +249,7 @@ struct ModelConditionInfo inline Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(m_conditionsYesVec.size() > 0, ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); } inline const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) inline AsciiString getDescription() const { return m_description; } #endif @@ -357,7 +357,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface virtual void releaseShadows(void); ///< frees all shadow resources used by this module - used by Options screen. virtual void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void getRenderCost(RenderCost & rc) const; ///< estimates the render cost of this draw module void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const; #endif @@ -520,7 +520,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface void adjustAnimSpeedToMovementSpeed(); static void hideAllMuzzleFlashes(const ModelConditionInfo* state, RenderObjClass* renderObject); void hideAllHeadlights(Bool hide); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //art wants to see buildings without flags as a test. +#if defined(RTS_DEBUG) //art wants to see buildings without flags as a test. void hideGarrisonFlags(Bool hide); #endif }; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h index 6bc1242cf6..9d7136cc59 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -33,7 +33,7 @@ #include "vertmaterial.h" #include "Lib/BaseType.h" -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) struct DebugIcon; // /// W3DDebugIcons: Draws huge numbers of debug icons for pathfinding quickly. @@ -76,6 +76,6 @@ class W3DDebugIcons : public RenderObjClass public: static void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); }; -#endif // RTS_DEBUG or RTS_INTERNAL +#endif // RTS_DEBUG #endif // end __W3D_DEBUG_ICONS_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index 132596da91..300a957b7e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -71,7 +71,7 @@ class W3DDisplay : public Display virtual void getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres, Int *bitDepth); ///removeShadow(this);} ///m_preloadReport) { @@ -123,7 +123,7 @@ AudioHandle MilesAudioManager::addAudioEvent( const AudioEventRTS *eventToAdd ) } #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //------------------------------------------------------------------------------------------------- void MilesAudioManager::audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp ) { @@ -463,7 +463,7 @@ void MilesAudioManager::postProcessLoad() //------------------------------------------------------------------------------------------------- void MilesAudioManager::reset() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) dumpAllAssetsUsed(); m_allEventsLoaded.clear(); #endif @@ -3060,7 +3060,7 @@ void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted ) //------------------------------------------------------------------------------------------------- U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (sizeof(U32) != sizeof(File*)) { RELEASE_CRASH(("streamingFileOpen - This function requires work in order to compile on non 32-bit platforms.\n")); } @@ -3320,7 +3320,7 @@ Bool AudioFileCache::freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNee } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //------------------------------------------------------------------------------------------------- void MilesAudioManager::dumpAllAssetsUsed() { diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp index 643cb35424..b3d8a659f6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp @@ -1267,7 +1267,7 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain ) //------------------------------------------------------------------------------------------------- void W3DRadar::clearShroud() { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_shroudOn) return; #endif @@ -1287,7 +1287,7 @@ void W3DRadar::clearShroud() //------------------------------------------------------------------------------------------------- void W3DRadar::setShroudLevel(Int shroudX, Int shroudY, CellShroudStatus setting) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_shroudOn) return; #endif @@ -1424,7 +1424,7 @@ void W3DRadar::draw( Int pixelX, Int pixelY, Int width, Int height ) TheDisplay->drawImage( m_overlayImage, ul.x, ul.y, lr.x, lr.y ); // draw the shroud image -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( TheGlobalData->m_shroudOn ) #else if (true) diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp index 580a2aa693..e0e18a6cad 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp @@ -315,7 +315,7 @@ BaseHeightMapRenderObjClass::BaseHeightMapRenderObjClass(void) #ifdef DO_ROADS m_roadBuffer = NEW W3DRoadBuffer; #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) m_shroud = NEW W3DShroud; #else diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp index f614b9d3af..98823dd76c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp @@ -80,7 +80,7 @@ static inline Bool isValidTimeToCalcLogicStuff() //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(DEBUG_CRC) && (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(DEBUG_CRC) && defined(RTS_DEBUG) #include class LogClass { @@ -199,11 +199,11 @@ LogClass BonePosLog("bonePositions.txt"); //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) extern AsciiString TheThingTemplateBeingParsedName; #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) extern Real TheSkateDistOverride; #endif @@ -470,7 +470,7 @@ static Bool findSingleSubObj(RenderObjClass* robj, const AsciiString& boneName, if (test == childObject) { boneIndex = robj->Get_Sub_Object_Bone_Index(0, subObj); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) test->Release_Ref(); test = robj->Get_Sub_Object_On_Bone(0, boneIndex); DEBUG_ASSERTCRASH(test != NULL && test == childObject, ("*** ASSET ERROR: Hmm, bone problem")); @@ -737,7 +737,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const // since this class has no idea which object it refers to, it must assume that the projectilelaunchbonename // is required if the fxBoneName is specified // this is not always true, since some weapons have no launched projectiles, hence the caveat in the assert message -//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +//#if defined(RTS_DEBUG) // if ( // ( m_modelName.startsWith("UV") || m_modelName.startsWith("NV") || m_modelName.startsWith("AV") || // m_modelName.startsWith("uv") || m_modelName.startsWith("nv") || m_modelName.startsWith("av") @@ -767,7 +767,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const { sprintf(buffer, "%s%02d", mfName.str(), i); findPristineBone(NAMEKEY(buffer), &info.m_muzzleFlashBone); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) if (info.m_muzzleFlashBone) info.m_muzzleFlashBoneName = buffer; #endif @@ -815,7 +815,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const if (!mfName.isEmpty()) findPristineBone(NAMEKEY(mfName), &info.m_muzzleFlashBone); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) +#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) if (info.m_muzzleFlashBone) info.m_muzzleFlashBoneName = mfName; #endif @@ -980,7 +980,7 @@ void ModelConditionInfo::loadAnimations() const void ModelConditionInfo::clear() { int i; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_description.clear(); #endif m_conditionsYesVec.clear(); @@ -1476,7 +1476,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void info.m_conditionsYesVec.clear(); info.m_conditionsYesVec.push_back(blankConditions); - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) info.m_description.clear(); info.m_description.concat(TheThingTemplateBeingParsedName); info.m_description.concat(" DEFAULT"); @@ -1507,7 +1507,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void } info.m_transitionSig = buildTransitionSig(firstKey, secondKey); - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) info.m_description.clear(); info.m_description.concat(TheThingTemplateBeingParsedName); info.m_description.concat(" TRANSITION: "); @@ -1531,7 +1531,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void ModelConditionFlags conditionsYes; - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) AsciiString description; conditionsYes.parse(ini, &description); @@ -1583,7 +1583,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void // } ModelConditionFlags conditionsYes; - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING) + #if defined(RTS_DEBUG) || defined(DEBUG_CRASHING) AsciiString description; conditionsYes.parse(ini, &description); @@ -1883,18 +1883,18 @@ void W3DModelDraw::setShadowsEnabled(Bool enable) } /**collect some stats about the rendering cost of this draw module */ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DModelDraw::getRenderCost(RenderCost & rc) const { getRenderCostRecursive(rc,m_renderObject); if (m_shadow) m_shadow->getRenderCost(rc); } -#endif //RTS_DEBUG || RTS_INTERNAL +#endif //RTS_DEBUG /**recurse through sub-objs to collect stats about the rendering cost of this draw module */ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const { if (robj == NULL) return; @@ -1931,7 +1931,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) } } } -#endif //RTS_DEBUG || RTS_INTERNAL +#endif //RTS_DEBUG //------------------------------------------------------------------------------------------------- void W3DModelDraw::setFullyObscuredByShroud(Bool fullyObscured) @@ -2256,7 +2256,7 @@ Real W3DModelDraw::getCurAnimDistanceCovered() const if (m_curState != NULL && m_whichAnimInCurState >= 0) { const W3DAnimationInfo& animInfo = m_curState->m_animations[m_whichAnimInCurState]; - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) if (TheSkateDistOverride != 0.0f) return TheSkateDistOverride; #endif @@ -2817,7 +2817,7 @@ void W3DModelDraw::nukeCurrentRender(Matrix3D* xform) } //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //art wants to see buildings without flags as a test. +#if defined(RTS_DEBUG) //art wants to see buildings without flags as a test. void W3DModelDraw::hideGarrisonFlags(Bool hide) { if (!m_renderObject) @@ -3043,7 +3043,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState) rebuildWeaponRecoilInfo(newState); doHideShowSubObjs(&newState->m_hideShowVec); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //art wants to see buildings without flags as a test. +#if defined(RTS_DEBUG) //art wants to see buildings without flags as a test. if (TheGlobalData->m_hideGarrisonFlags && draw->isKindOf(KINDOF_STRUCTURE)) hideGarrisonFlags(TRUE); #endif @@ -3273,7 +3273,7 @@ Bool W3DModelDraw::getProjectileLaunchOffset( //BONEPOS_LOG(("can't find best info\n")); return false; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) CRCDEBUG_LOG(("W3DModelDraw::getProjectileLaunchOffset() for %s\n", stateToUse->getDescription().str())); #endif @@ -4294,7 +4294,7 @@ void W3DModelDrawModuleData::xfer( Xfer *x ) { ModelConditionInfo *info = &(*it); x->xferByte(&(info->m_validStuff)); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) x->xferAsciiString(&(info->m_description)); #endif if (info->m_validStuff) diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp index 67a60eb444..58ea8085cc 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp @@ -2099,7 +2099,7 @@ void W3DProjectedShadowManager::removeAllShadows(void) } // end for } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DProjectedShadow::getRenderCost(RenderCost & rc) const { if (TheGlobalData->m_useShadowDecals && m_isEnabled && !m_isInvisibleEnabled) diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index 472a964156..faf970f978 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -1272,7 +1272,7 @@ void W3DVolumetricShadow::updateOptimalExtrusionPadding(void) // getRenderCost ============================================================ // Returns number of draw calls for this shadow. // ============================================================================ -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DVolumetricShadow::getRenderCost(RenderCost & rc) const { Int drawCount = 0; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp index 0a58a7aeae..cd164307ce 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp @@ -234,7 +234,7 @@ TextureClass *W3DAssetManager::Get_Texture( // extern std::vector preloadTextureNamesGlobalHack; // preloadTextureNamesGlobalHack.push_back(tex->Get_Texture_Name()); // } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) if (TheGlobalData->m_preloadReport) { //loading a new asset and app is requesting a log of all loaded assets. @@ -995,7 +995,7 @@ bool W3DAssetManager::Load_3D_Assets( const char * filename ) bool result = WW3DAssetManager::Load_3D_Assets(filename); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (result && TheGlobalData->m_preloadReport) { //loading a new asset and app is requesting a log of all loaded assets. diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp index 5449d1968a..23680a4e25 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp @@ -53,7 +53,7 @@ #include "Common/MapObject.h" #include "WW3D2/dx8wrapper.h" -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Texturing, no zbuffer, disabled zbuffer write, primary gradient, alpha blending #define SC_OPAQUE ( SHADE_CNST(ShaderClass::PASS_ALWAYS, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \ @@ -312,4 +312,4 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo) } } -#endif // RTS_DEBUG or RTS_INTERNAL \ No newline at end of file +#endif // RTS_DEBUG \ No newline at end of file diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index e61819b5c9..d94b461dea 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -320,7 +320,7 @@ void StatDumpClass::dumpStats( Bool brief, Bool flagSpikes ) fprintf( m_fp, "\n" ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if ( ! beBrief ) { TheAudio->audioDebugDisplay( NULL, NULL, m_fp ); @@ -399,7 +399,7 @@ W3DDisplay::W3DDisplay() m_2DScene = NULL; m_3DInterfaceScene = NULL; m_averageFPS = TheGlobalData->m_framesPerSecondLimit; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_timerAtCumuFPSStart = 0; #endif for (i=0; im_wireframe ) m_3DScene->Set_Polygon_Mode( SceneClass::LINE ); #endif @@ -905,7 +905,7 @@ void W3DDisplay::updateAverageFPS(void) Int64 freq64 = getPerformanceCounterFrequency(); Int64 time64 = getPerformanceCounter(); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGameLogic->getFrame() == START_CUMU_FRAME) { m_timerAtCumuFPSStart = time64; @@ -947,7 +947,7 @@ void W3DDisplay::updateAverageFPS(void) lastUpdateTime64 = time64; } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats ICoord2D TheMousePos; #endif @@ -1041,7 +1041,7 @@ void W3DDisplay::gatherDebugStats( void ) double ms = 1000.0f/fps; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) double cumuTime = ((double)(time64 - m_timerAtCumuFPSStart) / (double)(freq64)); if (cumuTime < 0.0) cumuTime = 0.0; Int numFrames = (Int)TheGameLogic->getFrame() - (Int)START_CUMU_FRAME; @@ -1339,7 +1339,7 @@ void W3DDisplay::gatherDebugStats( void ) } Object *object = NULL; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //debug hack to view object under mouse stats +#if defined(RTS_DEBUG) //debug hack to view object under mouse stats Drawable *draw = TheTacticalView->pickDrawable(&TheMousePos, FALSE, (PickType)0xffffffff ); #else Drawable *draw = TheGameClient->findDrawableByID( TheInGameUI->getMousedOverDrawableID() ); @@ -1467,7 +1467,7 @@ void W3DDisplay::gatherDebugStats( void ) // (gth) compute some stats about the rendering cost of this drawable -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) RenderCost rcost; for (DrawModule** dm = draw->getDrawModules(); *dm; ++dm) { @@ -1738,7 +1738,7 @@ void W3DDisplay::draw( void ) // compute debug statistics for display later if ( m_debugDisplayCallback == StatDebugDisplay -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) || TheGlobalData->m_benchmarkTimer > 0 #endif ) @@ -1981,7 +1981,7 @@ void W3DDisplay::draw( void ) drawCurrentDebugDisplay(); } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_benchmarkTimer > 0) { drawFPSStats(); @@ -1989,7 +1989,7 @@ void W3DDisplay::draw( void ) #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_debugShowGraphicalFramerate) { drawFramerateBar(); @@ -3163,7 +3163,7 @@ void W3DDisplay::toggleMovieCapture(void) } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) static FILE *AssetDumpFile=NULL; @@ -3316,7 +3316,7 @@ void W3DDisplay::doSmartAssetPurgeAndPreload(const char* usageFileName) //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) void W3DDisplay::dumpAssetUsage(const char* mapname) { if (!m_assetManager || !mapname || !*mapname) diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp index dc57bf9bd3..e9284e54ce 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp @@ -100,7 +100,7 @@ RTS3DScene::RTS3DScene() m_scratchLight = NEW_REF( LightClass, (LightClass::DIRECTIONAL) ); // REF_PTR_SET(m_globalLight[lightIndex], pLight); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_shroudOn) m_shroudMaterialPass = NEW_REF(W3DShroudMaterialPassClass,()); else @@ -791,7 +791,7 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I if (drawInfo) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (!TheGlobalData->m_shroudOn) ss = OBJECTSHROUD_CLEAR; #endif diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp index 75d4914ab0..28e7098ede 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp @@ -1212,7 +1212,7 @@ Int ShroudTextureShader::set(Int stage) if (stage == 0) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaSpriteShader); else diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp index 70e5a07d18..e585657e2f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp @@ -155,7 +155,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi memset(m_finalFogData,0,srcWidth*srcHeight); #endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) m_pSrcTexture = DX8Wrapper::_Create_DX8_Surface(srcWidth,srcHeight, WW3D_FORMAT_A4R4G4B4); else @@ -179,7 +179,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi //clear entire texture to black memset(m_srcTextureData,0,m_srcTexturePitch*srcHeight); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) fillShroudData(TheGlobalData->m_shroudAlpha); //initialize shroud to a known value #endif @@ -233,7 +233,7 @@ Bool W3DShroud::ReAcquireResources(void) // Create destination texture (stored in video memory). // Since we control the video memory copy, we can do partial updates more efficiently. Or do shift blits. -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) m_pDstTexture = MSGNEW("TextureClass") TextureClass(m_dstTextureWidth,m_dstTextureHeight,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1, TextureClass::POOL_DEFAULT); else @@ -265,7 +265,7 @@ W3DShroudLevel W3DShroud::getShroudLevel(Int x, Int y) { UnsignedShort pixel=*(UnsignedShort *)((Byte *)m_srcTextureData + x*2 + y*m_srcTexturePitch); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) //in this mode, alpha channel holds intensity return (W3DShroudLevel)((1.0f-((Real)(pixel >> 12)/15.0f))*255.0f); @@ -290,7 +290,7 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO if (level < TheGlobalData->m_shroudAlpha) level = TheGlobalData->m_shroudAlpha; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn) { ///@todo: optimize this case if we end up using fog shroud. @@ -355,7 +355,7 @@ void W3DShroud::fillShroudData(W3DShroudLevel level) if (level < TheGlobalData->m_shroudAlpha) level = TheGlobalData->m_shroudAlpha; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //convert value to pixel format if (TheGlobalData && TheGlobalData->m_fogOfWarOn) { @@ -418,7 +418,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu if (level < TheGlobalData->m_shroudAlpha) level = TheGlobalData->m_shroudAlpha; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) //convert value to pixel format if (TheGlobalData && TheGlobalData->m_fogOfWarOn) { @@ -526,7 +526,7 @@ void W3DShroud::render(CameraClass *cam) if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK) return; //device not ready to render anything -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData && TheGlobalData->m_fogOfWarOn != m_drawFogOfWar) { //fog state has changed since last time shroud system was initialized @@ -586,7 +586,7 @@ void W3DShroud::render(CameraClass *cam) { for (Int x=0; xm_fogOfWarOn) { dataDest[x]=((TheGlobalData->m_shroudColor.getAsInt()>>4)&0xf) | (((TheGlobalData->m_shroudColor.getAsInt()>>12)&0xf)<<4) | (((TheGlobalData->m_shroudColor.getAsInt()>>20)&0xf)<<8) | ((((255-(dataSrc[x] & 0xff))>>4)&0xf)<<12); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp index 50afd95a4b..0213771ce5 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp @@ -661,7 +661,7 @@ Bool W3DTerrainVisual::load( AsciiString filename ) if (W3DDisplay::m_3DScene != NULL) W3DDisplay::m_3DScene->Add_Render_Object( m_terrainRenderObject ); -#if defined RTS_DEBUG || defined RTS_INTERNAL +#if defined(RTS_DEBUG) // Icon drawing utility object for pathfinding. if (W3DDisplay::m_3DScene != NULL) { diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp index 730d087e99..3b8f3ab842 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp @@ -582,7 +582,7 @@ void W3DView::setCameraTransform( void ) } m_3DCamera->Set_Clip_Planes(nearZ, farZ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if (TheGlobalData->m_useCameraConstraints) #endif { @@ -605,7 +605,7 @@ void W3DView::setCameraTransform( void ) } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_3DCamera->Set_View_Plane( m_FOV, -1 ); #endif @@ -723,7 +723,7 @@ static void drawTerrainNormal( Drawable *draw, void *userData ) } } -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // ------------------------------------------------------------------------------------------------ // Draw a crude circle. Appears on top of any world geometry // ------------------------------------------------------------------------------------------------ @@ -989,7 +989,7 @@ static void drawablePostDraw( Drawable *draw, void *userData ) Object* obj = draw->getObject(); Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); #else ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex); @@ -1007,7 +1007,7 @@ static void drawablePostDraw( Drawable *draw, void *userData ) draw->drawIconUI(); //} -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // debug collision extents if( TheGlobalData->m_showCollisionExtents ) drawDrawableExtents( draw, userData ); @@ -1684,7 +1684,7 @@ void W3DView::draw( void ) } // end if, show debug AI -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) if( TheGlobalData->m_debugCamera ) { UnsignedInt c = 0xaaffffff; @@ -1754,7 +1754,7 @@ void W3DView::draw( void ) drawable = drawable->getNextDrawable(); } } -#endif // DEBUG or INTERNAL +#endif // RTS_DEBUG Region3D axisAlignedRegion; getAxisAlignedViewRegion(axisAlignedRegion); @@ -2003,7 +2003,7 @@ void W3DView::setFieldOfView( Real angle ) { View::setFieldOfView( angle ); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // this is only for testing, and recalculating the // camera every frame is wasteful setCameraTransform(); diff --git a/GeneralsMD/Code/Main/WinMain.cpp b/GeneralsMD/Code/Main/WinMain.cpp index 7d6fff0947..4918c59923 100644 --- a/GeneralsMD/Code/Main/WinMain.cpp +++ b/GeneralsMD/Code/Main/WinMain.cpp @@ -812,7 +812,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, // Force "splash image" to be loaded from a file, not a resource so same exe can be used in different localizations. -#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE +#if defined(RTS_DEBUG) || defined RTS_PROFILE // check both localized directory and root dir char filePath[_MAX_PATH]; @@ -892,7 +892,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, #ifdef MEMORYPOOL_DEBUG TheMemoryPoolFactory->debugMemoryReport(REPORT_POOLINFO | REPORT_POOL_OVERFLOW | REPORT_SIMPLE_LEAKS, 0, 0); #endif - #if defined(RTS_DEBUG) || defined(RTS_INTERNAL) + #if defined(RTS_DEBUG) TheMemoryPoolFactory->memoryPoolUsageReport("AAAMemStats"); #endif diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index bcae0e79f2..4eab334015 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -117,11 +117,11 @@ class GUIEditDisplay : public Display virtual void preloadTextureAssets( AsciiString texture ) {} virtual void toggleLetterBox(void) {} virtual void enableLetterBox(Bool enable) {} -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void dumpModelAssets(const char *path) {} #endif virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) {} -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) virtual void dumpAssetUsage(const char* mapname) {} #endif diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp index 04a0746c3c..5c320ce0a3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp @@ -33,7 +33,7 @@ OpenMap::OpenMap(TOpenMapInfo *pInfo, CWnd* pParent /*=NULL*/) m_pInfo(pInfo) { m_pInfo->browse = false; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE); #else m_usingSystemDir = FALSE; @@ -110,7 +110,7 @@ void OpenMap::OnOK() void OpenMap::populateMapListbox( Bool systemMaps ) { m_usingSystemDir = systemMaps; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir); #endif @@ -190,7 +190,7 @@ BOOL OpenMap::OnInitDialog() if (pUserMaps != NULL) pUserMaps->SetCheck( !m_usingSystemDir ); -#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL) +#if !defined(RTS_DEBUG) if (pSystemMaps) pSystemMaps->ShowWindow( FALSE ); if (pUserMaps) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp index c1856e5a0f..d6a9255f29 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp @@ -32,7 +32,7 @@ SaveMap::SaveMap(TSaveMapInfo *pInfo, CWnd* pParent /*=NULL*/) : CDialog(SaveMap::IDD, pParent), m_pInfo(pInfo) { -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) m_pInfo->usingSystemDir = m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE); #else m_pInfo->usingSystemDir = m_usingSystemDir = FALSE; @@ -121,7 +121,7 @@ void SaveMap::OnBrowse() void SaveMap::populateMapListbox( Bool systemMaps ) { m_pInfo->usingSystemDir = m_usingSystemDir = systemMaps; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir); #endif @@ -225,7 +225,7 @@ BOOL SaveMap::OnInitDialog() if (pUserMaps != NULL) pUserMaps->SetCheck( !m_usingSystemDir ); -#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL) +#if !defined(RTS_DEBUG) if (pSystemMaps) pSystemMaps->ShowWindow( FALSE ); if (pUserMaps) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index b18ca10334..c26e75f0bf 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp @@ -389,7 +389,7 @@ void WorldHeightMapEdit::loadBaseImages(void) { /// @todo - take this out when we are done evaluating terrain textures. -#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) +#if defined(RTS_DEBUG) loadDirectoryOfImages("..\\TestArt\\TestTerrain"); #endif diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index d57d2a6e07..ed63049c92 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -347,7 +347,7 @@ BOOL CWorldBuilderApp::InitInstance() initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini"); -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_MULTIFILE, NULL ); #endif @@ -428,7 +428,7 @@ BOOL CWorldBuilderApp::InitInstance() DEBUG_ASSERTCRASH(!TheGlobalData->m_useHalfHeightMap, ("TheGlobalData->m_useHalfHeightMap : Don't use this setting in WB.")); TheWritableGlobalData->m_useHalfHeightMap = false; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) // WB never uses the shroud. TheWritableGlobalData->m_shroudOn = FALSE; #endif From 7f07319b11403f55690facdb9396cf1e54e1f44a Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Sat, 5 Jul 2025 13:39:01 +0200 Subject: [PATCH 3/5] [GEN][ZH] Remove or repurpose RTS_INTERNAL specific code (#1231) --- .../Source/WWVegas/WW3D2/streakRender.cpp | 2 +- Core/Libraries/Source/debug/debug.h | 7 +------ Core/Libraries/Source/debug/debug_debug.cpp | 4 +--- Core/Libraries/Source/profile/profile.h | 4 ---- Generals/Code/GameEngine/Include/Common/Debug.h | 12 +----------- .../Code/GameEngine/Include/Common/GlobalData.h | 7 ++++--- .../Code/GameEngine/Include/Common/StateMachine.h | 3 --- .../GameEngine/Include/GameLogic/ScriptEngine.h | 2 +- .../Code/GameEngine/Source/Common/CommandLine.cpp | 11 +++++++++-- .../Code/GameEngine/Source/Common/GameEngine.cpp | 2 -- .../Code/GameEngine/Source/Common/GlobalData.cpp | 14 ++++++++++---- .../Code/GameEngine/Source/Common/System/Debug.cpp | 5 +---- Generals/Code/GameEngine/Source/Common/version.cpp | 8 -------- .../GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 3 --- .../Source/GameLogic/Object/PartitionManager.cpp | 6 ++---- .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 2 +- .../Source/GameNetwork/ConnectionManager.cpp | 2 +- .../Code/Tools/WorldBuilder/src/WorldBuilder.cpp | 3 --- GeneralsMD/Code/GameEngine/Include/Common/Debug.h | 12 +----------- .../Code/GameEngine/Include/Common/GlobalData.h | 7 ++++--- .../Code/GameEngine/Include/Common/StateMachine.h | 3 --- .../GameEngine/Include/GameLogic/ScriptEngine.h | 2 +- .../Code/GameEngine/Source/Common/CommandLine.cpp | 11 +++++++++-- .../Code/GameEngine/Source/Common/GameEngine.cpp | 2 -- .../Code/GameEngine/Source/Common/GlobalData.cpp | 14 ++++++++++---- .../Code/GameEngine/Source/Common/System/Debug.cpp | 5 +---- .../Code/GameEngine/Source/Common/version.cpp | 8 -------- .../GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 3 --- .../Source/GameLogic/Object/PartitionManager.cpp | 6 ++---- .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 4 ++-- .../Source/GameNetwork/ConnectionManager.cpp | 2 +- .../Source/StdDevice/Common/StdBIGFileSystem.cpp | 4 ---- .../Win32Device/Common/Win32BIGFileSystem.cpp | 4 ---- .../Code/Tools/WorldBuilder/src/WorldBuilder.cpp | 6 ------ 34 files changed, 64 insertions(+), 126 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp index 8402ab28e5..48da72ce2e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp @@ -1409,7 +1409,7 @@ VertexFormatXYZUV1 *StreakRendererClass::getVertexBuffer(unsigned int number) m_vertexBufferSize = numberToAlloc; } -#ifdef RTS_INTERNAL +#ifdef RTS_DEBUG for (unsigned i = 0; i < number; ++i) { m_vertexBuffer[i].x = m_vertexBuffer[i].y = m_vertexBuffer[i].z = m_vertexBuffer[i].u1 = m_vertexBuffer[i].v1 = (float)0xdeadbeef; diff --git a/Core/Libraries/Source/debug/debug.h b/Core/Libraries/Source/debug/debug.h index 0d5bcea219..5315004b36 100644 --- a/Core/Libraries/Source/debug/debug.h +++ b/Core/Libraries/Source/debug/debug.h @@ -35,8 +35,7 @@ /** \page lib_var Library variants - Generally speaking there are four different library variants: - - Internal: all asserts/checks/logs, full optimizations (RTS_INTERNAL macro defined) + Generally speaking there are three different library variants: - %Debug: all asserts/checks/logs, no optimizations (RTS_DEBUG macro defined) - Profile: all asserts/checks/logs, full optimizations, profiling active (RTS_PROFILE macro defined) - Release: no asserts/checks/logs, full optimizations @@ -84,10 +83,6 @@ - Release: XXX.lib */ -#if defined(RTS_DEBUG) && defined(RTS_INTERNAL) - #error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined" -#endif - // Define which libraries to use. #if defined(RTS_DEBUG) || defined(RTS_PROFILE) # define HAS_ASSERTS diff --git a/Core/Libraries/Source/debug/debug_debug.cpp b/Core/Libraries/Source/debug/debug_debug.cpp index 9423d0b754..2ef69552b5 100644 --- a/Core/Libraries/Source/debug/debug_debug.cpp +++ b/Core/Libraries/Source/debug/debug_debug.cpp @@ -1437,9 +1437,7 @@ void Debug::WriteBuildInfo(void) (*this) << " " << m_version; if (*m_intVersion) (*this) << " internal " << m_intVersion; - #if defined(RTS_INTERNAL) - operator<<(" internal"); - #elif defined(RTS_DEBUG) + #if defined(RTS_DEBUG) operator<<(" debug"); #elif defined(RTS_PROFILE) operator<<(" profile"); diff --git a/Core/Libraries/Source/profile/profile.h b/Core/Libraries/Source/profile/profile.h index d1c6fccb17..deab9bff6b 100644 --- a/Core/Libraries/Source/profile/profile.h +++ b/Core/Libraries/Source/profile/profile.h @@ -32,10 +32,6 @@ #ifndef PROFILE_H // Include guard #define PROFILE_H -#if defined(RTS_DEBUG) && defined(RTS_INTERNAL) - #error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined" -#endif - // include all our public header files (use double quotes here) #include "profile_doc.h" #include "profile_highlevel.h" diff --git a/Generals/Code/GameEngine/Include/Common/Debug.h b/Generals/Code/GameEngine/Include/Common/Debug.h index cccbd38200..c646d32b4d 100644 --- a/Generals/Code/GameEngine/Include/Common/Debug.h +++ b/Generals/Code/GameEngine/Include/Common/Debug.h @@ -50,10 +50,6 @@ class AsciiString; -#if defined(RTS_DEBUG) && defined(RTS_INTERNAL) - #error "Only one at a time of these should ever be defined" -#endif - // These are stolen from the WW3D Debug file. REALLY useful. :-) #define STRING_IT(a) #a #define TOKEN_IT(a) STRING_IT(,##a) @@ -120,13 +116,7 @@ class AsciiString; DEBUG_FLAG_LOG_TO_FILE = 0x01, DEBUG_FLAG_LOG_TO_CONSOLE = 0x02, DEBUG_FLAG_PREPEND_TIME = 0x04, -#ifdef RTS_INTERNAL - // by default, RTS_INTERNAL builds log to file, but not to console, in the interest - // of speed. want console output? just change this line: - DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE) -#else - DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE) -#endif + DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE), }; DEBUG_EXTERN_C void DebugInit(int flags); diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h index c0b8ef93ea..21f8129935 100644 --- a/Generals/Code/GameEngine/Include/Common/GlobalData.h +++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h @@ -465,10 +465,12 @@ class GlobalData : public SubsystemInterface Int m_playStats; ///< Int whether we want to log play stats or not, if <= 0 then we don't log Bool m_TiVOFastMode; ///< When true, the client speeds up the framerate... set by HOTKEY! - +#if defined(RTS_PROFILE) + Bool m_vTune; +#endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_wireframe; Bool m_stateMachineDebug; Bool m_useCameraConstraints; @@ -483,7 +485,6 @@ class GlobalData : public SubsystemInterface Bool m_disableMilitaryCaption; ///< if true, military briefings go fast Int m_benchmarkTimer; ///< how long to play the game in benchmark mode? Bool m_checkForLeaks; - Bool m_vTune; Bool m_debugCamera; ///< Used to display Camera debug information Bool m_debugVisibility; ///< Should we actively debug the visibility Int m_debugVisibilityTileCount; ///< How many tiles we should show when debugging visibility diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h index 7c138b03f7..5395b012e2 100644 --- a/Generals/Code/GameEngine/Include/Common/StateMachine.h +++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h @@ -51,9 +51,6 @@ class Object; #if defined(RTS_DEBUG) #define STATE_MACHINE_DEBUG #endif -#if defined(RTS_INTERNAL) - #define STATE_MACHINE_DEBUG //uncomment to debug state machines in internal. jba. -#endif //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h index 8006c5aa99..e805ed8b79 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -50,7 +50,7 @@ class Player; class PolygonTrigger; class ObjectTypes; -#ifdef RTS_INTERNAL +#ifdef RTS_PROFILE #define SPECIAL_SCRIPT_PROFILING #endif diff --git a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp index 5e95fbfff9..cdb661c34a 100644 --- a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp @@ -697,6 +697,10 @@ Int parseLogAssets( char *args[], int num ) return 1; } +#endif // defined(RTS_DEBUG) + +#if defined(RTS_PROFILE) + /// begin stuff for VTUNE Int parseVTune ( char *args[], int num ) { @@ -706,7 +710,7 @@ Int parseVTune ( char *args[], int num ) } /// end stuff for VTUNE -#endif // defined(RTS_DEBUG) +#endif // defined(RTS_PROFILE) //============================================================================= //============================================================================= @@ -1274,7 +1278,6 @@ static CommandLineParam paramsForEngineInit[] = { "-DemoLoadScreen", parseDemoLoadScreen }, { "-cameraDebug", parseCameraDebug }, { "-logToCon", parseLogToConsole }, - { "-vTune", parseVTune }, { "-selectTheUnselectable", parseSelectAll }, { "-RunAhead", parseRunAhead }, { "-noshroud", parseNoShroud }, @@ -1299,6 +1302,10 @@ static CommandLineParam paramsForEngineInit[] = #endif +#if defined(RTS_PROFILE) + { "-vTune", parseVTune }, +#endif + #ifdef DEBUG_LOGGING { "-setDebugLevel", parseSetDebugLevel }, { "-clearDebugLevel", parseClearDebugLevel }, diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp index a97c1b1949..bff2391a23 100644 --- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp @@ -257,8 +257,6 @@ void GameEngine::init() #ifdef DEBUG_LOGGING #if defined RTS_DEBUG const char *buildType = "Debug"; - #elif defined RTS_INTERNAL - const char *buildType = "Internal"; #else const char *buildType = "Release"; #endif diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index 6bb08c3bd9..52579db017 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -488,7 +488,11 @@ GlobalData* GlobalData::m_theOriginal = NULL; { "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) }, { "PlayStats", INI::parseInt, NULL, offsetof( GlobalData, m_playStats ) }, -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_PROFILE) + { "VTune", INI::parseBool, NULL, offsetof( GlobalData, m_vTune ) }, +#endif + +#if defined(RTS_DEBUG) { "DisableCameraFade", INI::parseBool, NULL, offsetof( GlobalData, m_disableCameraFade ) }, { "DisableScriptedInputDisabling", INI::parseBool, NULL, offsetof( GlobalData, m_disableScriptedInputDisabling ) }, { "DisableMilitaryCaption", INI::parseBool, NULL, offsetof( GlobalData, m_disableMilitaryCaption ) }, @@ -514,7 +518,6 @@ GlobalData* GlobalData::m_theOriginal = NULL; { "MaxDebugThreatMapValue", INI::parseUnsignedInt, NULL, offsetof( GlobalData, m_maxDebugThreat) }, { "DebugCashValueMapTileDuration", INI::parseInt, NULL, offsetof( GlobalData, m_debugCashValueMapTileDuration) }, { "MaxDebugCashValueMapValue", INI::parseUnsignedInt, NULL, offsetof( GlobalData, m_maxDebugValue) }, - { "VTune", INI::parseBool, NULL, offsetof( GlobalData, m_vTune ) }, { "SaveStats", INI::parseBool, NULL, offsetof( GlobalData, m_saveStats ) }, { "UseLocalMOTD", INI::parseBool, NULL, offsetof( GlobalData, m_useLocalMOTD ) }, { "BaseStatsDir", INI::parseAsciiString,NULL, offsetof( GlobalData, m_baseStatsDir ) }, @@ -545,7 +548,11 @@ GlobalData::GlobalData() m_TiVOFastMode = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_PROFILE) + m_vTune = false; +#endif + +#if defined(RTS_DEBUG) m_wireframe = 0; m_stateMachineDebug = FALSE; m_useCameraConstraints = TRUE; @@ -569,7 +576,6 @@ GlobalData::GlobalData() m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader - m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; m_allowUnselectableSelection = FALSE; diff --git a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp index c5d7ec915d..bdd9075a33 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp @@ -83,10 +83,7 @@ extern const char *gAppPrefix; /// So WB can have a different log file name. #ifdef DEBUG_LOGGING -#if defined(RTS_INTERNAL) - #define DEBUG_FILE_NAME "DebugLogFileI" - #define DEBUG_FILE_NAME_PREV "DebugLogFilePrevI" -#elif defined(RTS_DEBUG) +#if defined(RTS_DEBUG) #define DEBUG_FILE_NAME "DebugLogFileD" #define DEBUG_FILE_NAME_PREV "DebugLogFilePrevD" #else diff --git a/Generals/Code/GameEngine/Source/Common/version.cpp b/Generals/Code/GameEngine/Source/Common/version.cpp index 71239231f3..08c91d663f 100644 --- a/Generals/Code/GameEngine/Source/Common/version.cpp +++ b/Generals/Code/GameEngine/Source/Common/version.cpp @@ -101,10 +101,6 @@ UnicodeString Version::getUnicodeVersion( void ) version.concat(UnicodeString(L" Debug")); #endif -#ifdef RTS_INTERNAL - version.concat(UnicodeString(L" Internal")); -#endif - return version; } @@ -122,10 +118,6 @@ UnicodeString Version::getFullUnicodeVersion( void ) version.concat(UnicodeString(L" Debug")); #endif -#ifdef RTS_INTERNAL - version.concat(UnicodeString(L" Internal")); -#endif - return version; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index c3b063307e..e298a3ed8c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -1414,9 +1414,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, #if defined RTS_DEBUG if(_spawnl(_P_NOWAIT,"WorldBuilderD.exe","WorldBuilderD.exe", NULL) < 0) MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL); -#elif defined RTS_INTERNAL - if(_spawnl(_P_NOWAIT,"WorldBuilderI.exe","WorldBuilderI.exe", NULL) < 0) - MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL); #else if(_spawnl(_P_NOWAIT,"WorldBuilder.exe","WorldBuilder.exe", NULL) < 0) MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index daa02602bd..60e5c27c15 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -5362,10 +5362,8 @@ Bool PartitionFilterPossibleToAttack::allow(Object *objOther) // return false; // we should have already filtered out isAbleToAttack! -#ifdef RTS_DEBUG - // disable this assert for INTERNAL builds (srj) - DEBUG_ASSERTCRASH(m_obj && m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!")); -#endif + DEBUG_ASSERTCRASH(m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!")); + CanAttackResult result = m_obj->getAbleToAttackSpecificObject( m_attackType, objOther, m_commandSource ); if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 8932c45b36..3da276424e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -99,7 +99,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst #define FORMAT_STRING_LEADING_STRING "%s%.2f" // That's it for particle editor -#if defined(RTS_INTERNAL) +#if defined(RTS_PROFILE) #define DO_VTUNE_STUFF #endif diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp index a8bf159a9a..6006632fde 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp @@ -677,7 +677,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg) void ConnectionManager::processFile(NetFileCommandMsg *msg) { -#ifdef RTS_INTERNAL +#ifdef DEBUG_LOGGING UnicodeString log; log.format(L"Saw file transfer: '%hs' of %d bytes from %d", msg->getPortableFilename().str(), msg->getFileLength(), msg->getPlayerID()); DEBUG_LOG(("%ls\n", log.str())); diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 8fab5c554e..43bed5d81d 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -277,9 +277,6 @@ BOOL CWorldBuilderApp::InitInstance() // start the log DEBUG_INIT(DEBUG_FLAGS_DEFAULT); DEBUG_LOG(("starting Worldbuilder.\n")); -#ifdef RTS_INTERNAL - DEBUG_LOG(("RTS_INTERNAL defined.\n")); -#endif #ifdef RTS_DEBUG DEBUG_LOG(("RTS_DEBUG defined.\n")); #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h b/GeneralsMD/Code/GameEngine/Include/Common/Debug.h index dcb898fb0a..467dc77fb1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Debug.h @@ -50,10 +50,6 @@ class AsciiString; -#if defined(RTS_DEBUG) && defined(RTS_INTERNAL) - #error "Only one at a time of these should ever be defined" -#endif - #define NO_RELEASE_DEBUG_LOGGING #ifdef RELEASE_DEBUG_LOGGING ///< Creates a DebugLogFile.txt (No I or D) with all the debug log goodness. Good for startup problems. @@ -126,13 +122,7 @@ class AsciiString; DEBUG_FLAG_LOG_TO_FILE = 0x01, DEBUG_FLAG_LOG_TO_CONSOLE = 0x02, DEBUG_FLAG_PREPEND_TIME = 0x04, -#ifdef RTS_INTERNAL - // by default, RTS_INTERNAL builds log to file, but not to console, in the interest - // of speed. want console output? just change this line: - DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE) -#else - DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE) -#endif + DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE), }; DEBUG_EXTERN_C void DebugInit(int flags); diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h index e7218c70c5..7c0f5d8d06 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h @@ -480,10 +480,12 @@ class GlobalData : public SubsystemInterface Bool m_specialPowerUsesDelay ; #endif Bool m_TiVOFastMode; ///< When true, the client speeds up the framerate... set by HOTKEY! - +#if defined(RTS_PROFILE) + Bool m_vTune; +#endif -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_DEBUG) Bool m_wireframe; Bool m_stateMachineDebug; Bool m_useCameraConstraints; @@ -497,7 +499,6 @@ class GlobalData : public SubsystemInterface Bool m_disableMilitaryCaption; ///< if true, military briefings go fast Int m_benchmarkTimer; ///< how long to play the game in benchmark mode? Bool m_checkForLeaks; - Bool m_vTune; Bool m_debugCamera; ///< Used to display Camera debug information Bool m_debugVisibility; ///< Should we actively debug the visibility Int m_debugVisibilityTileCount; ///< How many tiles we should show when debugging visibility diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h index 7c7a072788..90837426c3 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h @@ -51,9 +51,6 @@ class Object; #if defined(RTS_DEBUG) #define STATE_MACHINE_DEBUG #endif -#if defined(RTS_INTERNAL) - #define STATE_MACHINE_DEBUG //uncomment to debug state machines in internal. jba. -#endif //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h index c389251246..082de82b01 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -50,7 +50,7 @@ class Player; class PolygonTrigger; class ObjectTypes; -#ifdef RTS_INTERNAL +#ifdef RTS_PROFILE #define SPECIAL_SCRIPT_PROFILING #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp index 0a25c90db7..5262e24397 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp @@ -697,6 +697,10 @@ Int parseLogAssets( char *args[], int num ) return 1; } +#endif // defined(RTS_DEBUG) + +#if defined(RTS_PROFILE) + /// begin stuff for VTUNE Int parseVTune ( char *args[], int num ) { @@ -706,7 +710,7 @@ Int parseVTune ( char *args[], int num ) } /// end stuff for VTUNE -#endif // defined(RTS_DEBUG) +#endif // defined(RTS_PROFILE) //============================================================================= //============================================================================= @@ -1274,7 +1278,6 @@ static CommandLineParam paramsForEngineInit[] = { "-DemoLoadScreen", parseDemoLoadScreen }, { "-cameraDebug", parseCameraDebug }, { "-logToCon", parseLogToConsole }, - { "-vTune", parseVTune }, { "-selectTheUnselectable", parseSelectAll }, { "-RunAhead", parseRunAhead }, { "-noshroud", parseNoShroud }, @@ -1299,6 +1302,10 @@ static CommandLineParam paramsForEngineInit[] = #endif +#if defined(RTS_PROFILE) + { "-vTune", parseVTune }, +#endif + #ifdef DEBUG_LOGGING { "-setDebugLevel", parseSetDebugLevel }, { "-clearDebugLevel", parseClearDebugLevel }, diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp index 26bcd92119..f47af3fe48 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp @@ -258,8 +258,6 @@ void GameEngine::init() DEBUG_LOG(("================================================================================\n")); #if defined RTS_DEBUG const char *buildType = "Debug"; - #elif defined RTS_INTERNAL - const char *buildType = "Internal"; #else const char *buildType = "Release"; #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index d5384e0ab0..8cffa7734c 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -488,7 +488,11 @@ GlobalData* GlobalData::m_theOriginal = NULL; { "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) }, { "PlayStats", INI::parseInt, NULL, offsetof( GlobalData, m_playStats ) }, -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_PROFILE) + { "VTune", INI::parseBool, NULL, offsetof( GlobalData, m_vTune ) }, +#endif + +#if defined(RTS_DEBUG) { "DisableCameraFade", INI::parseBool, NULL, offsetof( GlobalData, m_disableCameraFade ) }, { "DisableScriptedInputDisabling", INI::parseBool, NULL, offsetof( GlobalData, m_disableScriptedInputDisabling ) }, { "DisableMilitaryCaption", INI::parseBool, NULL, offsetof( GlobalData, m_disableMilitaryCaption ) }, @@ -514,7 +518,6 @@ GlobalData* GlobalData::m_theOriginal = NULL; { "MaxDebugThreatMapValue", INI::parseUnsignedInt, NULL, offsetof( GlobalData, m_maxDebugThreat) }, { "DebugCashValueMapTileDuration", INI::parseInt, NULL, offsetof( GlobalData, m_debugCashValueMapTileDuration) }, { "MaxDebugCashValueMapValue", INI::parseUnsignedInt, NULL, offsetof( GlobalData, m_maxDebugValue) }, - { "VTune", INI::parseBool, NULL, offsetof( GlobalData, m_vTune ) }, { "SaveStats", INI::parseBool, NULL, offsetof( GlobalData, m_saveStats ) }, { "UseLocalMOTD", INI::parseBool, NULL, offsetof( GlobalData, m_useLocalMOTD ) }, { "BaseStatsDir", INI::parseAsciiString,NULL, offsetof( GlobalData, m_baseStatsDir ) }, @@ -548,7 +551,11 @@ GlobalData::GlobalData() #endif m_TiVOFastMode = FALSE; -#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) +#if defined(RTS_PROFILE) + m_vTune = false; +#endif + +#if defined(RTS_DEBUG) m_wireframe = 0; m_stateMachineDebug = FALSE; m_useCameraConstraints = TRUE; @@ -571,7 +578,6 @@ GlobalData::GlobalData() m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader - m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp index 93b52a8cce..6a8e4a51b8 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp @@ -84,10 +84,7 @@ extern const char *gAppPrefix; /// So WB can have a different log file name. #ifdef DEBUG_LOGGING -#if defined(RTS_INTERNAL) - #define DEBUG_FILE_NAME "DebugLogFileI" - #define DEBUG_FILE_NAME_PREV "DebugLogFilePrevI" -#elif defined(RTS_DEBUG) +#if defined(RTS_DEBUG) #define DEBUG_FILE_NAME "DebugLogFileD" #define DEBUG_FILE_NAME_PREV "DebugLogFilePrevD" #else diff --git a/GeneralsMD/Code/GameEngine/Source/Common/version.cpp b/GeneralsMD/Code/GameEngine/Source/Common/version.cpp index 46caa6b115..bf44e49f47 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/version.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/version.cpp @@ -101,10 +101,6 @@ UnicodeString Version::getUnicodeVersion( void ) version.concat(UnicodeString(L" Debug")); #endif -#ifdef RTS_INTERNAL - version.concat(UnicodeString(L" Internal")); -#endif - return version; } @@ -122,10 +118,6 @@ UnicodeString Version::getFullUnicodeVersion( void ) version.concat(UnicodeString(L" Debug")); #endif -#ifdef RTS_INTERNAL - version.concat(UnicodeString(L" Internal")); -#endif - return version; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index 9baa46e384..f59ac0c21d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -1498,9 +1498,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, #if defined RTS_DEBUG if(_spawnl(_P_NOWAIT,"WorldBuilderD.exe","WorldBuilderD.exe", NULL) < 0) MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL); -#elif defined RTS_INTERNAL - if(_spawnl(_P_NOWAIT,"WorldBuilderI.exe","WorldBuilderI.exe", NULL) < 0) - MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL); #else if(_spawnl(_P_NOWAIT,"WorldBuilder.exe","WorldBuilder.exe", NULL) < 0) MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 49a10b94b1..65d7aa1109 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -5387,10 +5387,8 @@ Bool PartitionFilterPossibleToAttack::allow(Object *objOther) // objOther is guaranteed to be non-null, so we don't need to check (srj) // we should have already filtered out isAbleToAttack! -#ifdef RTS_DEBUG - // disable this assert for INTERNAL builds (srj) - DEBUG_ASSERTCRASH(m_obj && m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!")); -#endif + DEBUG_ASSERTCRASH(m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!")); + CanAttackResult result = m_obj->getAbleToAttackSpecificObject( m_attackType, objOther, m_commandSource ); if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index a337ada8cc..b6b79a32f5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -100,7 +100,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst #define FORMAT_STRING_LEADING_STRING "%s%.2f" // That's it for particle editor -#if defined(RTS_INTERNAL) +#if defined(RTS_PROFILE) #define DO_VTUNE_STUFF #endif @@ -598,7 +598,7 @@ void ScriptEngine::init( void ) curTemplate = &m_actionTemplates[ScriptAction::DEBUG_CRASH_BOX]; curTemplate->m_internalName = "DEBUG_CRASH_BOX"; - curTemplate->m_uiName = "{INTERNAL}_/Debug/Display a crash box (debug/internal builds only)."; + curTemplate->m_uiName = "{INTERNAL}_/Debug/Display a crash box (debug builds only)."; curTemplate->m_numParameters = 1; curTemplate->m_parameters[0] = Parameter::TEXT_STRING; curTemplate->m_numUiStrings = 1; diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp index 3b22ea06fa..a6a2282daa 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp @@ -677,7 +677,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg) void ConnectionManager::processFile(NetFileCommandMsg *msg) { -#ifdef RTS_INTERNAL +#ifdef DEBUG_LOGGING UnicodeString log; log.format(L"Saw file transfer: '%hs' of %d bytes from %d", msg->getPortableFilename().str(), msg->getFileLength(), msg->getPlayerID()); DEBUG_LOG(("%ls\n", log.str())); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp index e35e036052..9afc8d3189 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp @@ -58,11 +58,7 @@ void StdBIGFileSystem::init() { AsciiString installPath; GetStringFromGeneralsRegistry("", "InstallPath", installPath ); //@todo this will need to be ramped up to a crash for release -#ifndef RTS_INTERNAL - // had to make this non-internal only, otherwise we can't autobuild - // GeneralsZH... DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!")); -#endif if (installPath!="") loadBigFilesFromDirectory(installPath, "*.big"); } diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp index 69e5cdaf86..2d7a6f2e8c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp @@ -59,11 +59,7 @@ void Win32BIGFileSystem::init() { AsciiString installPath; GetStringFromGeneralsRegistry("", "InstallPath", installPath ); //@todo this will need to be ramped up to a crash for release -#ifndef RTS_INTERNAL - // had to make this non-internal only, otherwise we can't autobuild - // GeneralsZH... DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!")); -#endif if (installPath!="") loadBigFilesFromDirectory(installPath, "*.big"); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index ed63049c92..1436f264c4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -290,9 +290,6 @@ BOOL CWorldBuilderApp::InitInstance() DEBUG_LOG(("starting Worldbuilder.\n")); -#ifdef RTS_INTERNAL - DEBUG_LOG(("RTS_INTERNAL defined.\n")); -#endif #ifdef RTS_DEBUG DEBUG_LOG(("RTS_DEBUG defined.\n")); #endif @@ -355,9 +352,6 @@ BOOL CWorldBuilderApp::InitInstance() TheWritableGlobalData->m_debugIgnoreAsserts = false; #endif -#if defined(RTS_INTERNAL) - // leave on asserts for a while. jba. [4/15/2003] TheWritableGlobalData->m_debugIgnoreAsserts = true; -#endif DEBUG_LOG(("TheWritableGlobalData %x\n", TheWritableGlobalData)); #if 1 // srj sez: put INI into our user data folder, not the ap dir From 25221792fa866ac67793e0de22cd120ba7d30a59 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Sat, 5 Jul 2025 14:13:06 +0200 Subject: [PATCH 4/5] [CMAKE] Remove RTS_BUILD_OPTION_INTERNAL (#1231) --- CMakePresets.json | 83 ---------------------------------------- cmake/config-build.cmake | 11 ++---- 2 files changed, 3 insertions(+), 91 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 3813bbdff3..51610bf95c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -34,14 +34,6 @@ "RTS_BUILD_OPTION_PROFILE": "ON" } }, - { - "name": "vc6-internal", - "displayName": "Windows 32bit VC6 Internal", - "inherits": "vc6", - "cacheVariables": { - "RTS_BUILD_OPTION_INTERNAL": "ON" - } - }, { "name": "vc6-debug", "displayName": "Windows 32bit VC6 Debug", @@ -103,14 +95,6 @@ "RTS_BUILD_OPTION_PROFILE": "ON" } }, - { - "name": "win32-internal", - "inherits": "win32", - "displayName": "Windows 32bit Internal", - "cacheVariables": { - "RTS_BUILD_OPTION_INTERNAL": "ON" - } - }, { "name": "win32-debug", "inherits": "win32", @@ -145,14 +129,6 @@ "RTS_BUILD_OPTION_PROFILE": "ON" } }, - { - "name": "win32-vcpkg-internal", - "inherits": "win32-vcpkg", - "displayName": "Windows 32bit VCPKG Internal", - "cacheVariables": { - "RTS_BUILD_OPTION_INTERNAL": "ON" - } - }, { "name": "win32-vcpkg-debug", "inherits": "win32-vcpkg", @@ -175,12 +151,6 @@ "displayName": "Build Windows 32bit VC6 Release", "description": "Build Windows 32bit VC6 Release" }, - { - "name": "vc6-internal", - "configurePreset": "vc6-internal", - "displayName": "Build Windows 32bit VC6 Internal", - "description": "Build Windows 32bit VC6 Internal" - }, { "name": "vc6-profile", "configurePreset": "vc6-profile", @@ -200,13 +170,6 @@ "description": "Build Windows 32bit Release", "configuration": "Release" }, - { - "name": "win32-internal", - "configurePreset": "win32-internal", - "displayName": "Build Windows 32bit Internal", - "description": "Build Windows 32bit Internal", - "configuration": "Release" - }, { "name": "win32-profile", "configurePreset": "win32-profile", @@ -228,13 +191,6 @@ "description": "Build Windows 32bit VCPKG Release", "configuration": "Release" }, - { - "name": "win32-vcpkg-internal", - "configurePreset": "win32-vcpkg-internal", - "displayName": "Build Windows 32bit VCPKG Internal", - "description": "Build Windows 32bit VCPKG Internal", - "configuration": "Release" - }, { "name": "win32-vcpkg-profile", "configurePreset": "win32-vcpkg-profile", @@ -284,19 +240,6 @@ } ] }, - { - "name": "vc6-internal", - "steps": [ - { - "type": "configure", - "name": "vc6-internal" - }, - { - "type": "build", - "name": "vc6-internal" - } - ] - }, { "name": "vc6-profile", "steps": [ @@ -323,19 +266,6 @@ } ] }, - { - "name": "win32-internal", - "steps": [ - { - "type": "configure", - "name": "win32-internal" - }, - { - "type": "build", - "name": "win32-internal" - } - ] - }, { "name": "win32-profile", "steps": [ @@ -375,19 +305,6 @@ } ] }, - { - "name": "win32-vcpkg-internal", - "steps": [ - { - "type": "configure", - "name": "win32-vcpkg-internal" - }, - { - "type": "build", - "name": "win32-vcpkg-internal" - } - ] - }, { "name": "win32-vcpkg-profile", "steps": [ diff --git a/cmake/config-build.cmake b/cmake/config-build.cmake index a001e42c59..d8936b5065 100644 --- a/cmake/config-build.cmake +++ b/cmake/config-build.cmake @@ -3,7 +3,6 @@ option(RTS_BUILD_CORE_TOOLS "Build core tools" ON) option(RTS_BUILD_CORE_EXTRAS "Build core extra tools/tests" OFF) option(RTS_BUILD_ZEROHOUR "Build Zero Hour code." ON) option(RTS_BUILD_GENERALS "Build Generals code." ON) -option(RTS_BUILD_OPTION_INTERNAL "Build code with the \"Internal\" configuration." OFF) option(RTS_BUILD_OPTION_PROFILE "Build code with the \"Profile\" configuration." OFF) option(RTS_BUILD_OPTION_DEBUG "Build code with the \"Debug\" configuration." OFF) option(RTS_BUILD_OPTION_ASAN "Build code with Address Sanitizer." OFF) @@ -18,7 +17,6 @@ add_feature_info(CoreTools RTS_BUILD_CORE_TOOLS "Build Core Mod Tools") add_feature_info(CoreExtras RTS_BUILD_CORE_EXTRAS "Build Core Extra Tools/Tests") add_feature_info(ZeroHourStuff RTS_BUILD_ZEROHOUR "Build Zero Hour code") add_feature_info(GeneralsStuff RTS_BUILD_GENERALS "Build Generals code") -add_feature_info(InternalBuild RTS_BUILD_OPTION_INTERNAL "Building as an \"Internal\" build") add_feature_info(ProfileBuild RTS_BUILD_OPTION_PROFILE "Building as a \"Profile\" build") add_feature_info(DebugBuild RTS_BUILD_OPTION_DEBUG "Building as a \"Debug\" build") add_feature_info(AddressSanitizer RTS_BUILD_OPTION_ASAN "Building with address sanitizer") @@ -64,11 +62,8 @@ if(RTS_BUILD_OPTION_DEBUG) target_compile_definitions(core_config INTERFACE RTS_DEBUG WWDEBUG DEBUG) else() target_compile_definitions(core_config INTERFACE RTS_RELEASE) +endif() - if(RTS_BUILD_OPTION_INTERNAL) - target_compile_definitions(core_config INTERFACE RTS_INTERNAL) - endif() - if(RTS_BUILD_OPTION_PROFILE) - target_compile_definitions(core_config INTERFACE RTS_PROFILE) - endif() +if(RTS_BUILD_OPTION_PROFILE) + target_compile_definitions(core_config INTERFACE RTS_PROFILE) endif() From 11f108e2142a3ef6f58e1a1ba6d408f56582b0c7 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Sat, 5 Jul 2025 14:22:06 +0200 Subject: [PATCH 5/5] Add python script for automatic RTS_INTERNAL removals (#1231) --- scripts/cpp/remove_rts_internal.py | 89 ++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 scripts/cpp/remove_rts_internal.py diff --git a/scripts/cpp/remove_rts_internal.py b/scripts/cpp/remove_rts_internal.py new file mode 100644 index 0000000000..5c287772c7 --- /dev/null +++ b/scripts/cpp/remove_rts_internal.py @@ -0,0 +1,89 @@ +# Created with python 3.11.4 + +# This script helps removing RTS_INTERNAL words from the various CPP files. +# Just run it. + +import glob +import os + + +def modifyLine(line: str) -> str: + searchWords = [ + "!defined(RTS_DEBUG) && !defined(RTS_INTERNAL)", + "!defined(RTS_INTERNAL) && !defined(RTS_DEBUG)", + "defined(RTS_DEBUG) || defined(RTS_INTERNAL)", + "defined(RTS_INTERNAL) || defined(RTS_DEBUG)", + "defined( RTS_INTERNAL ) || defined( RTS_DEBUG )", + "defined RTS_DEBUG || defined RTS_INTERNAL", + "RTS_DEBUG || RTS_INTERNAL", + ] + + replaceWords = [ + "!defined(RTS_DEBUG)", + "!defined(RTS_DEBUG)", + "defined(RTS_DEBUG)", + "defined(RTS_DEBUG)", + "defined(RTS_DEBUG)", + "defined(RTS_DEBUG)", + "RTS_DEBUG", + ] + + for searchIdx, searchWord in enumerate(searchWords): + wordBegin = line.find(searchWord) + wordEnd = wordBegin + len(searchWord) + if wordBegin >= 0: + replaceWord = replaceWords[searchIdx] + lineCopy = line[:wordBegin] + replaceWord + line[wordEnd:] + return lineCopy + + return line + + +def main(): + current_dir = os.path.dirname(os.path.abspath(__file__)) + root_dir = os.path.join(current_dir, "..", "..") + root_dir = os.path.normpath(root_dir) + core_dir = os.path.join(root_dir, "Core") + generals_dir = os.path.join(root_dir, "Generals") + generalsmd_dir = os.path.join(root_dir, "GeneralsMD") + fileNames = [] + fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.h'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.cpp'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.inl'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.h'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.cpp'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.inl'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.h'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.cpp'), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.inl'), recursive=True)) + + for fileName in fileNames: + with open(fileName, 'r', encoding="cp1252") as file: + try: + lines = file.readlines() + except UnicodeDecodeError: + continue # Not good. + with open(fileName, 'w', encoding="cp1252") as file: + skipLine = 0 + for line in lines: + # Skip RTS_INTERNAL ifdef blocks + if skipLine > 0: + if "#if" in line: + skipLine += 1 + elif "#endif" in line: + skipLine -= 1 + continue + if skipLine > 0: + continue + if line == "#ifdef RTS_INTERNAL\n" or line == "#if defined(RTS_INTERNAL)\n": + skipLine += 1 + continue + + line = modifyLine(line) + file.write(line) + + return + + +if __name__ == "__main__": + main()