Skip to content

[GEN][ZH] Show the System Maps tab in World Builder without RTS_DEBUG #1191

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

Merged
xezon merged 2 commits into from
Jul 11, 2025
Merged

[GEN][ZH] Show the System Maps tab in World Builder without RTS_DEBUG #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f6be23
[ZH] Show the System Maps tab in World Builder without RTS_DEBUG
xezon Jun 24, 2025
b9d04a6
Replicate in Generals
xezon Jun 30, 2025
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
15 changes: 3 additions & 12 deletions Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ OpenMap::OpenMap(TOpenMapInfo *pInfo, CWnd* pParent /*=NULL*/)
m_pInfo(pInfo)
{
m_pInfo->browse = false;
#if defined(RTS_DEBUG)
m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
#else
m_usingSystemDir = FALSE;
#endif

//{{AFX_DATA_INIT(OpenMap)
// NOTE: the ClassWizard will add member initialization here
Expand Down Expand Up @@ -110,9 +106,7 @@ void OpenMap::OnOK()
void OpenMap::populateMapListbox( Bool systemMaps )
{
m_usingSystemDir = systemMaps;
#if defined(RTS_DEBUG)
::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
#endif

HANDLE hFindFile = 0;
WIN32_FIND_DATA findData;
Expand Down Expand Up @@ -190,12 +184,9 @@ BOOL OpenMap::OnInitDialog()
if (pUserMaps != NULL)
pUserMaps->SetCheck( !m_usingSystemDir );

#if !defined(RTS_DEBUG)
if (pSystemMaps)
pSystemMaps->ShowWindow( FALSE );
if (pUserMaps)
pUserMaps->ShowWindow( FALSE );
#endif
// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
// perhaps with the intention to only show User Maps to community users. However, World Builder did release
// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.

populateMapListbox( m_usingSystemDir );

Expand Down
15 changes: 3 additions & 12 deletions Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ SaveMap::SaveMap(TSaveMapInfo *pInfo, CWnd* pParent /*=NULL*/)
: CDialog(SaveMap::IDD, pParent),
m_pInfo(pInfo)
{
#if defined(RTS_DEBUG)
m_pInfo->usingSystemDir = m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
#else
m_pInfo->usingSystemDir = m_usingSystemDir = FALSE;
#endif

//{{AFX_DATA_INIT(SaveMap)
// NOTE: the ClassWizard will add member initialization here
Expand Down Expand Up @@ -121,9 +117,7 @@ void SaveMap::OnBrowse()
void SaveMap::populateMapListbox( Bool systemMaps )
{
m_pInfo->usingSystemDir = m_usingSystemDir = systemMaps;
#if defined(RTS_DEBUG)
::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
#endif

HANDLE hFindFile = 0;
WIN32_FIND_DATA findData;
Expand Down Expand Up @@ -225,12 +219,9 @@ BOOL SaveMap::OnInitDialog()
if (pUserMaps != NULL)
pUserMaps->SetCheck( !m_usingSystemDir );

#if !defined(RTS_DEBUG)
if (pSystemMaps)
pSystemMaps->ShowWindow( FALSE );
if (pUserMaps)
pUserMaps->ShowWindow( FALSE );
#endif
// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
// perhaps with the intention to only show User Maps to community users. However, World Builder did release
// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.

populateMapListbox( m_usingSystemDir );

Expand Down
15 changes: 3 additions & 12 deletions GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ OpenMap::OpenMap(TOpenMapInfo *pInfo, CWnd* pParent /*=NULL*/)
m_pInfo(pInfo)
{
m_pInfo->browse = false;
#if defined(RTS_DEBUG)
m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
#else
m_usingSystemDir = FALSE;
#endif

//{{AFX_DATA_INIT(OpenMap)
// NOTE: the ClassWizard will add member initialization here
Expand Down Expand Up @@ -110,9 +106,7 @@ void OpenMap::OnOK()
void OpenMap::populateMapListbox( Bool systemMaps )
{
m_usingSystemDir = systemMaps;
#if defined(RTS_DEBUG)
::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
#endif

HANDLE hFindFile = 0;
WIN32_FIND_DATA findData;
Expand Down Expand Up @@ -190,12 +184,9 @@ BOOL OpenMap::OnInitDialog()
if (pUserMaps != NULL)
pUserMaps->SetCheck( !m_usingSystemDir );

#if !defined(RTS_DEBUG)
if (pSystemMaps)
pSystemMaps->ShowWindow( FALSE );
if (pUserMaps)
pUserMaps->ShowWindow( FALSE );
#endif
// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
// perhaps with the intention to only show User Maps to community users. However, World Builder did release
// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.

populateMapListbox( m_usingSystemDir );

Expand Down
15 changes: 3 additions & 12 deletions GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ SaveMap::SaveMap(TSaveMapInfo *pInfo, CWnd* pParent /*=NULL*/)
: CDialog(SaveMap::IDD, pParent),
m_pInfo(pInfo)
{
#if defined(RTS_DEBUG)
m_pInfo->usingSystemDir = m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
#else
m_pInfo->usingSystemDir = m_usingSystemDir = FALSE;
#endif

//{{AFX_DATA_INIT(SaveMap)
// NOTE: the ClassWizard will add member initialization here
Expand Down Expand Up @@ -121,9 +117,7 @@ void SaveMap::OnBrowse()
void SaveMap::populateMapListbox( Bool systemMaps )
{
m_pInfo->usingSystemDir = m_usingSystemDir = systemMaps;
#if defined(RTS_DEBUG)
::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
#endif

HANDLE hFindFile = 0;
WIN32_FIND_DATA findData;
Expand Down Expand Up @@ -225,12 +219,9 @@ BOOL SaveMap::OnInitDialog()
if (pUserMaps != NULL)
pUserMaps->SetCheck( !m_usingSystemDir );

#if !defined(RTS_DEBUG)
if (pSystemMaps)
pSystemMaps->ShowWindow( FALSE );
if (pUserMaps)
pUserMaps->ShowWindow( FALSE );
#endif
// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
// perhaps with the intention to only show User Maps to community users. However, World Builder did release
// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.

populateMapListbox( m_usingSystemDir );

Expand Down
Loading