added CyGlobalContext::initStatics() function

Sources/CvGlobals.cpp

@@ -420,6 +420,7 @@ void cvInternalGlobals::init()
 
 	CvPlayerAI::initStatics();
 	CvTeamAI::initStatics();
+	CyGlobalContext::initStatics();
 
 	COPY(m_aiPlotDirectionX, aiPlotDirectionX, int);
 	COPY(m_aiPlotDirectionY, aiPlotDirectionY, int);

Sources/CyGlobalContext.cpp

@@ -18,12 +18,20 @@
 #include "CyPlayer.h"
 #include "CyTeam.h"
 
-CyGlobalContext::CyGlobalContext()
-{
-}
+std::vector<CyPlayer> g_cyPlayers;
+std::vector<CyTeam>   g_cyTeams;
+std::vector<CyMap>    g_cyMaps;
 
-CyGlobalContext::~CyGlobalContext()
+void CyGlobalContext::initStatics()
 {
+	for (int i = 0; i < MAX_PLAYERS; i++)
+		g_cyPlayers.push_back(CyPlayer(&GET_PLAYER((PlayerTypes)i)));
+
+	for (int i = 0; i < MAX_TEAMS; i++)
+		g_cyTeams.push_back(CyTeam(&GET_TEAM((TeamTypes)i)));
+
+	for (int i = 0; i < NUM_MAPS; i++)
+		g_cyMaps.push_back(CyMap((MapTypes)i));
 }
 
 CyGlobalContext& CyGlobalContext::getInstance()
@@ -47,75 +55,44 @@ CyGame* CyGlobalContext::getCyGame() const
 	return &cyGame;
 }
 
-
 CyMap* CyGlobalContext::getCyMap() const
 {
-	static CyMap cyMap(&GC.getMap());
+	static CyMap cyMap;
 	return &cyMap;
+	//return g_cyMaps[CURRENT_MAP];
 }
 
-void CyGlobalContext::switchMap(int iMap)
+void CyGlobalContext::switchMap(MapTypes eMap)
 {
-	GC.switchMap((MapTypes)iMap);
+	GC.switchMap(eMap);
 }
 
-CyMap* CyGlobalContext::getMapByIndex(int iIndex)
+CyMap* CyGlobalContext::getMapByIndex(MapTypes eMap) const
 {
-	static CyMap cyMap;
-	cyMap = GC.getMapByIndex((MapTypes)iIndex);
-	return &cyMap;
+	FASSERT_BOUNDS(0, NUM_MAPS, eMap);
+	return &g_cyMaps[eMap];
 }
 
-CyPlayer* CyGlobalContext::getCyPlayer(int idx) const
+CyPlayer* CyGlobalContext::getCyPlayer(PlayerTypes ePlayer) const
 {
-	static CyPlayer cyPlayers[MAX_PLAYERS];
-	static bool bInit = false;
-
-	if (!bInit)
-	{
-		for (int i = 0; i < MAX_PLAYERS; i++)
-			cyPlayers[i] = CyPlayer(&GET_PLAYER((PlayerTypes)i));
-		bInit = true;
-	}
-
-	if (idx >= 0 && idx < MAX_PLAYERS)
-	{
-		return &cyPlayers[idx];
-	}
-
-	FErrorMsg("Player index requested isn't valid");
-	return NULL;
+	FASSERT_BOUNDS(0, MAX_PLAYERS, ePlayer);
+	return ePlayer >= 0 && ePlayer < MAX_PLAYERS ? &g_cyPlayers[ePlayer] : NULL;
 }
 
-
 CyPlayer* CyGlobalContext::getCyActivePlayer() const
 {
-	const PlayerTypes pt = GC.getGame().getActivePlayer();
-	return pt != NO_PLAYER ? getCyPlayer(pt) : NULL;
+	return getCyPlayer(GC.getGame().getActivePlayer());
 }
 
-
 CvRandom& CyGlobalContext::getCyASyncRand() const
 {
 	return GC.getASyncRand();
 }
 
-CyTeam* CyGlobalContext::getCyTeam(int i) const
+CyTeam* CyGlobalContext::getCyTeam(TeamTypes eTeam) const
 {
-	static CyTeam cyTeams[MAX_TEAMS];
-	static bool bInit=false;
-
-	if (!bInit)
-	{
-		int j;
-		for(j=0;j<MAX_TEAMS;j++)
-		{
-			cyTeams[j]=CyTeam(&GET_TEAM((TeamTypes)j));
-		}
-		bInit = true;
-	}
-
-	return i<MAX_TEAMS ? &cyTeams[i] : NULL;
+	FASSERT_BOUNDS(0, MAX_TEAMS, eTeam);
+	return eTeam < MAX_TEAMS ? &g_cyTeams[eTeam] : NULL;
 }
 
 int CyGlobalContext::getInfoTypeForString(const char* szInfoType) const
@@ -133,9 +110,9 @@ int CyGlobalContext::getTypesEnum(const char* szType) const
 	return GC.getTypesEnum(szType);
 }
 
-const CvMapInfo& CyGlobalContext::getMapInfo(int i) const
+const CvMapInfo& CyGlobalContext::getMapInfo(MapTypes eMap) const
 {
-	return GC.getMapInfo((MapTypes)i);
+	return GC.getMapInfo(eMap);
 }
 
 const CvEffectInfo* CyGlobalContext::getEffectInfo(int /*EffectTypes*/ i) const

Sources/CyGlobalContext.h

@@ -10,7 +10,6 @@
 
 #include "CvGlobals.h"
 
-class CvArtFileMgr;
 class CyGame;
 class CyMap;
 class CyPlayer;
@@ -20,28 +19,24 @@ class CyTeam;
 class CyGlobalContext
 {
 public:
-	CyGlobalContext();
-	virtual ~CyGlobalContext();
-
 	static CyGlobalContext& getInstance();		// singleton accessor
+	static void initStatics();
 
 	bool isDebugBuild() const;
 	CyGame* getCyGame() const;
 	CyMap* getCyMap() const;
-
-	void switchMap(int iMap);
-	CyMap* getMapByIndex(int iIndex);
-
-	CyPlayer* getCyPlayer(int idx) const;
+	void switchMap(MapTypes eMap);
+	CyMap* getMapByIndex(MapTypes eMap) const;
+	CyPlayer* getCyPlayer(PlayerTypes ePlayer) const;
 	CyPlayer* getCyActivePlayer() const;
 	CvRandom& getCyASyncRand() const;
-	CyTeam* getCyTeam(int i) const;
+	CyTeam* getCyTeam(TeamTypes eTeam) const;
 
 	int getInfoTypeForString(const char* szInfoType) const;
 	int getInfoTypeForStringWithHiddenAssert(const char* szInfoType) const;
 	int getTypesEnum(const char* szType) const;
 
-	const CvMapInfo& getMapInfo(int i) const;
+	const CvMapInfo& getMapInfo(MapTypes eMap) const;
 	const CvEffectInfo* getEffectInfo(int i) const;
 	const CvTerrainInfo* getTerrainInfo(int i) const;
 	const CvBonusClassInfo* getBonusClassInfo(int i) const;

Sources/CyMap.cpp

@@ -1,7 +1,3 @@
-//
-// Python wrapper class for CvMap
-//
-
 #include "CvGameCoreDLL.h"
 #include "CvArea.h"
 #include "CvInitCore.h"
@@ -14,14 +10,17 @@
 #include "CyMap.h"
 #include "CyPlot.h"
 
-CyMap::CyMap() : m_pMap(NULL)
-{
-	m_pMap = &GC.getMap();
-}
+//
+// Python wrapper class for CvMap
+//
 
-CyMap::CyMap(CvMap* pMap) : m_pMap(pMap)
-{
-}
+CyMap::CyMap()
+	: m_pMap(&GC.getMap())
+{ }
+
+CyMap::CyMap(MapTypes eMap)
+	: m_pMap(&GC.getMapByIndex(eMap))
+{ }
 
 int CyMap::getType()
 {

Sources/CyMap.h

@@ -16,7 +16,8 @@ class CyMap
 {
 public:
 	CyMap();
-	explicit CyMap(CvMap* pMap); // Call from C++
+	explicit CyMap(MapTypes eMap);
+
 	//const CvMapInterfaceBase* getMap() const { return m_pMap; } // Call from C++
 
 	int getType();