Removed some header files from header files.

Changed SoundGroupTable to use the right string type for the comparison.
Also changed from CStr8 to CStr because I prefer that spelling (and it's
more consistent with most other code).

This was SVN commit r4771.

source/graphics/ObjectEntry.h

@@ -4,7 +4,7 @@
 class CModel;
 class CSkeletonAnim;
 class CObjectBase;
-class CMeshManager;
+class CObjectManager;
 struct SPropPoint;
 
 #include <map>
@@ -14,8 +14,6 @@ struct SPropPoint;
 #include "ps/CStr.h"
 #include "ps/Overlay.h"
 
-class CObjectManager;
-
 class CObjectEntry
 {
 public:

source/graphics/UnitManager.cpp

@@ -16,6 +16,8 @@
 #include "Unit.h"
 #include "ObjectManager.h"
 #include "ObjectEntry.h"
+#include "ps/Game.h"
+#include "ps/World.h"
 #include "simulation/Entity.h"
 #include "simulation/LOSManager.h"
 

source/gui/MiniMap.cpp

@@ -13,10 +13,12 @@
 #include "graphics/UnitManager.h"
 #include "lib/ogl.h"
 #include "lib/sdl.h"
+#include "network/NetMessage.h"
 #include "ps/Game.h"
 #include "ps/Interact.h"
-#include "network/NetMessage.h"
+#include "ps/Player.h"
 #include "ps/Profile.h"
+#include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
 #include "scripting/GameEvents.h"

source/network/Network.h

@@ -47,7 +47,6 @@ MORE INFO
 
 #include "ps/Pyrogenesis.h"
 #include "ps/ThreadUtil.h"
-#include "ps/Singleton.h"
 
 #include "StreamSocket.h"
 

source/pch/atlas/precompiled.h

@@ -6,7 +6,5 @@
 
 #include "tools/atlas/GameInterface/Messages.h"
 #include "ps/CStr.h"
-#include "ps/Errors.h"
-#include "graphics/GameView.h"
 
 #endif // HAVE_PCH

source/ps/Font.h

@@ -1,13 +1,9 @@
 #ifndef _FONT_H
 #define _FONT_H
 
-#include "ps/Singleton.h"
-#include "ps/CStr.h"
-
 #include "lib/res/handle.h"
 
-#include <map>
-#include <string>
+class CStrW;
 
 /*
 

source/ps/Game.cpp

@@ -49,6 +49,8 @@ CGame::CGame():
 	m_Time(0),
 	m_SimRate(1.0f)
 {
+	// Need to set the CObjectManager references after various objects have
+	// been initialised, so do it here rather than via the initialisers above.
 	m_World->GetUnitManager().SetObjectManager(m_GameView->GetObjectManager());
 }
 

source/renderer/PatchRData.cpp

@@ -11,6 +11,8 @@
 #include "AlphaMapCalculator.h"
 #include "ps/CLogger.h"
 #include "ps/Profile.h"
+#include "ps/Game.h"
+#include "ps/World.h"
 #include "maths/MathUtil.h"
 #include "simulation/LOSManager.h"
 #include "graphics/Patch.h"

source/renderer/TerrainRenderer.cpp

@@ -22,6 +22,7 @@
 #include "ps/Game.h"
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"	// MICROLOG
+#include "ps/World.h"
 
 #include "simulation/LOSManager.h"
 

source/simulation/EntityTemplate.h

@@ -36,12 +36,12 @@ public:
 	CPlayer* m_player;		// Which player this template is for, or null for the no-player template
 							// used to read unmodified values for upgrades and such.
 
-	CEntityTemplate( CPlayer* player );
+	CEntityTemplate(CPlayer* player);
 	~CEntityTemplate();
 	// Load from XML
-	bool loadXML( const CStr& filename );
+	bool loadXML(const CStr& filename);
 	// Load a tree of properties from an XML (XMB) node.
-	void XMLLoadProperty( const CXeromyces& XeroFile, const XMBElement& Source, const CStrW& BasePropertyName );
+	void XMLLoadProperty(const CXeromyces& XeroFile, const XMBElement& Source, const CStrW& BasePropertyName);
 
 	// Base stats
 	CEntityTemplate* m_base;
@@ -64,7 +64,7 @@ public:
 	CBoundingObject::EBoundingType m_bound_type;
 
 	// Sound properties
-	typedef STL_HASH_MAP<CStr8, CStr8, CStrW_hash_compare> SoundGroupTable;
+	typedef STL_HASH_MAP<CStr, CStr, CStr_hash_compare> SoundGroupTable;
 	SoundGroupTable m_SoundGroupTable;
 	
 	//SP properties
@@ -165,9 +165,9 @@ public:
 	// Script-bound functions
 
 	// Get script execution contexts - always run in the context of the entity that fired it.
-	JSObject* GetScriptExecContext( IEventTarget* target );
+	JSObject* GetScriptExecContext(IEventTarget* target);
 
-	jsval ToString( JSContext* cx, uintN argc, jsval* argv );
+	jsval ToString(JSContext* cx, uintN argc, jsval* argv);
 
 	static void ScriptingInit();
 

source/simulation/LOSManager.h

@@ -16,11 +16,6 @@
 #ifndef LOS_MANAGER_INCLUDED
 #define LOS_MANAGER_INCLUDED
 
-#include "ps/Singleton.h"
-#include "ps/Game.h"
-#include "ps/World.h"
-#include "ps/Player.h"
-
 class CUnit;
 class CEntity;
 class CPlayer;

source/simulation/Projectile.h

@@ -9,7 +9,6 @@
 
 #include "maths/Vector3D.h"
 #include "ps/Vector2D.h"
-#include "ps/Singleton.h"
 #include "scripting/ScriptableObject.h"
 #include "scripting/DOMEvent.h"
 #include "ScriptObject.h"

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp

@@ -12,6 +12,7 @@
 #include "ps/Game.h"
 #include "ps/GameAttributes.h"
 #include "ps/Loader.h"
+#include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "simulation/LOSManager.h"
 #include "simulation/Simulation.h"