Core Classes Reorganization:

- g_Terrain and g_Camera totally eradicated as globals, is now m_Terrain
of CWorld and m_Camera of CGameView
- terrainMain.cpp is almost completely empty with functionality moved
into the relevant core classes
- Miscellaneous global functions moved into Core Classes (mostly
GameView)

This was SVN commit r865.
This commit is contained in:
olsner
2004-07-31 15:57:18 +00:00
parent aff7bd83e6
commit 09f47d6820
22 changed files with 705 additions and 650 deletions
+2 -2
View File
@@ -9,7 +9,7 @@
#include "PathfindEngine.h"
#include "Terrain.h"
extern CTerrain g_Terrain;
#include "Game.h"
bool CEntity::processGotoNoPathing( CEntityOrder* current, size_t timestep_millis )
{
@@ -192,7 +192,7 @@ bool CEntity::processGotoNoPathing( CEntityOrder* current, size_t timestep_milli
}
// Will we step off the map?
if( !g_Terrain.isOnMap( m_position.X, m_position.Z ) )
if( !g_Game->GetWorld()->GetTerrain()->isOnMap( m_position.X, m_position.Z ) )
{
// Yes. That's not a particularly good idea, either.