From 6d2bd364a05fa7e13e4b6f5907d501e7c2208682 Mon Sep 17 00:00:00 2001 From: Mauller <26652186+Mauller@users.noreply.github.com> Date: Tue, 8 Jul 2025 19:21:42 +0100 Subject: [PATCH] [GEN][ZH] Fix vTune ini parsing issue casued by #1231 --- Generals/Code/GameEngine/Include/Common/GlobalData.h | 2 +- Generals/Code/GameEngine/Source/Common/GlobalData.cpp | 4 ++-- GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h | 2 +- GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h index 21f8129935..7b2fc3c2c5 100644 --- a/Generals/Code/GameEngine/Include/Common/GlobalData.h +++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h @@ -466,7 +466,7 @@ class GlobalData : public SubsystemInterface Bool m_TiVOFastMode; ///< When true, the client speeds up the framerate... set by HOTKEY! -#if defined(RTS_PROFILE) +#if defined(RTS_DEBUG) || defined(RTS_PROFILE) Bool m_vTune; #endif diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index 52579db017..24ebb27fbc 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -488,7 +488,7 @@ 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) +#if defined(RTS_DEBUG) || defined(RTS_PROFILE) { "VTune", INI::parseBool, NULL, offsetof( GlobalData, m_vTune ) }, #endif @@ -548,7 +548,7 @@ GlobalData::GlobalData() m_TiVOFastMode = FALSE; -#if defined(RTS_PROFILE) +#if defined(RTS_DEBUG) || defined(RTS_PROFILE) m_vTune = false; #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h index 7c0f5d8d06..58e5a22daf 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h @@ -481,7 +481,7 @@ class GlobalData : public SubsystemInterface #endif Bool m_TiVOFastMode; ///< When true, the client speeds up the framerate... set by HOTKEY! -#if defined(RTS_PROFILE) +#if defined(RTS_DEBUG) || defined(RTS_PROFILE) Bool m_vTune; #endif diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index 8cffa7734c..9e1a105b88 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -488,7 +488,7 @@ 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) +#if defined(RTS_DEBUG) || defined(RTS_PROFILE) { "VTune", INI::parseBool, NULL, offsetof( GlobalData, m_vTune ) }, #endif @@ -551,7 +551,7 @@ GlobalData::GlobalData() #endif m_TiVOFastMode = FALSE; -#if defined(RTS_PROFILE) +#if defined(RTS_DEBUG) || defined(RTS_PROFILE) m_vTune = false; #endif