Add [Landscape] Secret to Scenario.txt to default-disable black NO_OWNER viewports

Related to: c569036d1d

docs/sdk/scenario/scenario.xml

@@ -72,7 +72,7 @@
       </row>
       <row>
         <col>Secret</col>
-        <col>bool</col>
+        <col>Bool</col>
         <col>If true and MissionAccess is set, the scenario is invisible in the scenario selection list if the player does not have the required password access.</col>
       </row>
       <row>
@@ -345,6 +345,11 @@
         <col>Integer</col>
         <col>0 or 1. If 1, all landscape chunks are drawn flat when the map is zoomed to draw the landscape. Set this while drawing a static map in console mode to fix small gaps of lower order materials hidden behind materials of chunky shape.</col>
       </row>
+      <row>
+        <literal_col>Secret</literal_col>
+        <col>Bool</col>
+        <col>Whether to hide the map from <code><funclink>NO_OWNER</funclink></code> viewports (e.g. observers not following a player in network rounds)</col>
+      </row>
     </table>
   </text>
   <text>

planet/Arena.ocf/DarkMine.ocs/Scenario.txt

@@ -15,6 +15,7 @@ MapWidth=140
 MapHeight=140
 TopOpen=0
 BottomOpen=0
+Secret=true
 
 [Weather]
-Climate=0
+Climate=0

planet/Missions.ocf/DeepSeaMining.ocs/Scenario.txt

@@ -52,6 +52,7 @@ AutoScanSideOpen=1
 MapWidth=300
 MapHeight=400
 MapZoom=7
+Secret=true
 
 [Weather]
 Climate=0

planet/Missions.ocf/TreasureHunt.ocs/Scenario.txt

@@ -30,6 +30,7 @@ TopOpen=2
 MapWidth=200,0,64,10000
 MapHeight=200,0,40,10000
 NoScan=true
+Secret=true
 
 [Weather]
 Climate=0,10,0,100

planet/Parkour.ocf/Maze.ocs/Scenario.txt

@@ -31,6 +31,7 @@ MapZoom=10
 TopOpen=0
 BottomOpen=0
 SkyScrollMode=2
+Secret=true
 
 [Weather]
 Climate=0,0,0,100

src/game/C4Viewport.cpp

@@ -394,7 +394,8 @@ void C4Viewport::Execute()
 		if (!::Application.isEditor && !::Game.DebugMode)
 			if (!::Network.isEnabled() || !::Network.Clients.GetLocal() || !::Network.Clients.GetLocal()->isObserver())
 				if (::Game.PlayerInfos.GetJoinIssuedPlayerCount() > 0) // free scrolling allowed if the scenario was started explicitely without players to inspect the landscape
-					draw_game = false;
+					if (Game.C4S.Landscape.Secret)
+						draw_game = false;
 	// Draw
 	Draw(cgo, draw_game, true);
 	// Blit output

src/landscape/C4Scenario.cpp

@@ -304,6 +304,7 @@ void C4SLandscape::Default()
 	SkyScrollMode=0;
 	MaterialZoom=4;
 	FlatChunkShapes=false;
+	Secret=false;
 }
 
 void C4SLandscape::GetMapSize(int32_t &rWdt, int32_t &rHgt, int32_t iPlayerNum)
@@ -347,6 +348,7 @@ void C4SLandscape::CompileFunc(StdCompiler *pComp)
 	pComp->Value(mkNamingAdapt(SkyScrollMode,           "SkyScrollMode",         0));
 	pComp->Value(mkNamingAdapt(MaterialZoom,            "MaterialZoom",          4));
 	pComp->Value(mkNamingAdapt(FlatChunkShapes,         "FlatChunkShapes",       false));
+	pComp->Value(mkNamingAdapt(Secret,                  "Secret",                false));
 }
 
 void C4SWeather::Default()

src/landscape/C4Scenario.h

@@ -183,6 +183,7 @@ public:
 	int32_t SkyScrollMode;  // sky scrolling mode for newgfx
 	int32_t MaterialZoom;
 	bool FlatChunkShapes; // if true, all material chunks are drawn flat
+	bool Secret; // hide map from observers (except in dev mode and the like)
 public:
 	void Default();
 	void GetMapSize(int32_t &rWdt, int32_t &rHgt, int32_t iPlayerNum);