From 5ec7af292c4edb73c9e38526abc692f52a765364 Mon Sep 17 00:00:00 2001 From: alyokhin Date: Fri, 24 Sep 2021 17:45:40 +0300 Subject: [PATCH] Update RevealMap() for new modes --- src/map/script_map.cpp | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/src/map/script_map.cpp b/src/map/script_map.cpp index 02b0d69bc..35dc82629 100644 --- a/src/map/script_map.cpp +++ b/src/map/script_map.cpp @@ -142,11 +142,28 @@ static int CclStratagusMap(lua_State *l) */ static int CclRevealMap(lua_State *l) { - LuaCheckArgs(l, 0); - if (CclInConfigFile || !Map.Fields) { - FlagRevealMap = 1; + LuaCheckArgs(l, 1); + + int newMode; + const char *revealMode = LuaToString(l, 1); + if (!strcmp(revealMode, "hidden")) { + newMode = MapRevealModes::cHidden; + } else if (!strcmp(revealMode, "known")) { + newMode = MapRevealModes::cKnown; + } else if (!strcmp(revealMode, "explored")) { + newMode = MapRevealModes::cExplored; } else { - Map.Reveal(); + PrintFunction(); + fprintf(stdout, "Accessible reveal modes: \"hidden\", \"known\", \"explored\", \"revealed\".\n"); + return 1; + } + + if (CclInConfigFile || !Map.Fields) { + FlagRevealMap = newMode; + } else if (!IsNetworkGame()) { + Map.Reveal(newMode); + } else { + NetworkSendExtendedCommand(ExtendedMessageRevealMapDB, int(newMode), 0, 0, 0, 0); } return 0; } @@ -242,12 +259,18 @@ static int CclShowMapLocation(lua_State *l) static int CclSetFogOfWar(lua_State *l) { LuaCheckArgs(l, 1); - Map.NoFogOfWar = !LuaToBoolean(l, 1); - if (!CclInConfigFile && Map.Fields) { - UpdateFogOfWarChange(); - // FIXME: save setting in replay log - //CommandLog("input", NoUnitP, FlushCommands, -1, -1, NoUnitP, "fow off", -1); + const bool fog = LuaToBoolean(l, 1); + const bool updReq = (!CclInConfigFile && Map.Fields); + + if (!IsNetworkGame()) { + Map.NoFogOfWar = !fog; + if (updReq) { + UpdateFogOfWarChange(); + } + } else { + NetworkSendExtendedCommand(ExtendedMessageFogOfWarDB, int(fog), int(updReq), 0, 0, 0); } + return 0; }