[GEN][ZH] Fix black terrain in World Builder without RTS_DEBUG

[xezon]

• Fixes Terrain renders black in World Builder #1186
• Partially fixes [ZH] World Builder behaves differently when built with RTS_BUILD_OPTION_DEBUG enabled #1116
• Merge after [CMAKE] Remove obsolete interface libraries, add missing core gameengine include interface library #1036

This change fixes the black terrain in World Builder without RTS_DEBUG. This issue happens because all code around GlobalData::m_shroudOn is compiled out without RTS_DEBUG, which enables shroud and turns the world black.

TODO

• Rebase after [CMAKE] Remove obsolete interface libraries, add missing core gameengine include interface library #1036 is merged
• Replicate in Generals

[Caball009]

This fix works as intended for me.

[xezon]

Rebased on latest main.

[ViTeXFTW]

What are the necessary changes to have WB work in release (without RTS_INTERNAL)? I feel like that should also be a target goal.

[xezon]

If you know of more things broken in Release World Builder, please create a report. I only noticed the Terrain and System Maps thing.

[ViTeXFTW]

Also tested and works as advertised

[xezon]

Rebased.

Replicated in Generals with conflicts.

$ git diff 28adea33cec5ca38d28ce276ed668d4e8db9e46a..b0ef819c2278fba9e2adb993de5b0f1480bf07c7 > changes.patch

$ git apply -p2 --directory=Generals --reject --whitespace=fix changes.patch
changes.patch:42: trailing whitespace.

changes.patch:198: space before tab in indent.
        TheDisplay->drawImage( m_overlayImage, ul.x, ul.y, lr.x, lr.y );
Checking patch Generals/GameEngine/Include/Common/GameDefines.h...
error: Generals/GameEngine/Include/Common/GameDefines.h: No such file or directory
Checking patch Generals/Code/GameEngine/Include/Common/GameCommon.h...
Hunk #1 succeeded at 52 (offset -6 lines).
Checking patch Generals/Code/GameEngine/Include/Common/GlobalData.h...
error: while searching for:
#include "Common/SubsystemInterface.h"
#include "GameClient/Color.h"
#include "Common/STLTypedefs.h"
#include "Common/GameCommon.h"
#include "Common/Money.h"

// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////

error: patch failed: Generals/Code/GameEngine/Include/Common/GlobalData.h:39
error: while searching for:
  Bool m_TiVOFastMode;            ///< When true, the client speeds up the framerate... set by HOTKEY!



#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
        Bool m_wireframe;
        Bool m_stateMachineDebug;
        Bool m_useCameraConstraints;
        Bool m_shroudOn;
        Bool m_fogOfWarOn;
        Bool m_jabberOn;
        Bool m_munkeeOn;

error: patch failed: Generals/Code/GameEngine/Include/Common/GlobalData.h:482
Checking patch Generals/Code/GameEngine/Include/Precompiled/PreRTS.h...
Checking patch Generals/Code/GameEngine/Source/Common/CommandLine.cpp...
Checking patch Generals/Code/GameEngine/Source/Common/GlobalData.cpp...
error: while searching for:
#endif
  m_TiVOFastMode = FALSE;

#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
        m_wireframe = 0;
        m_stateMachineDebug = FALSE;
        m_useCameraConstraints = TRUE;
        m_shroudOn = TRUE;
        m_fogOfWarOn = FALSE;
        m_jabberOn = FALSE;
        m_munkeeOn = FALSE;

error: patch failed: Generals/Code/GameEngine/Source/Common/GlobalData.cpp:548
Checking patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp...
Hunk #1 succeeded at 619 (offset -38 lines).
Hunk #2 succeeded at 650 (offset -38 lines).
Checking patch Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp...
Hunk #1 succeeded at 2488 (offset -60 lines).
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp...
Hunk #1 succeeded at 1267 (offset 12 lines).
Hunk #2 succeeded at 1287 (offset 12 lines).
Hunk #3 succeeded at 1424 (offset 12 lines).
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp...
error: Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp: No such file or directory
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp...
Hunk #1 succeeded at 104 (offset -1 lines).
Hunk #2 succeeded at 758 (offset -38 lines).
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp...
Hunk #1 succeeded at 850 (offset -144 lines).
Checking patch Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp...
Hunk #1 succeeded at 411 (offset -22 lines).
Applied patch Generals/Code/GameEngine/Include/Common/GameCommon.h cleanly.
Applying patch Generals/Code/GameEngine/Include/Common/GlobalData.h with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applied patch Generals/Code/GameEngine/Include/Precompiled/PreRTS.h cleanly.
Applied patch Generals/Code/GameEngine/Source/Common/CommandLine.cpp cleanly.
Applying patch Generals/Code/GameEngine/Source/Common/GlobalData.cpp with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applied patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp cleanly.
Applied patch Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp cleanly.
Applied patch Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp cleanly.
Applied patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp cleanly.
Applied patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp cleanly.
Applied patch Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp cleanly.

[xezon]

This needs an approval.

[ViTeXFTW]

Wish I could

[ViTeXFTW]

By the way, this change also makes the release WorldBuilder work as expected. I think the only issues was no handling of shroud clearing