diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h index 21f8129935..19cb080c38 100644 --- a/Generals/Code/GameEngine/Include/Common/GlobalData.h +++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h @@ -465,10 +465,8 @@ 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) Bool m_wireframe; @@ -485,6 +483,7 @@ 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/Source/Common/CommandLine.cpp b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp index cdb661c34a..5e95fbfff9 100644 --- a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp @@ -697,10 +697,6 @@ 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 ) { @@ -710,7 +706,7 @@ Int parseVTune ( char *args[], int num ) } /// end stuff for VTUNE -#endif // defined(RTS_PROFILE) +#endif // defined(RTS_DEBUG) //============================================================================= //============================================================================= @@ -1278,6 +1274,7 @@ static CommandLineParam paramsForEngineInit[] = { "-DemoLoadScreen", parseDemoLoadScreen }, { "-cameraDebug", parseCameraDebug }, { "-logToCon", parseLogToConsole }, + { "-vTune", parseVTune }, { "-selectTheUnselectable", parseSelectAll }, { "-RunAhead", parseRunAhead }, { "-noshroud", parseNoShroud }, @@ -1302,10 +1299,6 @@ 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 bff2391a23..6407b8d2c6 100644 --- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp @@ -305,7 +305,7 @@ void GameEngine::init() #if defined(RTS_DEBUG) - // If we're in Debug or Internal, load the Debug info as well. + // If we're in Debug, load the Debug settings as well. ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_OVERWRITE, NULL ); #endif diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index 52579db017..220d0c5aa0 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -488,10 +488,6 @@ GlobalData* GlobalData::m_theOriginal = NULL; { "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) }, { "PlayStats", INI::parseInt, NULL, offsetof( GlobalData, m_playStats ) }, -#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 ) }, @@ -518,6 +514,7 @@ 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,10 +545,6 @@ GlobalData::GlobalData() m_TiVOFastMode = FALSE; -#if defined(RTS_PROFILE) - m_vTune = false; -#endif - #if defined(RTS_DEBUG) m_wireframe = 0; m_stateMachineDebug = FALSE; @@ -576,6 +569,7 @@ 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/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 3da276424e..7881bdaf17 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_PROFILE) +#if defined(RTS_DEBUG) #define DO_VTUNE_STUFF #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h index 7c0f5d8d06..d986d77495 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h @@ -480,10 +480,8 @@ 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) Bool m_wireframe; @@ -499,6 +497,7 @@ 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/Source/Common/CommandLine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp index 5262e24397..0a25c90db7 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp @@ -697,10 +697,6 @@ 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 ) { @@ -710,7 +706,7 @@ Int parseVTune ( char *args[], int num ) } /// end stuff for VTUNE -#endif // defined(RTS_PROFILE) +#endif // defined(RTS_DEBUG) //============================================================================= //============================================================================= @@ -1278,6 +1274,7 @@ static CommandLineParam paramsForEngineInit[] = { "-DemoLoadScreen", parseDemoLoadScreen }, { "-cameraDebug", parseCameraDebug }, { "-logToCon", parseLogToConsole }, + { "-vTune", parseVTune }, { "-selectTheUnselectable", parseSelectAll }, { "-RunAhead", parseRunAhead }, { "-noshroud", parseNoShroud }, @@ -1302,10 +1299,6 @@ 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 f47af3fe48..1e2f3ec1e8 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp @@ -376,7 +376,7 @@ void GameEngine::init() #if defined(RTS_DEBUG) - // If we're in Debug or Internal, load the Debug info as well. + // If we're in Debug, load the Debug settings as well. ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_OVERWRITE, NULL ); #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index 8cffa7734c..7e4469e0ae 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -488,10 +488,6 @@ GlobalData* GlobalData::m_theOriginal = NULL; { "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) }, { "PlayStats", INI::parseInt, NULL, offsetof( GlobalData, m_playStats ) }, -#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 ) }, @@ -518,6 +514,7 @@ 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 ) }, @@ -551,10 +548,6 @@ GlobalData::GlobalData() #endif m_TiVOFastMode = FALSE; -#if defined(RTS_PROFILE) - m_vTune = false; -#endif - #if defined(RTS_DEBUG) m_wireframe = 0; m_stateMachineDebug = FALSE; @@ -578,6 +571,7 @@ 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/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index b6b79a32f5..ec4b704c7a 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_PROFILE) +#if defined(RTS_DEBUG) #define DO_VTUNE_STUFF #endif