Ticket #3168: t3168_fog_of_war_v1.patch

binaries/data/mods/public/gui/session/session.js

@@ -198 +198 @@
         Engine.EndGame();
         Engine.SwitchGuiPage("page_pregame.xml");
         return;
     }
 
+    Engine.SetViewedPlayer(g_ViewedPlayer);
+
     if (initData)
     {
         g_IsNetworked = initData.isNetworked;
         g_IsController = initData.isController;
         g_PlayerAssignments = initData.playerAssignments;
@@ -296 +298 @@
     if (playerID < -1 || playerID > g_Players.length - 1 ||
             !g_DevSettings.changePerspective && !g_IsObserver)
         return;
 
     g_ViewedPlayer = playerID;
+    Engine.SetViewedPlayer(playerID);
     Engine.SetPlayerID(g_DevSettings.changePerspective ? playerID : -1);
 
     updateTopPanel();
     onSimulationUpdate();
 

source/graphics/LOSTexture.cpp

@@ -340 +340 @@
 
     CmpPtr<ICmpRangeManager> cmpRangeManager(m_Simulation, SYSTEM_ENTITY);
     if (!cmpRangeManager)
         return;
 
-    ICmpRangeManager::CLosQuerier los(cmpRangeManager->GetLosQuerier(g_Game->GetPlayerID()));
+    ICmpRangeManager::CLosQuerier los(cmpRangeManager->GetLosQuerier(g_Game->GetSimulation2()->GetSimContext().GetCurrentDisplayedPlayer()));
 
     GenerateBitmap(los, &losData[0], m_MapSize, m_MapSize, pitch);
 
     if (CRenderer::IsInitialised() && g_Renderer.m_Options.m_SmoothLOS && recreated)
     {

source/gui/MiniMap.cpp

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -528 +528 @@
         for (CSimulation2::InterfaceList::const_iterator it = ents.begin(); it != ents.end(); ++it)
         {
             ICmpMinimap* cmpMinimap = static_cast<ICmpMinimap*>(it->second);
             if (cmpMinimap->GetRenderData(v.r, v.g, v.b, posX, posZ))
             {
-                ICmpRangeManager::ELosVisibility vis = cmpRangeManager->GetLosVisibility(it->first, g_Game->GetPlayerID());
+                ICmpRangeManager::ELosVisibility vis = cmpRangeManager->GetLosVisibility(it->first, g_Game->GetSimulation2()->GetSimContext().GetCurrentDisplayedPlayer());
                 if (vis != ICmpRangeManager::VIS_HIDDEN)
                 {
                     v.a = 255;
                     v.x = posX.ToFloat() * sx;
                     v.y = -posZ.ToFloat() * sy;

source/gui/scripting/ScriptFunctions.cpp

@@ -217 +217 @@
 {
     if (g_Game)
         g_Game->SetPlayerID(id);
 }
 
+void SetViewedPlayer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), int id)
+{
+    if (!g_Game || id < 0)
+        return;
+
+    g_Game->GetSimulation2()->GetSimContext().SetCurrentDisplayedPlayer(id);
+}
+
 JS::Value GetEngineInfo(ScriptInterface::CxPrivate* pCxPrivate)
 {
     return SavedGames::GetEngineInfo(*(pCxPrivate->pScriptInterface));
 }
 
@@ -1021 +1029 @@
     // Misc functions
     scriptInterface.RegisterFunction<std::wstring, std::wstring, &SetCursor>("SetCursor");
     scriptInterface.RegisterFunction<bool, &IsVisualReplay>("IsVisualReplay");
     scriptInterface.RegisterFunction<int, &GetPlayerID>("GetPlayerID");
     scriptInterface.RegisterFunction<void, int, &SetPlayerID>("SetPlayerID");
+    scriptInterface.RegisterFunction<void, int, &SetViewedPlayer>("SetViewedPlayer");
     scriptInterface.RegisterFunction<void, std::string, &OpenURL>("OpenURL");
     scriptInterface.RegisterFunction<std::wstring, &GetMatchID>("GetMatchID");
     scriptInterface.RegisterFunction<void, &RestartInAtlas>("RestartInAtlas");
     scriptInterface.RegisterFunction<bool, &AtlasIsAvailable>("AtlasIsAvailable");
     scriptInterface.RegisterFunction<bool, &IsAtlasRunning>("IsAtlasRunning");

source/simulation2/Simulation2.cpp

@@ -644 +644 @@
 const CSimulation2::InterfaceListUnordered& CSimulation2::GetEntitiesWithInterfaceUnordered(int iid)
 {
     return m->m_ComponentManager.GetEntitiesWithInterfaceUnordered(iid);
 }
 
-const CSimContext& CSimulation2::GetSimContext() const
+CSimContext& CSimulation2::GetSimContext() const
 {
     return m->m_SimContext;
 }
 
 ScriptInterface& CSimulation2::GetScriptInterface() const

source/simulation2/Simulation2.h

@@ -215 +215 @@
      * Returns a list of components implementing the given interface, and their
      * associated entities, as an unordered map.
      */
     const InterfaceListUnordered& GetEntitiesWithInterfaceUnordered(int iid);
 
-    const CSimContext& GetSimContext() const;
+    CSimContext& GetSimContext() const;
     ScriptInterface& GetScriptInterface() const;
 
     bool ComputeStateHash(std::string& outHash, bool quick);
     bool DumpDebugState(std::ostream& stream);
     bool SerializeState(std::ostream& stream);

source/simulation2/system/SimContext.cpp

@@ -1 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -65 +65 @@
     return GetComponentManager().GetScriptInterface();
 }
 
 int CSimContext::GetCurrentDisplayedPlayer() const
 {
-    if (!g_Game)
-        return -1;
-    return g_Game->GetPlayerID();
+    return g_Game ? currentDisplayedPlayer : -1;
+}
+
+void CSimContext::SetCurrentDisplayedPlayer(int player)
+{
+    currentDisplayedPlayer = player;
 }

source/simulation2/system/SimContext.h

@@ -1 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -51 +51 @@
     /**
      * Returns the player ID that the current display is being rendered for.
      * Currently relies on g_Game being initialised (evil globals...)
      */
     int GetCurrentDisplayedPlayer() const;
+    void SetCurrentDisplayedPlayer(int player);
 
 private:
     CComponentManager* m_ComponentManager;
     CUnitManager* m_UnitManager;
     CTerrain* m_Terrain;
 
     CEntityHandle m_SystemEntity;
 
+    int currentDisplayedPlayer = 0;
+
     friend class CSimulation2Impl;
 };
 
 #endif // INCLUDED_SIMCONTEXT