Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove CTerritoryManager pointer from CWorld, a relic from before simulation2.

Browse Source 
Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D731
This was SVN commit r19931.
This commit is contained in:
leper 2017-07-29 23:27:02 +00:00
parent 27e5c5b25a
commit 781cec163e
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/ps/World.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2017 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -57,8 +57,7 @@ CLightEnv g_LightEnv;
CWorld::CWorld(CGame *pGame):
m_pGame(pGame),
m_Terrain(new CTerrain()),
m_UnitManager(new CUnitManager()),
m_TerritoryManager(NULL)
m_UnitManager(new CUnitManager())
{
}

14
source/ps/World.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2017 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -36,7 +36,6 @@ ERROR_TYPE(Game_World, MapLoadFailed);
class CGame;
class CUnitManager;
class CTerritoryManager;
class CTerrain;
class CStrW;
@ -61,10 +60,6 @@ class CWorld
* pointer to the CUnitManager that holds all the units in the world.
**/
CUnitManager *m_UnitManager;
/**
* pointer to the CTerritoryManager that holds territory matrix for the world.
**/
CTerritoryManager *m_TerritoryManager;
public:
CWorld(CGame *pGame);
@ -95,13 +90,6 @@ public:
**/
inline CUnitManager &GetUnitManager()
{ return *m_UnitManager; }
/**
* Get the pointer to the territory manager object.
*
* @return CTerritoryManager * the value of m_TerritoryManager.
**/
inline CTerritoryManager *GetTerritoryManager()
{ return m_TerritoryManager; }
};
// rationale: see definition.