Skip to content

[GEN][ZH] Fix debug vTune ini parsing issue caused by #1231 #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[GEN][ZH] Fix debug vTune ini parsing issue caused by #1231 #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/Common/GlobalData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -548,7 +548,7 @@ GlobalData::GlobalData()

m_TiVOFastMode = FALSE;

#if defined(RTS_PROFILE)
#if defined(RTS_DEBUG) || defined(RTS_PROFILE)
m_vTune = false;
#endif

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
Loading