Index: ps/trunk/source/ps/World.h =================================================================== --- ps/trunk/source/ps/World.h +++ ps/trunk/source/ps/World.h @@ -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 @@ class CGame; class CUnitManager; -class CTerritoryManager; class CTerrain; class CStrW; @@ -61,10 +60,6 @@ * 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 @@ **/ 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. Index: ps/trunk/source/ps/World.cpp =================================================================== --- ps/trunk/source/ps/World.cpp +++ ps/trunk/source/ps/World.cpp @@ -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 @@ CWorld::CWorld(CGame *pGame): m_pGame(pGame), m_Terrain(new CTerrain()), - m_UnitManager(new CUnitManager()), - m_TerritoryManager(NULL) + m_UnitManager(new CUnitManager()) { }