Index: ps/trunk/source/graphics/MapReader.cpp
===================================================================
--- ps/trunk/source/graphics/MapReader.cpp	(revision 2037)
+++ ps/trunk/source/graphics/MapReader.cpp	(revision 2038)
@@ -1,309 +1,315 @@
 #include "precompiled.h"
 
 #include "lib/types.h"
 #include "MapReader.h"
 #include "UnitManager.h"
 #include "Unit.h"
 #include "Game.h"
 #include "ObjectManager.h"
 #include "BaseEntity.h"
 #include "BaseEntityCollection.h"
 #include "EntityManager.h"
 
 #include "Model.h"
 #include "Terrain.h"
 #include "TextureManager.h"
 
 #include "timer.h"
+#include "Loader.h"
+#include "LoaderThunks.h"
 
 // CMapReader constructor: nothing to do at the minute
 CMapReader::CMapReader()
 {
 }
 
+
 // LoadMap: try to load the map from given file; reinitialise the scene to new data if successful
-void CMapReader::LoadMap(const char* filename, CTerrain *pTerrain, CUnitManager *pUnitMan, CLightEnv *pLightEnv)
+void CMapReader::LoadMap(const char* filename, CTerrain *pTerrain_, CUnitManager *pUnitMan_, CLightEnv *pLightEnv_)
 {
-	TIMER(__CMapReader__LoadMap);
+	// latch parameters (held until DelayedLoadFinished)
+	pTerrain = pTerrain_;
+	pUnitMan = pUnitMan_;
+	pLightEnv = pLightEnv_;
 
-	CFileUnpacker unpacker;
-	{
-		TIMER(____CMapReader__LoadMap__read);
-		unpacker.Read(filename,"PSMP");
-	}
+	// [25ms]
+	unpacker.Read(filename,"PSMP");
 
 	// check version 
 	if (unpacker.GetVersion()<FILE_READ_VERSION) {
 		throw CFileUnpacker::CFileVersionError();
 	}
 
 	// unpack the data
-	UnpackMap(unpacker);
+	RegMemFun(this, &CMapReader::UnpackMap, L"CMapReader::UnpackMap", 691);
 
 	// apply data to the world
-	ApplyData(unpacker, pTerrain, pUnitMan, pLightEnv);
+	RegMemFun(this, &CMapReader::ApplyData, L"CMapReader::ApplyData", 415);
 
 	if (unpacker.GetVersion()>=3) {
 		// read the corresponding XML file
-		CStr filename_xml (filename);
+		filename_xml = filename;
 		filename_xml = filename_xml.Left(filename_xml.Length()-4) + ".xml";
-		ReadXML(filename_xml);
+		RegMemFun(this, &CMapReader::ReadXML, L"CMapReader::ReadXML", 1320);
 	}
+
+	RegMemFun(this, &CMapReader::DelayLoadFinished, L"CMapReader::DelayLoadFinished", 3);
 }
 
 // UnpackMap: unpack the given data from the raw data stream into local variables
-void CMapReader::UnpackMap(CFileUnpacker& unpacker)
+void CMapReader::UnpackMap()
 {
-TIMER(____CMapReader__UnpackMap);
-
 	// now unpack everything into local data
-	UnpackTerrain(unpacker);
-	UnpackObjects(unpacker);
+	UnpackTerrain();
+	UnpackObjects();
 	if (unpacker.GetVersion()>=2) {
-		UnpackLightEnv(unpacker);
+		UnpackLightEnv();
 	}
 }
 
 // UnpackLightEnv: unpack lighting parameters from input stream
-void CMapReader::UnpackLightEnv(CFileUnpacker& unpacker)
+void CMapReader::UnpackLightEnv()
 {
 	unpacker.UnpackRaw(&m_LightEnv.m_SunColor,sizeof(m_LightEnv.m_SunColor));
 	unpacker.UnpackRaw(&m_LightEnv.m_Elevation,sizeof(m_LightEnv.m_Elevation));
 	unpacker.UnpackRaw(&m_LightEnv.m_Rotation,sizeof(m_LightEnv.m_Rotation));
 	unpacker.UnpackRaw(&m_LightEnv.m_TerrainAmbientColor,sizeof(m_LightEnv.m_TerrainAmbientColor));
 	unpacker.UnpackRaw(&m_LightEnv.m_UnitsAmbientColor,sizeof(m_LightEnv.m_UnitsAmbientColor));
     m_LightEnv.CalculateSunDirection();
 }
 
 // UnpackObjects: unpack world objects from input stream
-void CMapReader::UnpackObjects(CFileUnpacker& unpacker)
+void CMapReader::UnpackObjects()
 {
 	// unpack object types
 	u32 numObjTypes;
 	unpacker.UnpackRaw(&numObjTypes,sizeof(numObjTypes));	
 	m_ObjectTypes.resize(numObjTypes);
 	for (uint i=0;i<numObjTypes;i++) {
 		unpacker.UnpackString(m_ObjectTypes[i]);
 	}
 	
 	// unpack object data
 	u32 numObjects;
 	unpacker.UnpackRaw(&numObjects,sizeof(numObjects));	
 	m_Objects.resize(numObjects);
 	unpacker.UnpackRaw(&m_Objects[0],sizeof(SObjectDesc)*numObjects);	
 }
 
 // UnpackTerrain: unpack the terrain from the end of the input data stream
 //		- data: map size, heightmap, list of textures used by map, texture tile assignments
-void CMapReader::UnpackTerrain(CFileUnpacker& unpacker)
+void CMapReader::UnpackTerrain()
 {
 	// unpack map size
 	unpacker.UnpackRaw(&m_MapSize,sizeof(m_MapSize));	
 	
 	// unpack heightmap
 	u32 verticesPerSide=m_MapSize*PATCH_SIZE+1;
 	m_Heightmap.resize(SQR(verticesPerSide));
 	unpacker.UnpackRaw(&m_Heightmap[0],SQR(verticesPerSide)*sizeof(u16));	
 	
 	// unpack texture names; find handle for each texture
 	u32 numTextures;
 	unpacker.UnpackRaw(&numTextures,sizeof(numTextures));	
 
 	m_TerrainTextures.reserve(numTextures);
 	for (uint i=0;i<numTextures;i++) {
 		CStr texturename;
 		unpacker.UnpackString(texturename);
 
 		Handle handle;
 		CTextureEntry* texentry=g_TexMan.FindTexture(texturename);
 		if (!texentry) {
 			// ack; mismatch between texture datasets?
 			handle=0;
 		} else {
 			handle=texentry->GetHandle();
 		}
 		m_TerrainTextures.push_back(handle);
 	}
 	
 	// unpack tile data
 	u32 tilesPerSide=m_MapSize*PATCH_SIZE;
 	m_Tiles.resize(SQR(tilesPerSide));
 	unpacker.UnpackRaw(&m_Tiles[0],(u32)(sizeof(STileDesc)*m_Tiles.size()));	
 }
 
 // ApplyData: take all the input data, and rebuild the scene from it
-void CMapReader::ApplyData(CFileUnpacker& unpacker, CTerrain *pTerrain, CUnitManager *pUnitMan, CLightEnv *pLightEnv)
+void CMapReader::ApplyData()
 {
-TIMER(____CMapReader__ApplyData);
-
 	// initialise the terrain 
 	pTerrain->Initialize(m_MapSize,&m_Heightmap[0]);	
 
 	// setup the textures on the minipatches
 	STileDesc* tileptr=&m_Tiles[0];
 	for (u32 j=0;j<m_MapSize;j++) {
 		for (u32 i=0;i<m_MapSize;i++) {
 			for (u32 m=0;m<PATCH_SIZE;m++) {
 				for (u32 k=0;k<PATCH_SIZE;k++) {
 					CMiniPatch& mp=pTerrain->GetPatch(i,j)->m_MiniPatches[m][k];
 					
 					mp.Tex1=m_TerrainTextures[tileptr->m_Tex1Index];
 					mp.Tex1Priority=tileptr->m_Priority;
 
 					tileptr++;
 				}
 			}
 		}
 	}
 
 	// remove all existing entities (by recreating the entity manager)
 	delete &g_EntityManager;
 	new CEntityManager();
 	// delete all remaining non-entity units
 	pUnitMan->DeleteAll();
 	
 	// add new objects
 	for (u32 i=0;i<m_Objects.size();i++) {
 
 		if (unpacker.GetVersion() < 3) {
 			
 			// Hijack the standard actor instantiation for actors that correspond to entities.
 			// Not an ideal solution; we'll have to figure out a map format that can define entities separately or somesuch.
 
 			CBaseEntity* templateObject = g_EntityTemplateCollection.getTemplateByActor(m_ObjectTypes.at(m_Objects[i].m_ObjectIndex));
 		
 			if (templateObject)
 			{
 				CVector3D orient = ((CMatrix3D*)m_Objects[i].m_Transform)->GetIn();
 				CVector3D position = ((CMatrix3D*)m_Objects[i].m_Transform)->GetTranslation();
 
 				g_EntityManager.create(templateObject, position, atan2(-orient.X, -orient.Z));
 
 				continue;
 			}
 		}
 
 		CUnit* unit = g_UnitMan.CreateUnit(m_ObjectTypes.at(m_Objects[i].m_ObjectIndex), NULL);
 
 		if (unit)
 		{
 			CMatrix3D transform;
 			memcpy(&transform._11,m_Objects[i].m_Transform,sizeof(float)*16);
 			unit->GetModel()->SetTransform(transform);
 		}
 	}
 
 	if (unpacker.GetVersion()>=2) {
 		// copy over the lighting parameters
 		*pLightEnv=m_LightEnv;
 	}
 }
 
 
-void CMapReader::ReadXML(const char* filename)
+void CMapReader::ReadXML()
 {
-	TIMER(____CMapReader__ReadXML);
-
 #ifdef SCED
 	// HACK: ScEd uses absolute filenames, not VFS paths. I can't be bothered
 	// to make Xeromyces work with non-VFS, so just cheat:
-	CStr filename_vfs (filename);
+	CStr filename_vfs (filename_xml);
 	filename_vfs = filename_vfs.substr(filename_vfs.ReverseFind("\\mods\\official\\") + 15);
 	filename_vfs.Replace("\\", "/");
-	filename = filename_vfs;
+	filename_xml = filename_vfs;
 #endif
 
 	CXeromyces XeroFile;
-	if (XeroFile.Load(filename) != PSRETURN_OK)
+	if (XeroFile.Load(filename_xml) != PSRETURN_OK)
 		throw CFileUnpacker::CFileReadError();
 
 	// Define all the elements and attributes used in the XML file
 #define EL(x) int el_##x = XeroFile.getElementID(#x)
 #define AT(x) int at_##x = XeroFile.getAttributeID(#x)
 	EL(scenario);
 	EL(entities);
 	EL(entity);
 	EL(template);
 	EL(player);
 	EL(position);
 	EL(orientation);
 	AT(x);
 	AT(y);
 	AT(z);
 	AT(angle);
 #undef AT
 #undef EL
 
 	XMBElement root = XeroFile.getRoot();
 	assert(root.getNodeName() == el_scenario);
 
 	// <scenario>
 
 	XMBElementList children = root.getChildNodes();
 	for (int i = 0; i < children.Count; ++i)
 	{
 		XMBElement child = children.item(i);
 		if (child.getNodeName() == el_entities)
 		{
 			// <entities>
 
 			XMBElementList children = child.getChildNodes();
 			for (int i = 0; i < children.Count; ++i)
 			{
 				XMBElement child = children.item(i);
 				assert(child.getNodeName() == el_entity);
 
 				// <entity>
 
 				CStrW TemplateName;
 				int PlayerID;
 				CVector3D Position;
 				float Orientation;
 
 				XMBElementList children = child.getChildNodes();
 				for (int i = 0; i < children.Count; ++i)
 				{
 					XMBElement child = children.item(i);
 					int element_name = child.getNodeName();
 
 					if (element_name == el_template)
 					{
 						// <template>
 						TemplateName = child.getText();
 					}
 					else if (element_name == el_player)
 					{
 						// <player>
 						PlayerID = CStr(child.getText()).ToInt();
 					}
 					else if (element_name == el_position)
 					{
 						// <position>
 						XMBAttributeList attrs = child.getAttributes();
 						Position = CVector3D(
 							CStr(attrs.getNamedItem(at_x)).ToFloat(),
 							CStr(attrs.getNamedItem(at_y)).ToFloat(),
 							CStr(attrs.getNamedItem(at_z)).ToFloat()
 						);
 					}
 					else if (element_name == el_orientation)
 					{
 						// <orientation>
 						XMBAttributeList attrs = child.getAttributes();
 						Orientation = CStr(attrs.getNamedItem(at_angle)).ToFloat();
 					}
 					else
 						debug_warn("Invalid XML data - DTD shouldn't allow this");
 				}
 
 				HEntity ent = g_EntityManager.create(g_EntityTemplateCollection.getTemplate(TemplateName), Position, Orientation);
 
 				ent->SetPlayer(g_Game->GetPlayer(PlayerID));
 			}
 		}
 		else
 		{
 			debug_warn("Invalid XML data - DTD shouldn't allow this");
 		}
 	}
 }
+
+
+void CMapReader::DelayLoadFinished()
+{
+	// we were dynamically allocated by CWorld::Initialize
+	delete this;
+}
\ No newline at end of file
Index: ps/trunk/source/graphics/ObjectManager.cpp
===================================================================
--- ps/trunk/source/graphics/ObjectManager.cpp	(revision 2037)
+++ ps/trunk/source/graphics/ObjectManager.cpp	(revision 2038)
@@ -1,235 +1,233 @@
 #include "precompiled.h"
 
 #include "ObjectManager.h"
 #include <algorithm>
 #include "CLogger.h"
 #include "lib/res/res.h"
 #include "timer.h"
 #include "VFSUtil.h"
 #include "ObjectBase.h"
 
 #define LOG_CATEGORY "graphics"
 
 bool operator< (const CObjectManager::ObjectKey& a, const CObjectManager::ObjectKey& b)
 {
 	if (a.ActorName < b.ActorName)
 		return true;
 	else if (a.ActorName > b.ActorName)
 		return false;
 	else
 		return a.ActorVariation < b.ActorVariation;
 }
 
 CObjectManager::CObjectManager() : m_SelectedObject(0)
 {
 	m_ObjectTypes.reserve(32);
 }
 
 template<typename T, typename S> void delete_pair_2nd(std::pair<T,S> v) { delete v.second; }
 
 CObjectManager::~CObjectManager()
 {
 	m_SelectedObject = NULL;
 
 	for (size_t i = 0; i < m_ObjectTypes.size(); i++) {
 		std::for_each(
 			m_ObjectTypes[i].m_Objects.begin(),
 			m_ObjectTypes[i].m_Objects.end(),
 			delete_pair_2nd<ObjectKey, CObjectEntry*>
 		);
 		std::for_each(
 			m_ObjectTypes[i].m_ObjectBases.begin(),
 			m_ObjectTypes[i].m_ObjectBases.end(),
 			delete_pair_2nd<CStr, CObjectBase*>
 		);
 	}
 }
 
 
 // TODO (PT): Work out what the object 'types' are for, since they're not
 // doing anything obvious. (And if they're useless, remove them.)
 
 CObjectBase* CObjectManager::FindObjectBase(const char* objectname)
 {
 	// See if the base type has been loaded yet
 
 	for (uint k = 0; k < m_ObjectTypes.size(); k++)
 	{
 		std::map<CStr, CObjectBase*>::iterator it = m_ObjectTypes[k].m_ObjectBases.find(objectname);
 		if (it != m_ObjectTypes[k].m_ObjectBases.end())
 			return it->second;
 	}
 
 	// Not already loaded, so try to load it:
 
 	for (uint k = 0; k < m_ObjectTypes.size(); k++) {
 
 		std::map<CStr, CStr>::iterator it = m_ObjectTypes[k].m_ObjectNameToFilename.find(objectname);
 		if (it != m_ObjectTypes[k].m_ObjectNameToFilename.end())
 		{
 			CObjectBase* obj = new CObjectBase();
 
 			obj->Load(it->second);
 			m_ObjectTypes[k].m_ObjectBases[objectname] = obj;
 			return obj;
 		}
 	}
 
 	LOG(ERROR, LOG_CATEGORY, "CObjectManager::FindObject(): Cannot find object '%s'", objectname);
 
 	return 0;
 }
 
 CObjectEntry* CObjectManager::FindObject(const char* objname)
 {
 	CObjectBase* base = FindObjectBase(objname);
 
 	if (! base)
 		return NULL;
 
 	std::set<CStr> choices;
 	// TODO: Fill in these choices from somewhere, e.g.:
 	//choices.insert("whatever");
 
 	CObjectBase::variation_key var;
 	base->CalculateVariation(choices, var);
 
 	// Look to see whether this particular variation has already been loaded
 
 	ObjectKey key (CStr(objname), var);
 
 	std::map<ObjectKey, CObjectEntry*>::iterator it = m_ObjectTypes[0].m_Objects.find(key);
 	if (it != m_ObjectTypes[0].m_Objects.end())
 		return it->second;
 
 	// If it hasn't been loaded, load it now
 
 	CObjectEntry* obj = new CObjectEntry(0, base); // TODO: type ???
 
 	obj->ApplyRandomVariant(var);
 
 	if (! obj->BuildModel())
 	{
 		DeleteObject(obj);
 		return NULL;
 	}
 
 	m_ObjectTypes[0].m_Objects[key] = obj;
 
 	return obj;
 }
 
 
 void CObjectManager::AddObjectType(const char* name)
 {
 	m_ObjectTypes.resize(m_ObjectTypes.size()+1);
 	SObjectType& type=m_ObjectTypes.back();
 	type.m_Name=name;
 	type.m_Index=(int)m_ObjectTypes.size()-1;
 }
 
 
 void CObjectManager::AddObject(ObjectKey& key, CObjectEntry* entry, int type)
 {
 	assert((uint)type<m_ObjectTypes.size());
 	m_ObjectTypes[type].m_Objects.insert(std::make_pair(key, entry));
 }
 
 void CObjectManager::DeleteObject(CObjectEntry* entry)
 {
 	std::map<ObjectKey, CObjectEntry*>& objects = m_ObjectTypes[entry->m_Type].m_Objects;
 
 	for (std::map<ObjectKey, CObjectEntry*>::iterator it = objects.begin(); it != objects.end(); )
 		if (it->second == entry)
 			objects.erase(it++);
 		else
 			++it;
 
 	delete entry;
 }
 
 
 void CObjectManager::AddObjectBase(CObjectBase* base)
 {
 	m_ObjectTypes[0].m_ObjectBases.insert(make_pair(base->m_FileName, base));
 }
 
 void CObjectManager::DeleteObjectBase(CObjectBase* base)
 {
 	std::map<CStr, CObjectBase*>& objects = m_ObjectTypes[0].m_ObjectBases;
 
 	for (std::map<CStr, CObjectBase*>::iterator it = objects.begin(); it != objects.end(); )
 		if (it->second == base)
 			objects.erase(it++);
 		else
 			++it;
 
 	delete base;
 }
 
 
 void CObjectManager::LoadObjects()
 {
-	TIMER(__CObjectManager__LoadObjects);
-
 	AddObjectType("");
 
 	CStr root ("art/actors");
 	LoadObjectsIn(root);
 }
 
 void CObjectManager::LoadObjectsIn(CStr& pathname)
 {
 //*
 	// Temporary fix: There's currently no way to go from actor name to filename
 	// except for reading every file. That'll be solved by renaming them so that
 	// actor name == filename; but for now, just read them all:
 
 	VFSUtil::FileList files, subdirs;
 
 	if (! VFSUtil::FindFiles(pathname, "*.xml", files)
 	 || ! VFSUtil::FindFiles(pathname, "/", subdirs))
 		return;
 
 	VFSUtil::FileList::iterator it;
 
 	for (it = files.begin(); it != files.end(); ++it)
 	{
 		CStr objectName;
 		if (! CObjectBase::LoadName(*it, objectName))
 			LOG(ERROR, LOG_CATEGORY, "CObjectManager::LoadObjects(): %s: XML Load failed", it->c_str());
 		else
 		{
 			m_ObjectTypes[0].m_ObjectNameToFilename[objectName] = *it;
 //			debug_out("%s -> %s\n", objectName.c_str(), it->c_str());
 		}
 	}
 
 	for (it = subdirs.begin(); it != subdirs.end(); ++it)
 		LoadObjectsIn(*it);
 
 /*/
 
 	// ...or, alternatively, use the more efficient (but slightly inelegant and
 	// less flexible) method:
 
 	const char* names[] = {
 		"Black Horse","art/actors/fauna/horse_a.xml","Temp Deer1","art/actors/fauna/temp_deer1.xml","Temp Deer2","art/actors/fauna/temp_deer2.xml","Temp Deer3","art/actors/fauna/temp_deer3.xml","Temp Pig1","art/actors/fauna/temp_pig1.xml","Temp Rabbit1","art/actors/fauna/temp_rabbit1.xml","Temp Sheep1","art/actors/fauna/temp_sheep1.xml","Temp Sheep2","art/actors/fauna/temp_sheep2.xml","cypress","art/actors/flora/cypress1.xml","cypressb","art/actors/flora/cypress2.xml","Snow Pine2","art/actors/flora/snow_pine2.xml","Bush 1","art/actors/flora/wrld_flora_bush_1.xml","Bush 1 Snow","art/actors/flora/wrld_flora_bush_1_snow.xml","Bush 2","art/actors/flora/wrld_flora_bush_2.xml","Bush 2 Snow","art/actors/flora/wrld_flora_bush_2_snow.xml","Deciduous 1","art/actors/flora/wrld_flora_deci_1.xml","Grass 1","art/actors/flora/wrld_flora_grass_1.xml","Large Oak 1","art/actors/flora/wrld_flora_l_oak_1.xml","Large Oak 2","art/actors/flora/wrld_flora_l_oak_2.xml","Large Oak 3","art/actors/flora/wrld_flora_l_oak_3.xml","Oak 1","art/actors/flora/wrld_flora_oak_1.xml","Oak 2","art/actors/flora/wrld_flora_oak_2.xml","Oak3","art/actors/flora/wrld_flora_oak_3.xml","Oak 4","art/actors/flora/wrld_flora_oak_4.xml","Oak 5","art/actors/flora/wrld_flora_oak_5.xml","Pine1","art/actors/flora/wrld_flora_pine_1.xml","Pine10","art/actors/flora/wrld_flora_pine_10.xml","Pine11","art/actors/flora/wrld_flora_pine_11.xml","Pine2","art/actors/flora/wrld_flora_pine_2.xml","Pine3","art/actors/flora/wrld_flora_pine_3.xml","Pine4","art/actors/flora/wrld_flora_pine_4.xml","Pine5","art/actors/flora/wrld_flora_pine_5.xml","Pine6","art/actors/flora/wrld_flora_pine_6.xml","Pine7","art/actors/flora/wrld_flora_pine_7.xml","Pine8","art/actors/flora/wrld_flora_pine_8.xml","Pine9","art/actors/flora/wrld_flora_pine_9.xml","Palm A","art/actors/flora/wrld_palm_a.xml","Palm B","art/actors/flora/wrld_palm_b.xml","Palm C","art/actors/flora/wrld_palm_c.xml","Palm D","art/actors/flora/wrld_palm_d.xml","Palm E","art/actors/flora/wrld_palm_e.xml","Bush A 1","art/actors/foliage/bush_a_1.xml","Bush A 2","art/actors/foliage/bush_a_2.xml","Bush A 3","art/actors/foliage/bush_a_3.xml","Bush A 4","art/actors/foliage/bush_a_4.xml","Bush B 1","art/actors/foliage/bush_b_1.xml","Bush B 2","art/actors/foliage/bush_b_2.xml","Bush B 3","art/actors/foliage/bush_b_3.xml","Bush B 4","art/actors/foliage/bush_b_4.xml","Bush C 1","art/actors/foliage/bush_c_1.xml","Bush C 2","art/actors/foliage/bush_c_2.xml","Bush C 3","art/actors/foliage/bush_c_3.xml","Bush C 4","art/actors/foliage/bush_c_4.xml","Grass Bush Dry1","art/actors/foliage/bush_dry_a1.xml","Grass Bush Dry2","art/actors/foliage/bush_dry_a2.xml","Grass Bush Dry3","art/actors/foliage/bush_dry_a3.xml","Bush Highlands1","art/actors/foliage/bush_highlands1.xml","Bush Highlands2","art/actors/foliage/bush_highlands2.xml","Bush Highlands3","art/actors/foliage/bush_highlands3.xml","Bush Highlands4","art/actors/foliage/bush_highlands4.xml","Bush Highlands5","art/actors/foliage/bush_highlands5.xml","Bush Highlands6","art/actors/foliage/bush_highlands6.xml","Bush Highlands7","art/actors/foliage/bush_highlands7.xml","Deciduous 1","art/actors/foliage/deciduous_1.xml","Deciduous 2","art/actors/foliage/deciduous_2.xml","Grass Tall1","art/actors/foliage/grass_tall1.xml","Grass Tall2","art/actors/foliage/grass_tall2.xml","Grass Tall3","art/actors/foliage/grass_tall3.xml","Grass Tall4","art/actors/foliage/grass_tall4.xml","Grass Tufts A 1","art/actors/foliage/grass_tufts_a_1.xml","Grass Tufts A 2","art/actors/foliage/grass_tufts_a_2.xml","Grass Tufts A 3","art/actors/foliage/grass_tufts_a_3.xml","Reeds A 1","art/actors/foliage/reeds_a_1.xml","Reeds A 2","art/actors/foliage/reeds_a_2.xml","Reeds A 3","art/actors/foliage/reeds_a_3.xml","Vine A","art/actors/foliage/vine_a.xml","Vine B","art/actors/foliage/vine_b.xml","Vines 1 A","art/actors/foliage/vines_1_a.xml","Vines 1 B","art/actors/foliage/vines_1_b.xml","Vines 1 C","art/actors/foliage/vines_1_c.xml","Vine A","art/actors/foliage/vines_a.xml","Vine B","art/actors/foliage/vines_b.xml","Flower Bright1","art/actors/foliage/wrld_flower_bright1.xml","Flower Bright2","art/actors/foliage/wrld_flower_bright2.xml","Flower Bright3","art/actors/foliage/wrld_flower_bright3.xml","Flower Bright4","art/actors/foliage/wrld_flower_bright4.xml","Grass1","art/actors/foliage/wrld_fol_grass1.xml","Grass10","art/actors/foliage/wrld_fol_grass10.xml","Grass11","art/actors/foliage/wrld_fol_grass11.xml","Grass12","art/actors/foliage/wrld_fol_grass12.xml","Grass13","art/actors/foliage/wrld_fol_grass13.xml","Grass14","art/actors/foliage/wrld_fol_grass14.xml","Grass15","art/actors/foliage/wrld_fol_grass15.xml","Grass16","art/actors/foliage/wrld_fol_grass16.xml","Grass2","art/actors/foliage/wrld_fol_grass2.xml","Grass3","art/actors/foliage/wrld_fol_grass3.xml","Grass4","art/actors/foliage/wrld_fol_grass4.xml","Grass5","art/actors/foliage/wrld_fol_grass5.xml","Grass6","art/actors/foliage/wrld_fol_grass6.xml","Grass7","art/actors/foliage/wrld_fol_grass7.xml",
 		"Grass8","art/actors/foliage/wrld_fol_grass8.xml","Grass9","art/actors/foliage/wrld_fol_grass9.xml","Grass Crab1","art/actors/foliage/wrld_fol_grass_crab1.xml","Grass Crab2","art/actors/foliage/wrld_fol_grass_crab2.xml","Grass Crab3","art/actors/foliage/wrld_fol_grass_crab3.xml","Grass Crab4","art/actors/foliage/wrld_fol_grass_crab4.xml","Grass Crab5","art/actors/foliage/wrld_fol_grass_crab5.xml","Grass Crab6","art/actors/foliage/wrld_fol_grass_crab6.xml","Grass Crab7","art/actors/foliage/wrld_fol_grass_crab7.xml","Grass Crab8","art/actors/foliage/wrld_fol_grass_crab8.xml","Mushroom1","art/actors/foliage/wrld_fol_mushroom1.xml","Mushroom10","art/actors/foliage/wrld_fol_mushroom10.xml","Mushroom11","art/actors/foliage/wrld_fol_mushroom11.xml","Mushroom12","art/actors/foliage/wrld_fol_mushroom12.xml","Mushroom13","art/actors/foliage/wrld_fol_mushroom13.xml","Mushroom14","art/actors/foliage/wrld_fol_mushroom14.xml","Mushroom2","art/actors/foliage/wrld_fol_mushroom2.xml","Mushroom3","art/actors/foliage/wrld_fol_mushroom3.xml","Mushroom4","art/actors/foliage/wrld_fol_mushroom4.xml","Mushroom5","art/actors/foliage/wrld_fol_mushroom5.xml","Mushroom6","art/actors/foliage/wrld_fol_mushroom6.xml","Mushroom7","art/actors/foliage/wrld_fol_mushroom7.xml","Mushroom8","art/actors/foliage/wrld_fol_mushroom8.xml","Mushroom9","art/actors/foliage/wrld_fol_mushroom9.xml","Plant Large1","art/actors/foliage/wrld_fol_plant_lg1.xml","Plant Large2","art/actors/foliage/wrld_fol_plant_lg2.xml","Plant Large3","art/actors/foliage/wrld_fol_plant_lg3.xml","Plant Large4","art/actors/foliage/wrld_fol_plant_lg4.xml","Plant Large5","art/actors/foliage/wrld_fol_plant_lg5.xml","Plant Large6","art/actors/foliage/wrld_fol_plant_lg6.xml","Plant Large7","art/actors/foliage/wrld_fol_plant_lg7.xml","Plant Large8","art/actors/foliage/wrld_fol_plant_lg8.xml","Plant Large9","art/actors/foliage/wrld_fol_plant_lg9.xml","Plant Small1","art/actors/foliage/wrld_fol_plant_sm1.xml","Plant Small2","art/actors/foliage/wrld_fol_plant_sm2.xml","Plant Small3","art/actors/foliage/wrld_fol_plant_sm3.xml","Plant Small4","art/actors/foliage/wrld_fol_plant_sm4.xml","Plant Small5","art/actors/foliage/wrld_fol_plant_sm5.xml","Plant Small6","art/actors/foliage/wrld_fol_plant_sm6.xml","v Small7","art/actors/foliage/wrld_fol_plant_sm7.xml","Plant Small8","art/actors/foliage/wrld_fol_plant_sm8.xml","Plant Small9","art/actors/foliage/wrld_fol_plant_sm9.xml","Foliage Bush 1","art/actors/foliage/wrld_foliagebush_1.xml","Foliage Bush 2","art/actors/foliage/wrld_foliagebush_2.xml","Plant Mediterranean1","art/actors/foliage/wrld_plants_med1.xml","Plant Mediterranean2","art/actors/foliage/wrld_plants_med2.xml","Plant Mediterranean3","art/actors/foliage/wrld_plants_med3.xml","Plant Mediterranean4","art/actors/foliage/wrld_plants_med4.xml","Plant Mediterranean5","art/actors/foliage/wrld_plants_med5.xml","Plant Mediterranean6","art/actors/foliage/wrld_plants_med6.xml","Plant Mediterranean7","art/actors/foliage/wrld_plants_med7.xml","Rock 1 light Snow","art/actors/geology/copy_of_rock_1_light.xml","Rock 3 light Snow","art/actors/geology/copy_of_rock_3_light.xml","Rock 5 light Snow","art/actors/geology/copy_of_rock_5_light.xml","Rock 7 light Snow","art/actors/geology/copy_of_rock_7_light.xml","Rock Gray2","art/actors/geology/gray_rock1.xml","Rock 1 light","art/actors/geology/rock_1_light.xml","Rock 2 light","art/actors/geology/rock_2_light.xml","Rock 3 light","art/actors/geology/rock_3_light.xml","Rock 4 light","art/actors/geology/rock_4_light.xml","Rock 5 light","art/actors/geology/rock_5_light.xml","Rock 6 light","art/actors/geology/rock_6_light.xml","Rock 7 light","art/actors/geology/rock_7_light.xml","Rock 8 light","art/actors/geology/rock_8_light.xml","Rock Gray1","art/actors/geology/rock_gray1.xml","Rock Highland1","art/actors/geology/rock_highland1.xml","Rock Highland1 moss","art/actors/geology/rock_highland1_moss.xml","Rock Highland2","art/actors/geology/rock_highland2.xml","Rock Highland2 moss","art/actors/geology/rock_highland2_moss.xml","Rock Highland3","art/actors/geology/rock_highland3.xml","Rock Highland C","art/actors/geology/rock_highland_c.xml","Rock Highland D","art/actors/geology/rock_highland_d.xml","Rock Highland E","art/actors/geology/rock_highland_e.xml","Snow Rock1","art/actors/geology/rock_snow1.xml","Snow Rock2","art/actors/geology/rock_snow2.xml","Celt CivCentre Prop","art/actors/props/celts/celt_civcentre_prop.xml","Celt FarmCentre Prop","art/actors/props/celts/celt_farmcentre_prop.xml","Celt House1 Prop","art/actors/props/celts/celt_house1_prop.xml","Celt House2 Prop","art/actors/props/celts/celt_house2_prop.xml","Celt House3 Prop","art/actors/props/celts/celt_house3_prop.xml","Celt Megalith a","art/actors/props/celts/celt_megalith_a.xml","Celt Megalith B1","art/actors/props/celts/celt_megalith_b1.xml","Celt Megalith B2","art/actors/props/celts/celt_megalith_b2.xml","Celt Megalith B3","art/actors/props/celts/celt_megalith_b3.xml","Celt Megalith B4","art/actors/props/celts/celt_megalith_b4.xml","Celt MilitaryCentre Prop","art/actors/props/celts/celt_militarycentre_prop.xml","Celt PortCentre Prop","art/actors/props/celts/celt_portcentre_prop.xml","Celt Tartan A","art/actors/props/celts/celt_tartan_a.xml","Celt Tartan b","art/actors/props/celts/celt_tartan_b.xml","Celt Tartan c","art/actors/props/celts/celt_tartan_c.xml","Celt TradeCentre Prop","art/actors/props/celts/celt_tradecentre_prop.xml","1x1 Construct","art/actors/props/construct/1x1_construct.xml","1x1 Construct Tall","art/actors/props/construct/1x1_construct_t.xml","2x2 Construct","art/actors/props/construct/2x2_construct.xml","3x3 Construct","art/actors/props/construct/3x3_construct.xml","3x3 Construct Tall","art/actors/props/construct/3x3_construct_t.xml","4x4 Construct","art/actors/props/construct/4x4_construct.xml","4x4 Construct Tall","art/actors/props/construct/4x4_construct_t.xml","5x5 Construct","art/actors/props/construct/5x5_construct.xml","5x5 Construct Tall","art/actors/props/construct/5x5_construct_t.xml",
 		"Const Fence A","art/actors/props/construct/constr_fence_a.xml","Const Fence B","art/actors/props/construct/constr_fence_b.xml","Const Fence c","art/actors/props/construct/constr_fence_c.xml","Constr Post A","art/actors/props/construct/constr_post_a.xml","Constr Post B","art/actors/props/construct/constr_post_b.xml","Constr Post C","art/actors/props/construct/constr_post_c.xml","Corner Post A","art/actors/props/construct/corner_post_a.xml","Corner Post B","art/actors/props/construct/corner_post_b.xml","Corner Post C","art/actors/props/construct/corner_post_c.xml","Anvil","art/actors/props/eyecandy/anvil.xml","Barrel A","art/actors/props/eyecandy/barrel_a.xml","Basket A","art/actors/props/eyecandy/basket_a.xml","Basket b","art/actors/props/eyecandy/basket_b.xml","Basket C","art/actors/props/eyecandy/basket_c.xml","Basket Celt A","art/actors/props/eyecandy/basket_celt_a.xml","Basket Celt B","art/actors/props/eyecandy/basket_celt_b.xml","Basket Celt C","art/actors/props/eyecandy/basket_celt_c.xml","Basket Celt D","art/actors/props/eyecandy/basket_celt_d.xml","Basket Celt E","art/actors/props/eyecandy/basket_celt_e.xml","Basket D","art/actors/props/eyecandy/basket_d.xml","Basket E","art/actors/props/eyecandy/basket_e.xml","Basket Helenes A","art/actors/props/eyecandy/basket_hele_a.xml","Basket Helenes B","art/actors/props/eyecandy/basket_hele_b.xml","Basket Helenes C","art/actors/props/eyecandy/basket_hele_c.xml","Basket Helenes D","art/actors/props/eyecandy/basket_hele_d.xml","Basket Helenes E","art/actors/props/eyecandy/basket_hele_e.xml","Basket Iberian A","art/actors/props/eyecandy/basket_iber_a.xml","Basket Iberian B","art/actors/props/eyecandy/basket_iber_b.xml","Basket Iberian C","art/actors/props/eyecandy/basket_iber_c.xml","Basket Iberian E","art/actors/props/eyecandy/basket_iber_e.xml","Basket Rome A","art/actors/props/eyecandy/basket_rome_a.xml","Basket Rome B","art/actors/props/eyecandy/basket_rome_b.xml","Basket Rome C","art/actors/props/eyecandy/basket_rome_c.xml","Basket Rome D","art/actors/props/eyecandy/basket_rome_d.xml","Basket Rome E","art/actors/props/eyecandy/basket_rome_e.xml","Bench 1","art/actors/props/eyecandy/bench_1.xml","Block Granite","art/actors/props/eyecandy/block_granite.xml","Block Sandstone","art/actors/props/eyecandy/block_limestone.xml","Block Limestone","art/actors/props/eyecandy/block_sandstone.xml","Blocks Granite Pile A","art/actors/props/eyecandy/blocks_granite_pile_a.xml","Blocks Granite Pile B","art/actors/props/eyecandy/blocks_granite_pile_b.xml","Blocks Limestone Pile A","art/actors/props/eyecandy/blocks_limestone_pile_a.xml","Blocks Limestone Pile B","art/actors/props/eyecandy/blocks_limestone_pile_b.xml","Blocks Sandstone Pile A","art/actors/props/eyecandy/blocks_sandstone_pile_a.xml","Blocks Sandstone Pile B","art/actors/props/eyecandy/blocks_sandstone_pile_b.xml","Crate A","art/actors/props/eyecandy/crate_a.xml","Cypress Large","art/actors/props/eyecandy/Cypress Large.xml","Cypress Potted A","art/actors/props/eyecandy/Cypress Potted A.xml","Cypress Potted B","art/actors/props/eyecandy/Cypress Potted B.xml","Cypress Row A","art/actors/props/eyecandy/Cypress Row A.xml","Cypress Small","art/actors/props/eyecandy/Cypress Small.xml","Cypress Potted A","art/actors/props/eyecandy/cypress_potted_a.xml","Cypress Row A","art/actors/props/eyecandy/cypress_row_a.xml","Dummy A","art/actors/props/eyecandy/dummy_a.xml","Handcart 1","art/actors/props/eyecandy/handcart 1.xml","Handcart 1 Broken","art/actors/props/eyecandy/handcart_1_broken.xml","Hay A","art/actors/props/eyecandy/hay_a.xml","Hay Large","art/actors/props/eyecandy/hay_large.xml","Hay Small","art/actors/props/eyecandy/hay_small.xml","Produce Bin A","art/actors/props/eyecandy/produce_bin_a.xml","Produce Bin B","art/actors/props/eyecandy/produce_bin_b.xml","Produce Bin c","art/actors/props/eyecandy/produce_bin_c.xml","Produce Bin d","art/actors/props/eyecandy/produce_bin_d.xml","Rome Basket A","art/actors/props/eyecandy/rome_basket_a.xml","Rome Basket B","art/actors/props/eyecandy/rome_basket_b.xml","Rome Basket C","art/actors/props/eyecandy/rome_basket_c.xml","Rome Basket D","art/actors/props/eyecandy/rome_basket_d.xml","Rome Basket E","art/actors/props/eyecandy/rome_basket_e.xml","Sack 1","art/actors/props/eyecandy/sack_1.xml","Sack 1 Rough","art/actors/props/eyecandy/sack_1_rough.xml","Table 1 Long","art/actors/props/eyecandy/table1_long.xml","Table 1 Short","art/actors/props/eyecandy/table1_short.xml","Vase Rome A","art/actors/props/eyecandy/vase_rome_a.xml","Vase Rome B","art/actors/props/eyecandy/vase_rome_b.xml","Vase Rome C","art/actors/props/eyecandy/vase_rome_c.xml","Vase Rome E","art/actors/props/eyecandy/vase_rome_e.xml","Vase Rome F","art/actors/props/eyecandy/vase_rome_f.xml","Waterbin A","art/actors/props/eyecandy/waterbin a.xml","Waterbin A","art/actors/props/eyecandy/waterbin_a.xml","Well 1 A","art/actors/props/eyecandy/well_1_a.xml","Well 1 B","art/actors/props/eyecandy/well_1_b.xml","Well 1 C","art/actors/props/eyecandy/well_1_c.xml","Well 1 D","art/actors/props/eyecandy/well_1_d.xml","Well Water","art/actors/props/eyecandy/well_water.xml","Well Woodbit","art/actors/props/eyecandy/well_woodbit.xml","Wheel Laying","art/actors/props/eyecandy/wheel_laying.xml","Wood 1 A","art/actors/props/eyecandy/wood_1_a.xml","Wood 1 B","art/actors/props/eyecandy/wood_1_b.xml","Wood 1 C","art/actors/props/eyecandy/wood_1_c.xml","Wood 1 D","art/actors/props/eyecandy/wood_1_d.xml","Wood Pile 1 A","art/actors/props/eyecandy/wood_pile_1_a.xml","Wood Pile 1 B","art/actors/props/eyecandy/wood_pile_1_b.xml","Wood Pile 1 C","art/actors/props/eyecandy/wood_pile_1_c.xml","Wood Small Pile A","art/actors/props/eyecandy/wood_sm_pile_a.xml","Wood Small Pile B","art/actors/props/eyecandy/wood_sm_pile_b.xml","Wood Small 1 A","art/actors/props/eyecandy/wood_small_1_a.xml","Wood Small 1 B","art/actors/props/eyecandy/wood_small_1_b.xml","Wood Small 1 C","art/actors/props/eyecandy/wood_small_1_c.xml","Woodcord A","art/actors/props/eyecandy/woodcord.xml","Cypress Large","art/actors/props/gaia/cypress_large.xml",
 		"Cypress Potted A","art/actors/props/gaia/cypress_potted_a.xml","Cypress Potted B","art/actors/props/gaia/cypress_potted_b.xml","Cypress Row A","art/actors/props/gaia/cypress_row_a.xml","Cypress Small","art/actors/props/gaia/cypress_small.xml","Dude Head","art/actors/props/head/dude_head.xml","Dudette Head","art/actors/props/head/dudette_head.xml","Celtic Head","art/actors/props/head/plac_head_celt.xml","Hellene Head","art/actors/props/head/plac_head_hele.xml","Iberian Head","art/actors/props/head/plac_head_iber.xml","Persian Head","art/actors/props/head/plac_head_pers.xml","Roman Head","art/actors/props/head/plac_head_rome.xml","Carthaginian Head","art/actors/props/head/plac_hele_kart.xml","Helenes Helmet 1","art/actors/props/head/prop_hele_helm_1.xml","Hellenes Civilisation Center Prop","art/actors/props/hellenes/hellenes_civilisation_center_prop.xml","Hellenes Fortress Prop","art/actors/props/hellenes/hellenes_fortress_prop.xml","Hellenes Health Center Prop","art/actors/props/hellenes/hellenes_health_center_prop.xml","Hellenes House1 Prop","art/actors/props/hellenes/hellenes_house1_prop.xml","Hellenes House2 Prop","art/actors/props/hellenes/hellenes_house2_prop.xml","Hellenes House3 Prop","art/actors/props/hellenes/hellenes_house3_prop.xml","Hellenes Military Center Prop","art/actors/props/hellenes/hellenes_military_center_prop.xml","Hellenes Trade Center Prop","art/actors/props/hellenes/hellenes_trade_center_prop.xml","Waypoint Flag","art/actors/props/map/wrld_waypoint_flag.xml","Persian Civil Center Prop","art/actors/props/persians/pers_cc_b.xml","Persian Farmstead Prop","art/actors/props/persians/pers_fc.xml","Persian Fortress Prop","art/actors/props/persians/pers_ff_b.xml","Persian Temple Prop","art/actors/props/persians/pers_hc_b.xml","Persian House A Prop","art/actors/props/persians/pers_ho_a.xml","Persian House B Prop","art/actors/props/persians/pers_ho_b.xml","Persian House C Prop","art/actors/props/persians/pers_ho_c.xml","Persian House D Prop","art/actors/props/persians/pers_ho_d.xml","Persian Barracks Prop","art/actors/props/persians/pers_mc.xml","Persian Dock Prop","art/actors/props/persians/pers_pc.xml","Persian Mill Prop","art/actors/props/persians/pers_rc.xml","Persian Market Prop","art/actors/props/persians/pers_tc_a.xml","Persian Market Prop Fancy","art/actors/props/persians/pers_tc_b.xml","Roman Door 1","art/actors/props/romans/rome_door_1.xml","Roman Door 2","art/actors/props/romans/rome_door_2.xml","Roman House 3 Vines","art/actors/props/romans/rome_ho3_vines.xml","Roman Window 1","art/actors/props/romans/rome_window_1.xml","Roman Window 2","art/actors/props/romans/rome_window_2.xml","Roman Window 3","art/actors/props/romans/rome_window_3.xml","Roman Window 4","art/actors/props/romans/rome_window_4.xml","Roman Window 5","art/actors/props/romans/rome_window_5.xml","Roman Window 6","art/actors/props/romans/rome_window_6.xml","Roman Window MC","art/actors/props/romans/rome_window_mc.xml","Celtic Dip A","art/actors/props/shield/celt_dip_a.xml","Celtic Dip B","art/actors/props/shield/celt_dip_b.xml","Celtic Dip C","art/actors/props/shield/celt_dip_c.xml","Celtic Dip D","art/actors/props/shield/celt_dip_d.xml","Celtic Dip E","art/actors/props/shield/celt_dip_e.xml","Celtic Hex A","art/actors/props/shield/celt_hex_a.xml","Celtic Hex B","art/actors/props/shield/celt_hex_b.xml","Celtic Hex C","art/actors/props/shield/celt_hex_c.xml","Celtic Hex D","art/actors/props/shield/celt_hex_d.xml","Celtic Hex E","art/actors/props/shield/celt_hex_e.xml","Celtic Oval A","art/actors/props/shield/celt_oval_a.xml","Celtic Oval B","art/actors/props/shield/celt_oval_b.xml","Celtic Oval C","art/actors/props/shield/celt_oval_c.xml","Celtic Oval D","art/actors/props/shield/celt_oval_d.xml","Celtic Round A","art/actors/props/shield/celt_round_a.xml","Celtic Round B","art/actors/props/shield/celt_round_b.xml","Celtic Round C","art/actors/props/shield/celt_round_c.xml","Celtic Round D","art/actors/props/shield/celt_round_d.xml","Celtic Round E","art/actors/props/shield/celt_round_e.xml","Celtic Round F","art/actors/props/shield/celt_round_f.xml","Celtic Round G","art/actors/props/shield/celt_round_g.xml","Celtic Round H","art/actors/props/shield/celt_round_h.xml","Celtic Round I","art/actors/props/shield/celt_round_i.xml","Celtic Round J","art/actors/props/shield/celt_round_j.xml","Celtic Round K","art/actors/props/shield/celt_round_k.xml","Celtic Round L","art/actors/props/shield/celt_round_l.xml","Celtic Round M","art/actors/props/shield/celt_round_m.xml","Celtic Round N","art/actors/props/shield/celt_round_n.xml","Celtic Scutum A","art/actors/props/shield/celt_scutum_a.xml","Celtic Scutum B","art/actors/props/shield/celt_scutum_b.xml","Celtic Scutum C","art/actors/props/shield/celt_scutum_c.xml","Celtic Scutum D","art/actors/props/shield/celt_scutum_d.xml","Celtic Scutum E","art/actors/props/shield/celt_scutum_e.xml","Celtic Scutum F","art/actors/props/shield/celt_scutum_f.xml","Celtic Scutum G","art/actors/props/shield/celt_scutum_g.xml","Celtic Scutum H","art/actors/props/shield/celt_scutum_h.xml","Celtic Scutum I","art/actors/props/shield/celt_scutum_i.xml","Celtic Scutum J","art/actors/props/shield/celt_scutum_j.xml","Celtic Scutum K","art/actors/props/shield/celt_scutum_k.xml","Celtic Scutum L","art/actors/props/shield/celt_scutum_l.xml","Dip Back","art/actors/props/shield/dip_a_back.xml","Hellenes Pelta A","art/actors/props/shield/hele_pelta_a.xml","Hellenes Pelta B","art/actors/props/shield/hele_pelta_b.xml","Hellenes Pelta C","art/actors/props/shield/hele_pelta_c.xml","Hellenes Pelta D","art/actors/props/shield/hele_pelta_d.xml","Hellenes Pelta E","art/actors/props/shield/hele_pelta_e.xml","Hellenes Pelta F","art/actors/props/shield/hele_pelta_f.xml","Hellenes Pelta G","art/actors/props/shield/hele_pelta_g.xml","Hellenes Pelta H","art/actors/props/shield/hele_pelta_h.xml","Hellenes Pelta I","art/actors/props/shield/hele_pelta_i.xml","Hellenes Pelta J","art/actors/props/shield/hele_pelta_j.xml","Hellenes Pelta K","art/actors/props/shield/hele_pelta_k.xml","Hellenes Pelta L","art/actors/props/shield/hele_pelta_l.xml","Hex Back","art/actors/props/shield/hex_a_back.xml","Oval Back","art/actors/props/shield/oval_back.xml",
 		"Pelta Back","art/actors/props/shield/pelta_a_back.xml","Helenes Shield 1","art/actors/props/shield/prop_hele_shld_1.xml","Round Back","art/actors/props/shield/round_back.xml","Scutum Back","art/actors/props/shield/scutum_back.xml","Shield Roman Large 1","art/actors/props/shield/shld_rome_la_1.xml","Shield Roman Large 10","art/actors/props/shield/shld_rome_la_10.xml","Shield Roman Large 2","art/actors/props/shield/shld_rome_la_2.xml","Shield Roman Large 3","art/actors/props/shield/shld_rome_la_3.xml","Shield Roman Large 4","art/actors/props/shield/shld_rome_la_4.xml","Shield Roman Large 5","art/actors/props/shield/shld_rome_la_5.xml","Shield Roman Large 6","art/actors/props/shield/shld_rome_la_6.xml","Shield Roman Large 7","art/actors/props/shield/shld_rome_la_7.xml","Shield Roman Large 8","art/actors/props/shield/shld_rome_la_8.xml","Shield Roman Large 9","art/actors/props/shield/shld_rome_la_9.xml","Shield Roman Small 1","art/actors/props/shield/shld_rome_sm_1.xml","Shield Roman Small 10","art/actors/props/shield/shld_rome_sm_10.xml","Shield Roman Small 11","art/actors/props/shield/shld_rome_sm_11.xml","Shield Roman Small 2","art/actors/props/shield/shld_rome_sm_2.xml","Shield Roman Small 3","art/actors/props/shield/shld_rome_sm_3.xml","Shield Roman Small 4","art/actors/props/shield/shld_rome_sm_4.xml","Shield Roman Small 5","art/actors/props/shield/shld_rome_sm_5.xml","Shield Roman Small 6","art/actors/props/shield/shld_rome_sm_6.xml","Shield Roman Small 7","art/actors/props/shield/shld_rome_sm_7.xml","Shield Roman Small 8","art/actors/props/shield/shld_rome_sm_8.xml","Shield Roman Small 9","art/actors/props/shield/shld_rome_sm_9.xml","Test Tower Shield","art/actors/props/shield/test_towershield.xml","Breastplate","art/actors/props/temp/breastplate.xml","Cape","art/actors/props/temp/cape.xml","C Sign CAR A","art/actors/props/temp/celt_sign_car_a.xml","C Sign CAR B","art/actors/props/temp/celt_sign_car_b.xml","C Sign CAR E","art/actors/props/temp/celt_sign_car_e.xml","C Sign CJV A","art/actors/props/temp/celt_sign_cjv_a.xml","C Sign CJV B","art/actors/props/temp/celt_sign_cjv_b.xml","C Sign CJV E","art/actors/props/temp/celt_sign_cjv_e.xml","C Sign CSP A","art/actors/props/temp/celt_sign_csp_a.xml","C Sign CSP B","art/actors/props/temp/celt_sign_csp_b.xml","C Sign CSP E","art/actors/props/temp/celt_sign_csp_e.xml","C Sign CSW A","art/actors/props/temp/celt_sign_csw_a.xml","C Sign CSW B","art/actors/props/temp/celt_sign_csw_b.xml","C Sign CSW E","art/actors/props/temp/celt_sign_csw_e.xml","C Sign FEM","art/actors/props/temp/celt_sign_fem.xml","C Sign HR1","art/actors/props/temp/celt_sign_hr1.xml","C Sign HR2","art/actors/props/temp/celt_sign_hr2.xml","C Sign HR3","art/actors/props/temp/celt_sign_hr3.xml","C Sign IAR A","art/actors/props/temp/celt_sign_iar_a.xml","C Sign IAR B","art/actors/props/temp/celt_sign_iar_b.xml","C Sign IAR E","art/actors/props/temp/celt_sign_iar_e.xml","C Sign IJV A","art/actors/props/temp/celt_sign_ijv_a.xml","C Sign IJV B","art/actors/props/temp/celt_sign_ijv_b.xml","C Sign IJV E","art/actors/props/temp/celt_sign_ijv_e.xml","C Sign ISL A","art/actors/props/temp/celt_sign_isl_a.xml","C Sign ISL B","art/actors/props/temp/celt_sign_isl_b.xml","C Sign ISL E","art/actors/props/temp/celt_sign_isl_e.xml","C Sign ISP A","art/actors/props/temp/celt_sign_isp_a.xml","C Sign ISP B","art/actors/props/temp/celt_sign_isp_b.xml","C Sign ISP E","art/actors/props/temp/celt_sign_isp_e.xml","C Sign ISW A","art/actors/props/temp/celt_sign_isw_a.xml","C Sign ISW B","art/actors/props/temp/celt_sign_isw_b.xml","C Sign ISW E","art/actors/props/temp/celt_sign_isw_e.xml","C Sign MED","art/actors/props/temp/celt_sign_med.xml","C Sign SU1","art/actors/props/temp/celt_sign_su1.xml","C Sign SU2","art/actors/props/temp/celt_sign_su2.xml","C Sign SU3","art/actors/props/temp/celt_sign_su3.xml","C Sign TRD","art/actors/props/temp/celt_sign_trd.xml","H Sign CAR A","art/actors/props/temp/hele_sign_car_a.xml","H Sign CAR B","art/actors/props/temp/hele_sign_car_b.xml","H Sign CAR E","art/actors/props/temp/hele_sign_car_e.xml","H Sign CJV A","art/actors/props/temp/hele_sign_cjv_a.xml","H Sign CJV B","art/actors/props/temp/hele_sign_cjv_b.xml","H Sign CJV E","art/actors/props/temp/hele_sign_cjv_e.xml","H Sign CSP A","art/actors/props/temp/hele_sign_csp_a.xml","H Sign CSP B","art/actors/props/temp/hele_sign_csp_b.xml","H Sign CSP E","art/actors/props/temp/hele_sign_csp_e.xml","H Sign CSW A","art/actors/props/temp/hele_sign_csw_a.xml","H Sign CSW B","art/actors/props/temp/hele_sign_csw_b.xml","H Sign CSW E","art/actors/props/temp/hele_sign_csw_e.xml","H Sign FEM","art/actors/props/temp/hele_sign_fem.xml","H Sign HR1","art/actors/props/temp/hele_sign_hr1.xml","H Sign HR2","art/actors/props/temp/hele_sign_hr2.xml","H Sign HR3","art/actors/props/temp/hele_sign_hr3.xml","H Sign IAR A","art/actors/props/temp/hele_sign_iar_a.xml","H Sign IAR B","art/actors/props/temp/hele_sign_iar_b.xml","H Sign IAR E","art/actors/props/temp/hele_sign_iar_e.xml","H Sign IJV A","art/actors/props/temp/hele_sign_ijv_a.xml","H Sign IJV B","art/actors/props/temp/hele_sign_ijv_b.xml","H Sign IJV E","art/actors/props/temp/hele_sign_ijv_e.xml","H Sign ISL A","art/actors/props/temp/hele_sign_isl_a.xml","H Sign ISL B","art/actors/props/temp/hele_sign_isl_b.xml","H Sign ISL E","art/actors/props/temp/hele_sign_isl_e.xml","H Sign ISP A","art/actors/props/temp/hele_sign_isp_a.xml","H Sign ISP B","art/actors/props/temp/hele_sign_isp_b.xml","H Sign ISP E","art/actors/props/temp/hele_sign_isp_e.xml","H Sign ISW A","art/actors/props/temp/hele_sign_isw_a.xml","H Sign ISW B","art/actors/props/temp/hele_sign_isw_b.xml","H Sign ISW E","art/actors/props/temp/hele_sign_isw_e.xml","H Sign MED","art/actors/props/temp/hele_sign_med.xml","H Sign SU1","art/actors/props/temp/hele_sign_su1.xml","H Sign SU2","art/actors/props/temp/hele_sign_su2.xml","H Sign SU3","art/actors/props/temp/hele_sign_su3.xml","H Sign TRD","art/actors/props/temp/hele_sign_trd.xml",
 		"I Sign CAR A","art/actors/props/temp/iber_sign_car_a.xml","I Sign CAR B","art/actors/props/temp/iber_sign_car_b.xml","I Sign CAR E","art/actors/props/temp/iber_sign_car_e.xml","I Sign CJV A","art/actors/props/temp/iber_sign_cjv_a.xml","I Sign CJV B","art/actors/props/temp/iber_sign_cjv_b.xml","I Sign CJV E","art/actors/props/temp/iber_sign_cjv_e.xml","I Sign CSP A","art/actors/props/temp/iber_sign_csp_a.xml","I Sign CSP B","art/actors/props/temp/iber_sign_csp_b.xml","I Sign CSP E","art/actors/props/temp/iber_sign_csp_e.xml","I Sign CSW A","art/actors/props/temp/iber_sign_csw_a.xml","I Sign CSW B","art/actors/props/temp/iber_sign_csw_b.xml","I Sign CSW E","art/actors/props/temp/iber_sign_csw_e.xml","I Sign FEM","art/actors/props/temp/iber_sign_fem.xml","I Sign HR1","art/actors/props/temp/iber_sign_hr1.xml","I Sign HR2","art/actors/props/temp/iber_sign_hr2.xml","I Sign HR3","art/actors/props/temp/iber_sign_hr3.xml","I Sign IAR A","art/actors/props/temp/iber_sign_iar_a.xml","I Sign IAR B","art/actors/props/temp/iber_sign_iar_b.xml","I Sign IAR E","art/actors/props/temp/iber_sign_iar_e.xml","I Sign IJV A","art/actors/props/temp/iber_sign_ijv_a.xml","I Sign IJV B","art/actors/props/temp/iber_sign_ijv_b.xml","I Sign IJV E","art/actors/props/temp/iber_sign_ijv_e.xml","I Sign ISL A","art/actors/props/temp/iber_sign_isl_a.xml","I Sign ISL B","art/actors/props/temp/iber_sign_isl_b.xml","I Sign ISL E","art/actors/props/temp/iber_sign_isl_e.xml","I Sign ISP A","art/actors/props/temp/iber_sign_isp_a.xml","I Sign ISP B","art/actors/props/temp/iber_sign_isp_b.xml","I Sign ISP E","art/actors/props/temp/iber_sign_isp_e.xml","I Sign ISW A","art/actors/props/temp/iber_sign_isw_a.xml","I Sign ISW B","art/actors/props/temp/iber_sign_isw_b.xml","I Sign ISW E","art/actors/props/temp/iber_sign_isw_e.xml","I Sign MED","art/actors/props/temp/iber_sign_med.xml","I Sign SU1","art/actors/props/temp/iber_sign_su1.xml","I Sign SU2","art/actors/props/temp/iber_sign_su2.xml","I Sign SU3","art/actors/props/temp/iber_sign_su3.xml","I Sign TRD","art/actors/props/temp/iber_sign_trd.xml","K Sign CAR A","art/actors/props/temp/kart_sign_car_a.xml","K Sign CAR B","art/actors/props/temp/kart_sign_car_b.xml","K Sign CAR E","art/actors/props/temp/kart_sign_car_e.xml","K Sign CJV A","art/actors/props/temp/kart_sign_cjv_a.xml","K Sign CJV B","art/actors/props/temp/kart_sign_cjv_b.xml","K Sign CJV E","art/actors/props/temp/kart_sign_cjv_e.xml","K Sign CSP A","art/actors/props/temp/kart_sign_csp_a.xml","K Sign CSP B","art/actors/props/temp/kart_sign_csp_b.xml","K Sign CSP E","art/actors/props/temp/kart_sign_csp_e.xml","K Sign CSW A","art/actors/props/temp/kart_sign_csw_a.xml","K Sign CSW B","art/actors/props/temp/kart_sign_csw_b.xml","K Sign CSW E","art/actors/props/temp/kart_sign_csw_e.xml","K Sign FEM","art/actors/props/temp/kart_sign_fem.xml","K Sign HR1","art/actors/props/temp/kart_sign_hr1.xml","K Sign HR2","art/actors/props/temp/kart_sign_hr2.xml","K Sign HR3","art/actors/props/temp/kart_sign_hr3.xml","K Sign IAR A","art/actors/props/temp/kart_sign_iar_a.xml","K Sign IAR B","art/actors/props/temp/kart_sign_iar_b.xml","K Sign IAR E","art/actors/props/temp/kart_sign_iar_e.xml","K Sign IJV A","art/actors/props/temp/kart_sign_ijv_a.xml","K Sign IJV B","art/actors/props/temp/kart_sign_ijv_b.xml","K Sign IJV E","art/actors/props/temp/kart_sign_ijv_e.xml","K Sign ISL A","art/actors/props/temp/kart_sign_isl_a.xml","K Sign ISL B","art/actors/props/temp/kart_sign_isl_b.xml","K Sign ISL E","art/actors/props/temp/kart_sign_isl_e.xml","K Sign ISP A","art/actors/props/temp/kart_sign_isp_a.xml","K Sign ISP B","art/actors/props/temp/kart_sign_isp_b.xml","K Sign ISP E","art/actors/props/temp/kart_sign_isp_e.xml","K Sign ISW A","art/actors/props/temp/kart_sign_isw_a.xml","K Sign ISW B","art/actors/props/temp/kart_sign_isw_b.xml","K Sign ISW E","art/actors/props/temp/kart_sign_isw_e.xml","K Sign MED","art/actors/props/temp/kart_sign_med.xml","K Sign SU1","art/actors/props/temp/kart_sign_su1.xml","K Sign SU2","art/actors/props/temp/kart_sign_su2.xml","K Sign SU3","art/actors/props/temp/kart_sign_su3.xml","K Sign TRD","art/actors/props/temp/kart_sign_trd.xml","Left Boot","art/actors/props/temp/l_boot.xml","Left Glove","art/actors/props/temp/l_glove.xml","Left Sheath","art/actors/props/temp/l_sheath.xml","Left Shoulder","art/actors/props/temp/l_shoulder.xml","P Sign CAR A","art/actors/props/temp/pers_sign_car_a.xml","P Sign CAR B","art/actors/props/temp/pers_sign_car_b.xml","P Sign CAR E","art/actors/props/temp/pers_sign_car_e.xml","P Sign CJV A","art/actors/props/temp/pers_sign_cjv_a.xml","P Sign CJV B","art/actors/props/temp/pers_sign_cjv_b.xml","P Sign CJV E","art/actors/props/temp/pers_sign_cjv_e.xml","P Sign CSP A","art/actors/props/temp/pers_sign_csp_a.xml","P Sign CSP B","art/actors/props/temp/pers_sign_csp_b.xml","P Sign CSP E","art/actors/props/temp/pers_sign_csp_e.xml","P Sign CSW A","art/actors/props/temp/pers_sign_csw_a.xml","P Sign CSW B","art/actors/props/temp/pers_sign_csw_b.xml","P Sign CSW E","art/actors/props/temp/pers_sign_csw_e.xml","P Sign FEM","art/actors/props/temp/pers_sign_fem.xml","P Sign HR1","art/actors/props/temp/pers_sign_hr1.xml","P Sign HR2","art/actors/props/temp/pers_sign_hr2.xml","P Sign HR3","art/actors/props/temp/pers_sign_hr3.xml","P Sign IAR A","art/actors/props/temp/pers_sign_iar_a.xml","P Sign IAR B","art/actors/props/temp/pers_sign_iar_b.xml","P Sign IAR E","art/actors/props/temp/pers_sign_iar_e.xml","P Sign IJV A","art/actors/props/temp/pers_sign_ijv_a.xml","P Sign IJV B","art/actors/props/temp/pers_sign_ijv_b.xml","P Sign IJV E","art/actors/props/temp/pers_sign_ijv_e.xml","P Sign ISL A","art/actors/props/temp/pers_sign_isl_a.xml","P Sign ISL B","art/actors/props/temp/pers_sign_isl_b.xml",
 		"P Sign ISL E","art/actors/props/temp/pers_sign_isl_e.xml","P Sign ISP A","art/actors/props/temp/pers_sign_isp_a.xml","P Sign ISP B","art/actors/props/temp/pers_sign_isp_b.xml","P Sign ISP E","art/actors/props/temp/pers_sign_isp_e.xml","P Sign ISW A","art/actors/props/temp/pers_sign_isw_a.xml","P Sign ISW B","art/actors/props/temp/pers_sign_isw_b.xml","P Sign ISW E","art/actors/props/temp/pers_sign_isw_e.xml","P Sign MED","art/actors/props/temp/pers_sign_med.xml","P Sign SU1","art/actors/props/temp/pers_sign_su1.xml","P Sign SU2","art/actors/props/temp/pers_sign_su2.xml","P Sign SU3","art/actors/props/temp/pers_sign_su3.xml","P Sign TRD","art/actors/props/temp/pers_sign_trd.xml","Advanced Helmet","art/actors/props/temp/plac_helmet_a.xml","Elite Helmet","art/actors/props/temp/plac_helmet_e.xml","Quiver","art/actors/props/temp/quiver.xml","Right Boot","art/actors/props/temp/r_boot.xml","Right Glove","art/actors/props/temp/r_glove.xml","Right Sheath","art/actors/props/temp/r_sheath.xml","Right Shoulder","art/actors/props/temp/r_shoulder.xml","R Sign CAR A","art/actors/props/temp/rome_sign_car_a.xml","R Sign CAR B","art/actors/props/temp/rome_sign_car_b.xml","R Sign CAR E","art/actors/props/temp/rome_sign_car_e.xml","R Sign CJV A","art/actors/props/temp/rome_sign_cjv_a.xml","R Sign CJV B","art/actors/props/temp/rome_sign_cjv_b.xml","R Sign CJV E","art/actors/props/temp/rome_sign_cjv_e.xml","R Sign CSP A","art/actors/props/temp/rome_sign_csp_a.xml","R Sign CSP B","art/actors/props/temp/rome_sign_csp_b.xml","R Sign CSP E","art/actors/props/temp/rome_sign_csp_e.xml","R Sign CSW A","art/actors/props/temp/rome_sign_csw_a.xml","R Sign CSW B","art/actors/props/temp/rome_sign_csw_b.xml","R Sign CSW E","art/actors/props/temp/rome_sign_csw_e.xml","R Sign FEM","art/actors/props/temp/rome_sign_fem.xml","R Sign HR1","art/actors/props/temp/rome_sign_hr1.xml","R Sign HR2","art/actors/props/temp/rome_sign_hr2.xml","R Sign HR3","art/actors/props/temp/rome_sign_hr3.xml","R Sign IAR A","art/actors/props/temp/rome_sign_iar_a.xml","R Sign IAR B","art/actors/props/temp/rome_sign_iar_b.xml","R Sign IAR E","art/actors/props/temp/rome_sign_iar_e.xml","R Sign IJV A","art/actors/props/temp/rome_sign_ijv_a.xml","R Sign IJV B","art/actors/props/temp/rome_sign_ijv_b.xml","R Sign IJV E","art/actors/props/temp/rome_sign_ijv_e.xml","R Sign ISL A","art/actors/props/temp/rome_sign_isl_a.xml","R Sign ISL B","art/actors/props/temp/rome_sign_isl_b.xml","R Sign ISL E","art/actors/props/temp/rome_sign_isl_e.xml","R Sign ISP A","art/actors/props/temp/rome_sign_isp_a.xml","R Sign ISP B","art/actors/props/temp/rome_sign_isp_b.xml","R Sign ISP E","art/actors/props/temp/rome_sign_isp_e.xml","R Sign ISW A","art/actors/props/temp/rome_sign_isw_a.xml","R Sign ISW B","art/actors/props/temp/rome_sign_isw_b.xml","R Sign ISW E","art/actors/props/temp/rome_sign_isw_e.xml","R Sign MED","art/actors/props/temp/rome_sign_med.xml","R Sign SU1","art/actors/props/temp/rome_sign_su1.xml","R Sign SU2","art/actors/props/temp/rome_sign_su2.xml","R Sign SU3","art/actors/props/temp/rome_sign_su3.xml","R Sign TRD","art/actors/props/temp/rome_sign_trd.xml","25 Shield Test","art/actors/props/temp/shield_pc_test_01.xml","24 Shield Test","art/actors/props/temp/shield_pc_test_02.xml","23 Shield Test","art/actors/props/temp/shield_pc_test_03.xml","22 Shield Test","art/actors/props/temp/shield_pc_test_04.xml","21 Shield Test","art/actors/props/temp/shield_pc_test_05.xml","20 Shield Test","art/actors/props/temp/shield_pc_test_06.xml","19 Shield Test","art/actors/props/temp/shield_pc_test_07.xml","18 Shield Test","art/actors/props/temp/shield_pc_test_08.xml","17 Shield Test","art/actors/props/temp/shield_pc_test_09.xml","16 Shield Test","art/actors/props/temp/shield_pc_test_10.xml","15 Shield Test","art/actors/props/temp/shield_pc_test_11.xml","14 Shield Test","art/actors/props/temp/shield_pc_test_12.xml","13 Shield Test","art/actors/props/temp/shield_pc_test_13.xml","12 Shield Test","art/actors/props/temp/shield_pc_test_14.xml","11 Shield Test","art/actors/props/temp/shield_pc_test_15.xml","10 Shield Test","art/actors/props/temp/shield_pc_test_16.xml","09 Shield Test","art/actors/props/temp/shield_pc_test_17.xml","08 Shield Test","art/actors/props/temp/shield_pc_test_18.xml","07 Shield Test","art/actors/props/temp/shield_pc_test_19.xml","06 Shield Test","art/actors/props/temp/shield_pc_test_20.xml","05 Shield Test","art/actors/props/temp/shield_pc_test_21.xml","04 Shield Test","art/actors/props/temp/shield_pc_test_22.xml","03 Shield Test","art/actors/props/temp/shield_pc_test_23.xml","02 Shield Test","art/actors/props/temp/shield_pc_test_24.xml","01 Shield Test","art/actors/props/temp/shield_pc_test_25.xml","26 Shield Test","art/actors/props/temp/shield_pc_test_26.xml","Sign CAR A","art/actors/props/temp/sign_car_a.xml","Sign CAR B","art/actors/props/temp/sign_car_b.xml","Sign CAR E","art/actors/props/temp/sign_car_e.xml","Sign CJV A","art/actors/props/temp/sign_cjv_a.xml","Sign CJV B","art/actors/props/temp/sign_cjv_b.xml","Sign CJV E","art/actors/props/temp/sign_cjv_e.xml","Sign CSP A","art/actors/props/temp/sign_csp_a.xml","Sign CSP B","art/actors/props/temp/sign_csp_b.xml","Sign CSP E","art/actors/props/temp/sign_csp_e.xml","Sign CSW A","art/actors/props/temp/sign_csw_a.xml","Sign CSW B","art/actors/props/temp/sign_csw_b.xml","Sign CSW E","art/actors/props/temp/sign_csw_e.xml","Sign FEM","art/actors/props/temp/sign_fem.xml","Sign HR1","art/actors/props/temp/sign_hr1.xml","Sign HR2","art/actors/props/temp/sign_hr2.xml","Sign HR3","art/actors/props/temp/sign_hr3.xml","Sign IAR A","art/actors/props/temp/sign_iar_a.xml","Sign IAR B","art/actors/props/temp/sign_iar_b.xml","Sign IAR E","art/actors/props/temp/sign_iar_e.xml",
 		"Sign IJV A","art/actors/props/temp/sign_ijv_a.xml","Sign IJV B","art/actors/props/temp/sign_ijv_b.xml","Sign IJV E","art/actors/props/temp/sign_ijv_e.xml","Sign ISL A","art/actors/props/temp/sign_isl_a.xml","Sign ISL B","art/actors/props/temp/sign_isl_b.xml","Sign ISL E","art/actors/props/temp/sign_isl_e.xml","Sign ISP A","art/actors/props/temp/sign_isp_a.xml","Sign ISP B","art/actors/props/temp/sign_isp_b.xml","Sign ISP E","art/actors/props/temp/sign_isp_e.xml","Sign ISW A","art/actors/props/temp/sign_isw_a.xml","Sign ISW B","art/actors/props/temp/sign_isw_b.xml","Sign ISW E","art/actors/props/temp/sign_isw_e.xml","Sign MED","art/actors/props/temp/sign_med.xml","Sign SU1","art/actors/props/temp/sign_su1.xml","Sign SU2","art/actors/props/temp/sign_su2.xml","Sign SU3","art/actors/props/temp/sign_su3.xml","Sign TRD","art/actors/props/temp/sign_trd.xml","Axe","art/actors/props/tool/handaxe.xml","Handscythe","art/actors/props/tool/prop_handscythe.xml","Mallet","art/actors/props/tool/prop_mallet.xml","Pitchfork","art/actors/props/tool/prop_pitchfork.xml","Scythe","art/actors/props/tool/prop_scythe.xml","Shovel A","art/actors/props/tool/prop_shovel_a.xml","Shovel B","art/actors/props/tool/prop_shovel_b.xml","Spade","art/actors/props/tool/prop_spade.xml","Akinakes A","art/actors/props/weapon/weap_akin_a.xml","Akinakes B","art/actors/props/weapon/weap_akin_b.xml","Akinakes C","art/actors/props/weapon/weap_akin_c.xml","Akinakes D","art/actors/props/weapon/weap_akin_d.xml","Axe A","art/actors/props/weapon/weap_axe_a.xml","Axe B","art/actors/props/weapon/weap_axe_b.xml","Axe C","art/actors/props/weapon/weap_axe_c.xml","Axe D","art/actors/props/weapon/weap_axe_d.xml","Bow A","art/actors/props/weapon/weap_bow_a.xml","Bow B","art/actors/props/weapon/weap_bow_b.xml","Bow C","art/actors/props/weapon/weap_bow_c.xml","Bow D","art/actors/props/weapon/weap_bow_d.xml","Bow E","art/actors/props/weapon/weap_bow_e.xml","Bow F","art/actors/props/weapon/weap_bow_f.xml","Bow G","art/actors/props/weapon/weap_bow_g.xml","Bow H","art/actors/props/weapon/weap_bow_h.xml","Bow I","art/actors/props/weapon/weap_bow_i.xml","Celt Sword A","art/actors/props/weapon/weap_csword_a.xml","Celt Sword B","art/actors/props/weapon/weap_csword_b.xml","Celt Sword C","art/actors/props/weapon/weap_csword_c.xml","Falcata A","art/actors/props/weapon/weap_falcata_a.xml","Falcata B","art/actors/props/weapon/weap_falcata_b.xml","Falcata C","art/actors/props/weapon/weap_falcata_c.xml","Falcata D","art/actors/props/weapon/weap_falcata_d.xml","Falcata E","art/actors/props/weapon/weap_falcata_e.xml","Gladus A","art/actors/props/weapon/weap_gladus_a.xml","Gladus B","art/actors/props/weapon/weap_gladus_b.xml","Gladus C","art/actors/props/weapon/weap_gladus_c.xml","Gladus D","art/actors/props/weapon/weap_gladus_d.xml","Gladus E","art/actors/props/weapon/weap_gladus_e.xml","Gladus F","art/actors/props/weapon/weap_gladus_f.xml","Gladus G","art/actors/props/weapon/weap_gladus_g.xml","Gladus H","art/actors/props/weapon/weap_gladus_h.xml","Javelin A","art/actors/props/weapon/weap_jav_a.xml","Javelin B","art/actors/props/weapon/weap_jav_b.xml","Javelin C","art/actors/props/weapon/weap_jav_c.xml","Javelin D","art/actors/props/weapon/weap_jav_d.xml","Javelin E","art/actors/props/weapon/weap_jav_e.xml","Javelin F","art/actors/props/weapon/weap_jav_f.xml","Javelin G","art/actors/props/weapon/weap_jav_g.xml","Pilum A","art/actors/props/weapon/weap_pillum_a.xml","Pilum B","art/actors/props/weapon/weap_pillum_b.xml","Pilum C","art/actors/props/weapon/weap_pillum_c.xml","Pilum D","art/actors/props/weapon/weap_pillum_d.xml","Pilum E","art/actors/props/weapon/weap_pillum_e.xml","Pilum F","art/actors/props/weapon/weap_pillum_f.xml","Sling A","art/actors/props/weapon/weap_sling_a.xml","Sling B","art/actors/props/weapon/weap_sling_b.xml","Spear A","art/actors/props/weapon/weap_spear_a.xml","Spear B","art/actors/props/weapon/weap_spear_b.xml","Spear Ball A","art/actors/props/weapon/weap_spear_ball_a.xml","Spear Ball B","art/actors/props/weapon/weap_spear_ball_b.xml","Spear Ball C","art/actors/props/weapon/weap_spear_ball_c.xml","Spear Ball D","art/actors/props/weapon/weap_spear_ball_d.xml","Spear Ball E","art/actors/props/weapon/weap_spear_ball_e.xml","Spear C","art/actors/props/weapon/weap_spear_c.xml","Spear D","art/actors/props/weapon/weap_spear_d.xml","Spear E","art/actors/props/weapon/weap_spear_e.xml","Spear Long A","art/actors/props/weapon/weap_spear_long_a.xml","Spear Long B","art/actors/props/weapon/weap_spear_long_b.xml","Spear Long C","art/actors/props/weapon/weap_spear_long_c.xml","Spear Long D","art/actors/props/weapon/weap_spear_long_d.xml","Spear Long E","art/actors/props/weapon/weap_spear_long_e.xml","Xiphos A","art/actors/props/weapon/weap_xiphos_a.xml","Xiphos B","art/actors/props/weapon/weap_xiphos_b.xml","Xiphos C","art/actors/props/weapon/weap_xiphos_c.xml","Xiphos D","art/actors/props/weapon/weap_xiphos_d.xml","Xiphos E","art/actors/props/weapon/weap_xiphos_e.xml","Xiphos F","art/actors/props/weapon/weap_xiphos_f.xml","[winter]Hellenes Civilisation Center Prop","art/actors/props/winter/[winter]hellenes_civilisation_center_prop.xml","[winter]Hellenes Fortress Prop","art/actors/props/winter/[winter]hellenes_fortress_prop.xml","[winter]Hellenes Health Center Prop","art/actors/props/winter/[winter]hellenes_health_center_prop.xml","[winter]Hellenes House1 Prop","art/actors/props/winter/[winter]hellenes_house1_prop.xml","[winter]Hellenes House2 Prop","art/actors/props/winter/[winter]hellenes_house2_prop.xml","[winter]Hellenes House3 Prop","art/actors/props/winter/[winter]hellenes_house3_prop.xml",
 		"[winter]Hellenes Military Center Prop","art/actors/props/winter/[winter]hellenes_military_center_prop.xml","[winter]Hellenes Trade Center Prop","art/actors/props/winter/[winter]hellenes_trade_center_prop.xml","Animal Pen","art/actors/scenario/animal_pen.xml","Fence Wood Long A","art/actors/scenario/fence_wood_long_a.xml","Fence Wood Short A","art/actors/scenario/fence_wood_short_a.xml","[Winter]Hellenes Civilisation Centre","art/actors/scenario/hele_cc_w.xml","[winter]Hellenes House 1","art/actors/scenario/hele_ho_a_w.xml","[winter]Hellenes House 2","art/actors/scenario/hele_ho_b_w.xml","[winter]Hellenes House 3","art/actors/scenario/hele_ho_c_w.xml","[winter]Hellenes Millitary Centre","art/actors/scenario/hele_mc_w.xml","[winter]Hellenes Port Centre","art/actors/scenario/hele_pc_w.xml","[winter]Hellenes Tower","art/actors/scenario/hele_st_w.xml","[winter]Hellenes Trade Centre","art/actors/scenario/hele_tc_w.xml","[winter]Hellenes Wall Section","art/actors/scenario/hele_ws_w.xml","Global Illumination Test","art/actors/special/global.xml","prop","art/actors/special/prop_proptest.xml","proptest","art/actors/special/proptest.xml","Poly Test","art/actors/special/test_poly.xml","Trans Test","art/actors/special/test_trans.xml","Celt Civil Center","art/actors/structures/celt_cc.xml","Celt Farmstead","art/actors/structures/celt_fc.xml","Gaullic Fortress","art/actors/structures/celt_ff_a.xml","Briton Fortress","art/actors/structures/celt_ff_b.xml","Celt Temple","art/actors/structures/celt_hc.xml","Celt House 1","art/actors/structures/celt_ho_a.xml","Celt House 2","art/actors/structures/celt_ho_b.xml","Celt House 3","art/actors/structures/celt_ho_c.xml","Celt Barracks","art/actors/structures/celt_mc.xml","Celt Dock","art/actors/structures/celt_pc.xml","Celt Mill","art/actors/structures/celt_rc.xml","Celt Scout Tower","art/actors/structures/celt_st.xml","Celt Market","art/actors/structures/celt_tc.xml","1x1 Construct","art/actors/structures/cnst_1x1.xml","1x1 Construct Tall","art/actors/structures/cnst_1x1_t.xml","2x2 Construct","art/actors/structures/cnst_2x2.xml","3x3 Construct","art/actors/structures/cnst_3x3.xml","3x3 Construct Tall","art/actors/structures/cnst_3x3_t.xml","4x4 Construct","art/actors/structures/cnst_4x4.xml","4x4 Construct Tall","art/actors/structures/cnst_4x4_t.xml","5x5 Construct","art/actors/structures/cnst_5x5.xml","5x5 Construct Tall","art/actors/structures/cnst_5x5_t.xml","Foundation 1x1","art/actors/structures/fndn_1x1.xml","Foundation 2x2","art/actors/structures/fndn_2x2.xml","Foundation 3x3","art/actors/structures/fndn_3x3.xml","Foundation 4x4","art/actors/structures/fndn_4x4.xml","Foundation 5x5","art/actors/structures/fndn_5x5.xml","Hellenes Civil Center","art/actors/structures/hele_cc.xml","Hellenes Farmstead","art/actors/structures/hele_fc.xml","Hellenes Fortress","art/actors/structures/hele_ff.xml","Hellenes Temple","art/actors/structures/hele_hc.xml","Hellenes House A","art/actors/structures/hele_ho_a.xml","Hellenes House B","art/actors/structures/hele_ho_b.xml","Hellenes House C","art/actors/structures/hele_ho_c.xml","Hellenes Barracks","art/actors/structures/hele_mc.xml","Hellenes Dock","art/actors/structures/hele_pc.xml","Hellenes Mill","art/actors/structures/hele_rc.xml","Hellenes Scout Tower","art/actors/structures/hele_st.xml","Hellenes Market","art/actors/structures/hele_tc.xml","Hellenes Wall Section","art/actors/structures/hele_ws.xml","Iberian Civil Center","art/actors/structures/iber_cc.xml","Iberian Farmstead","art/actors/structures/iber_fc.xml","Iberian Fortress","art/actors/structures/iber_ff.xml","Iberian Temple","art/actors/structures/iber_hc.xml","Iberian House A","art/actors/structures/iber_ho_a.xml","Iberian House B","art/actors/structures/iber_ho_b.xml","Iberian House C","art/actors/structures/iber_ho_c.xml","Iberian Barracks","art/actors/structures/iber_mc.xml","Iberian Dock","art/actors/structures/iber_pc.xml","Iberian Mill","art/actors/structures/iber_rc.xml","Iberian Scout Tower","art/actors/structures/iber_st.xml","Iberian Market","art/actors/structures/iber_tc.xml","Carthaginian Civil Center","art/actors/structures/kart_cc.xml","Carthaginian Farmstead","art/actors/structures/kart_fc.xml","Carthaginian Fortress","art/actors/structures/kart_ff.xml","Carthaginian Temple","art/actors/structures/kart_hc.xml","Carthaginian House A","art/actors/structures/kart_ho_a.xml","Carthaginian House B","art/actors/structures/kart_ho_b.xml","Carthaginian House C","art/actors/structures/kart_ho_c.xml","Carthaginian Barracks","art/actors/structures/kart_mc.xml","Carthaginian Dock","art/actors/structures/kart_pc.xml","Carthaginian Mill","art/actors/structures/kart_rc.xml","Carthaginian Scout Tower","art/actors/structures/kart_st.xml","Carthaginian Market","art/actors/structures/kart_tc.xml","Persian Civil Center","art/actors/structures/pers_cc.xml","Persian Farmstead","art/actors/structures/pers_fc.xml","Persian Fortress","art/actors/structures/pers_ff.xml","Persian Temple","art/actors/structures/pers_hc.xml","Persian House A","art/actors/structures/pers_ho_a.xml","Persian House B","art/actors/structures/pers_ho_b.xml","Persian House C","art/actors/structures/pers_ho_c.xml","Persian House D","art/actors/structures/pers_ho_d.xml","Persian Barracks","art/actors/structures/pers_mc.xml","Persian Dock","art/actors/structures/pers_pc.xml","Persian Mill","art/actors/structures/pers_rc.xml","Persian Scout Tower","art/actors/structures/pers_st.xml","Persian Market","art/actors/structures/pers_tc.xml","Roman Civil Center","art/actors/structures/rome_cc.xml","Rome Farmstead","art/actors/structures/rome_fc.xml","Roman Fortress","art/actors/structures/rome_ff.xml","Roman Temple","art/actors/structures/rome_hc.xml",
 		"Rome House A","art/actors/structures/rome_ho_a.xml","Roman House B","art/actors/structures/rome_ho_b.xml","Roman House C","art/actors/structures/rome_ho_c.xml","Rome Barracks","art/actors/structures/rome_mc.xml","Roman Dock","art/actors/structures/rome_pc.xml","Roman Mill","art/actors/structures/rome_rc.xml","Roman Scout Tower","art/actors/structures/rome_st.xml","Roman Market","art/actors/structures/rome_tc.xml","Snowman","art/actors/structures/snowman.xml","Settlement Hellenes A","art/actors/structures/stlm_hele.xml","rome_cc","art/actors/test/rome_cc.xml","test_dude","art/actors/test/test_dude.xml","Celtic Advanced Javelinist Cavalry","art/actors/units/celt_cjv_a.xml","Celtic Advanced Javelinist Rider","art/actors/units/celt_cjv_a_r.xml","Celtic Basic Javelinist Cavalry","art/actors/units/celt_cjv_b.xml","Celtic Basic Javelinist Rider","art/actors/units/celt_cjv_b_r.xml","Celtic Elite Javelinist Cavalry","art/actors/units/celt_cjv_e.xml","Celtic Elite Javelinist Rider","art/actors/units/celt_cjv_e_r.xml","Celtic Advanced Spearman Cavalry","art/actors/units/celt_csp_a.xml","Celtic Advanced Spearman Rider","art/actors/units/celt_csp_a_r.xml","Celtic Basic Spearman Cavalry","art/actors/units/celt_csp_b.xml","Celtic Basic Spearman Rider","art/actors/units/celt_csp_b_r.xml","Celtic Elite Spearman Cavalry","art/actors/units/celt_csp_e.xml","Celtic Elite Spearman Rider","art/actors/units/celt_csp_e_r.xml","Celtic Advanced Spearman Cavalry","art/actors/units/celt_csw_a.xml","Celtic Advanced Swordsman Rider","art/actors/units/celt_csw_a_r.xml","Celtic Basic Swordsman Cavalry","art/actors/units/celt_csw_b.xml","Celtic Basic Swordsman Rider","art/actors/units/celt_csw_b_r.xml","Celtic Elite Swordsman Cavalry","art/actors/units/celt_csw_e.xml","Celtic Elite Swordsman Rider","art/actors/units/celt_csw_e_r.xml","Celtic Female Citizen","art/actors/units/celt_fem.xml","Celtic Advanced Javelinist Infantry","art/actors/units/celt_ijv_a.xml","Celtic Basic Javelinist Infantry","art/actors/units/celt_ijv_b.xml","Celtic Elite Javelinist Infantry","art/actors/units/celt_ijv_e.xml","Celtic Advanced Spearman Infantry","art/actors/units/celt_isp_a.xml","Celtic Basic Spearman Infantry","art/actors/units/celt_isp_b.xml","Celtic Elite Spearman Infantry","art/actors/units/celt_isp_e.xml","Celtic Advanced Swordsman Infantry","art/actors/units/celt_isw_a.xml","Celtic Basic Swordsman Infantry","art/actors/units/celt_isw_b.xml","Celtic Elite Swordsman Infantry","art/actors/units/celt_isw_e.xml","Celtic Super Unit 1","art/actors/units/celt_su_1.xml","Celtic Super Unit 2","art/actors/units/celt_su_2.xml","Celtic Trader","art/actors/units/celt_trd.xml","The Origional Dude","art/actors/units/dude.xml","Roman Dude","art/actors/units/dude1.xml","Iberian Dude","art/actors/units/dude2.xml","Wannabe Roman Dude","art/actors/units/dude3.xml","Carthaginian Dude","art/actors/units/dude4.xml","Propped Dude","art/actors/units/dude_propped.xml","The Dudette","art/actors/units/dudette.xml","Hellene Advanced Swordsman Cavalry","art/actors/units/hele_csw_a.xml","Hellene Advanced Swordsman Rider","art/actors/units/hele_csw_a_r.xml","Hellene Basic Swordsman Cavalry","art/actors/units/hele_csw_b.xml","Hellene Basic Swordsman Rider","art/actors/units/hele_csw_b_r.xml","Hellene Elite Swordsman Cavalry","art/actors/units/hele_csw_e.xml","Hellene Elite Swordsman Rider","art/actors/units/hele_csw_e_r.xml","Hellene Female Citizen","art/actors/units/hele_fem.xml","Hellenes Advanced Archer Infantry","art/actors/units/hele_iar_a.xml","Hellenes Basic Archer Infantry","art/actors/units/hele_iar_b.xml","Hellenes Elite Archer Infantry","art/actors/units/hele_iar_e.xml","Hellene Advanced Javelinist Infantry","art/actors/units/hele_ijv_a.xml","Hellene Basic Javelinist Infantry","art/actors/units/hele_ijv_b.xml","Hellene Elite Javelinist Infantry","art/actors/units/hele_ijv_e.xml","Hellene Advanced Slinger Infantry","art/actors/units/hele_isl_a.xml","Hellene Basic Slinger Infantry","art/actors/units/hele_isl_b.xml","Hellene Elite Slinger Infantry","art/actors/units/hele_isl_e.xml","Hellene Advanced Spearman Infantry","art/actors/units/hele_isp_a.xml","Hellene Basic Spearman Infantry","art/actors/units/hele_isp_b.xml","Hellene Elite Spearman Infantry","art/actors/units/hele_isp_e.xml","The Spartan","art/actors/units/hele_spar_u1.xml","Hellene Super Unit 1","art/actors/units/hele_su_1.xml","Hellene Super Unit 2","art/actors/units/hele_su_2.xml","Hellene Trader","art/actors/units/hele_trd.xml","Iberian Advanced Javelinist Cavalry","art/actors/units/iber_cjv_a.xml","Iberian Advanced Javelinist Rider","art/actors/units/iber_cjv_a_r.xml","Iberian Basic Javelinist Cavalry","art/actors/units/iber_cjv_b.xml","Iberian Basic Javelinist Rider","art/actors/units/iber_cjv_b_r.xml","Iberian Elite Javelinist Cavalry","art/actors/units/iber_cjv_e.xml","Iberian Elite Javelinist Rider","art/actors/units/iber_cjv_e_r.xml","Iberian Advanced Swordsman Cavalry","art/actors/units/iber_csw_a.xml","Iberian Advanced Swordsman Rider","art/actors/units/iber_csw_a_r.xml","Iberian Basic Swordsman Cavalry","art/actors/units/iber_csw_b.xml","Iberian Basic Swordsman Rider","art/actors/units/iber_csw_b_r.xml","Iberian Elite Swordsman Cavalry","art/actors/units/iber_csw_e.xml","Iberian Elite Swordsman Rider","art/actors/units/iber_csw_e_r.xml","Iberian Female Citizen","art/actors/units/iber_fem.xml","Iberian Advanced Javelinist Infantry","art/actors/units/iber_ijv_a.xml","Iberian Basic Javelinist Infantry","art/actors/units/iber_ijv_b.xml","Iberian Elite Javelinist Infantry","art/actors/units/iber_ijv_e.xml","Iberian Advanced Slinger Infantry","art/actors/units/iber_isl_a.xml","Iberian Basic Slinger Infantry","art/actors/units/iber_isl_b.xml","Iberian Elite Slinger Infantry","art/actors/units/iber_isl_e.xml","Iberian Advanced Spearman Infantry","art/actors/units/iber_isp_a.xml","Iberian Basic Spearman Infantry","art/actors/units/iber_isp_b.xml","Iberian Elite Spearman Infantry","art/actors/units/iber_isp_e.xml","Iberian Advanced Swordsman Infantry","art/actors/units/iber_isw_a.xml","Iberian Basic Swordsman Infantry","art/actors/units/iber_isw_b.xml","Iberian Elite Swordsman Infantry","art/actors/units/iber_isw_e.xml","Iberian Super Unit 1","art/actors/units/iber_su_1.xml","Iberian Super Unit 2","art/actors/units/iber_su_2.xml",
 		"Iberian Trader","art/actors/units/iber_trd.xml","Iberian Dude","art/actors/units/Iberian Dude.xml","Carthaginian Advanced Javelinist Cavalry","art/actors/units/kart_cjv_a.xml","Carthaginian Advanced Javelinist Rider","art/actors/units/kart_cjv_a_r.xml","Carthaginian Basic Javelinist Cavalry","art/actors/units/kart_cjv_b.xml","Carthaginian Basic Javelinist Rider","art/actors/units/kart_cjv_b_r.xml","Carthaginian Elite Javelinist Cavalry","art/actors/units/kart_cjv_e.xml","Carthaginian Elite Javelinist Rider","art/actors/units/kart_cjv_e_r.xml","Carthaginian Advanced Spearman Cavalry","art/actors/units/kart_csp_a.xml","Carthaginian Advanced Spearman Rider","art/actors/units/kart_csp_a_r.xml","Carthaginian Basic Spearman Cavalry","art/actors/units/kart_csp_b.xml","Carthaginian Basic Spearman Rider","art/actors/units/kart_csp_b_r.xml","Carthaginian Elite Spearman Cavalry","art/actors/units/kart_csp_e.xml","Carthaginian Elite Spearman Rider","art/actors/units/kart_csp_e_r.xml","Carthaginian Advanced Swordsman Cavalry","art/actors/units/kart_csw_a.xml","Carthaginian Advanced Swordsman Rider","art/actors/units/kart_csw_a_r.xml","Carthaginian Basic Swordsman Cavalry","art/actors/units/kart_csw_b.xml","Carthaginian Basic Swordsman Rider","art/actors/units/kart_csw_b_r.xml","Carthaginian Elite Swordsman Cavalry","art/actors/units/kart_csw_e.xml","Carthaginian Elite Swordsman Rider","art/actors/units/kart_csw_e_r.xml","Carthaginian Female Citizen","art/actors/units/kart_fem.xml","Carthaginian Advanced Archer Infantry","art/actors/units/kart_iar_a.xml","Carthaginian Basic Archer Infantry","art/actors/units/kart_iar_b.xml","Carthaginian Elite Archer Infantry","art/actors/units/kart_iar_e.xml","Carthaginian Advanced Javelinist Infantry","art/actors/units/kart_ijv_a.xml","Carthaginian Basic Javelinist Infantry","art/actors/units/kart_ijv_b.xml","Carthaginian Elite Javelinist Infantry","art/actors/units/kart_ijv_e.xml","Carthaginian Advanced Slinger Infantry","art/actors/units/kart_isl_a.xml","Carthaginian Basic Slinger Infantry","art/actors/units/kart_isl_b.xml","Carthaginian Elite Slinger Infantry","art/actors/units/kart_isl_e.xml","Carthaginian Advanced Spearman Infantry","art/actors/units/kart_isp_a.xml","Carthaginian Basic Spearman Infantry","art/actors/units/kart_isp_b.xml","Carthaginian Elite Spearman Infantry","art/actors/units/kart_isp_e.xml","Carthaginian Advanced Swordsman Infantry","art/actors/units/kart_isw_a.xml","Carthaginian Basic Swordsman Infantry","art/actors/units/kart_isw_b.xml","Carthaginian Elite Swordsman Infantry","art/actors/units/kart_isw_e.xml","Carthaginian Super Unit 1","art/actors/units/kart_su_1.xml","Carthaginian Super Unit 2","art/actors/units/kart_su_2.xml","Carthaginian Trader","art/actors/units/kart_trd.xml","Persian Advanced Archer Cavalry","art/actors/units/pers_car_a.xml","Persian Advanced Archer Rider","art/actors/units/pers_car_a_r.xml","Persian Basic Archer Cavalry","art/actors/units/pers_car_b.xml","Persian Basic Archer Rider","art/actors/units/pers_car_b_r.xml","Persian Elite Archer Cavalry","art/actors/units/pers_car_e.xml","Persian Elite Archer Rider","art/actors/units/pers_car_e_r.xml","Persian Advanced Javelinist Cavalry","art/actors/units/pers_cjv_a.xml","Persian Advanced Javelinist Rider","art/actors/units/pers_cjv_a_r.xml","Persian Basic Javelinist Cavalry","art/actors/units/pers_cjv_b.xml","Persian Basic Javelinist Rider","art/actors/units/pers_cjv_b_r.xml","Persian Elite Javelinist Cavalry","art/actors/units/pers_cjv_e.xml","Persian Elite Javelinist Rider","art/actors/units/pers_cjv_e_r.xml","Persian Advanced Spearman Cavalry","art/actors/units/pers_csp_a.xml","Persian Advanced Spearman Rider","art/actors/units/pers_csp_a_r.xml","Persian Basic Spearman Cavalry","art/actors/units/pers_csp_b.xml","Persian Basic Spearman Rider","art/actors/units/pers_csp_b_r.xml","Persian Elite Spearman Cavalry","art/actors/units/pers_csp_e.xml","Persian Elite Spearman Rider","art/actors/units/pers_csp_e_r.xml","Persian Advanced Swordsman Cavalry","art/actors/units/pers_csw_a.xml","Persian Advanced Swordsman Rider","art/actors/units/pers_csw_a_r.xml","Persian Basic Swordsman Cavalry","art/actors/units/pers_csw_b.xml","Persian Basic Swordsman Rider","art/actors/units/pers_csw_b_r.xml","Persian Elite Swordsman Cavalry","art/actors/units/pers_csw_e.xml","Persian Elite Swordsman Rider","art/actors/units/pers_csw_e_r.xml","Persian Female Citizen","art/actors/units/pers_fem.xml","Persian Advanced Archer Infantry","art/actors/units/pers_iar_a.xml","Persian Basic Archer Infantry","art/actors/units/pers_iar_b.xml","Persian Elite Archer Infantry","art/actors/units/pers_iar_e.xml","Persian Advanced Javelinist Infantry","art/actors/units/pers_ijv_a.xml","Persian Basic Javelinist Infantry","art/actors/units/pers_ijv_b.xml","Persian Elite Javelinist Infantry","art/actors/units/pers_ijv_e.xml","Persian Advanced Spearman Infantry","art/actors/units/pers_isp_a.xml","Persian Basic Spearman Infantry","art/actors/units/pers_isp_b.xml","Persian Elite Spearman Infantry","art/actors/units/pers_isp_e.xml","Persian Super Unit 1","art/actors/units/pers_su_1.xml","Persian Super Unit 2","art/actors/units/pers_su_2.xml","Persian Trader","art/actors/units/pers_trd.xml","Rich's Man","art/actors/units/rich's_man.xml","The Rider","art/actors/units/rider_dude.xml","Roman Advanced Spearman Rider","art/actors/units/Roman Advanced Spearman Rider.xml","Roman Advanced Spearman Cavalry","art/actors/units/rome_csp_a.xml","Roman Advanced Spearman Rider","art/actors/units/rome_csp_a_r.xml","Roman Basic Spearman Cavalry","art/actors/units/rome_csp_b.xml","Roman Basic Spearman Rider","art/actors/units/rome_csp_b_r.xml","Roman Elite Spearman Cavalry","art/actors/units/rome_csp_e.xml","Roman Elite Spearman Rider","art/actors/units/rome_csp_e_r.xml","Roman Female Citizen","art/actors/units/rome_fem.xml","Roman Advanced Javelinist Infantry","art/actors/units/rome_ijv_a.xml","Roman Basic Javelinist Infantry","art/actors/units/rome_ijv_b.xml","Roman Elite Javelinist Infantry","art/actors/units/rome_ijv_e.xml","Roman Advanced Slinger Infantry","art/actors/units/rome_isl_a.xml","Roman Basic Slinger Infantry","art/actors/units/rome_isl_b.xml","Roman Elite Slinger Infantry","art/actors/units/rome_isl_e.xml","Roman Advanced Spearman Infantry","art/actors/units/rome_isp_a.xml","Roman Basic Spearman Infantry","art/actors/units/rome_isp_b.xml","Roman Elite Spearman Infantry","art/actors/units/rome_isp_e.xml","Roman Advanced Swordsman Infantry","art/actors/units/rome_isw_a.xml","Roman Basic Swordsman Infantry","art/actors/units/rome_isw_b.xml","Roman Elite Swordsman Infantry","art/actors/units/rome_isw_e.xml","Roman Super Unit 1","art/actors/units/rome_su_1.xml","Roman Super Unit 2","art/actors/units/rome_su_2.xml",
 		"Roman Trader","art/actors/units/rome_trd.xml"
 	};
 	for (int i=0; i<sizeof(names)/sizeof(const char*); i += 2)
 	{
 		m_ObjectTypes[0].m_ObjectNameToFilename[names[i]] = names[i+1];
 	}
 //*/
 }
Index: ps/trunk/source/graphics/GameView.cpp
===================================================================
--- ps/trunk/source/graphics/GameView.cpp	(revision 2037)
+++ ps/trunk/source/graphics/GameView.cpp	(revision 2038)
@@ -1,696 +1,679 @@
 #include "precompiled.h"
 
 #include "Terrain.h"
 #include "Renderer.h"
 #include "GameView.h"
 #include "Game.h"
 #include "Camera.h"
 
 #include "Matrix3D.h"
 #include "Renderer.h"
 #include "Terrain.h"
 #include "LightEnv.h"
 #include "HFTracer.h"
 #include "TextureManager.h"
 #include "ObjectManager.h"
 #include "Pyrogenesis.h"
 #include "Hotkey.h"
 #include "ConfigDB.h"
 #include "Loader.h"
+#include "LoaderThunks.h"
 
 #include "Quaternion.h"
 #include "Unit.h"
 #include "Model.h"
 
 #include "sdl.h"
 #include "input.h"
 #include "lib.h"
 #include "timer.h"
 
 extern int g_xres, g_yres;
 extern bool g_active;
 
 CVector3D cameraBookmarks[10];
 bool bookmarkInUse[10] = { false, false, false, false, false, false, false, false, false, false };
 i8 currentBookmark = -1;
 
 CGameView::CGameView(CGame *pGame):
 	m_pGame(pGame),
 	m_pWorld(pGame->GetWorld()),
 	m_Camera(),
 	m_ViewScrollSpeed(60),
 	m_ViewRotateSensitivity(0.002f),
 	m_ViewRotateSensitivityKeyboard(1.0f),
 	m_ViewRotateAboutTargetSensitivity(0.010f),
 	m_ViewRotateAboutTargetSensitivityKeyboard(2.0f),
 	m_ViewDragSensitivity(0.5f),
 	m_ViewZoomSensitivityWheel(16.0f),
 	m_ViewZoomSensitivity(256.0f),
 	m_ViewZoomSmoothness(0.02f),
 	m_ViewSnapSmoothness(0.02f),
 	m_CameraPivot(),
 	m_CameraDelta()
 {
 	SViewPort vp;
 	vp.m_X=0;
 	vp.m_Y=0;
 	vp.m_Width=g_xres;
 	vp.m_Height=g_yres;
 	m_Camera.SetViewPort(&vp);
 
 	m_Camera.SetProjection (1, 5000, DEGTORAD(20));
 	m_Camera.m_Orientation.SetXRotation(DEGTORAD(30));
 	m_Camera.m_Orientation.RotateY(DEGTORAD(-45));
 	m_Camera.m_Orientation.Translate (100, 150, -100);
 	g_Renderer.SetCamera(m_Camera);
 }
 
 CGameView::~CGameView()
 {
 	UnloadResources();
 }
 
 
 void CGameView::Initialize(CGameAttributes *pAttribs)
 {
 	CConfigValue* cfg;
 	
 #define getViewParameter( name, value ) STMT( \
 	cfg = g_ConfigDB.GetValue( CFG_SYSTEM, name );\
 	if( cfg ) cfg->GetFloat( value ); )
 
 	getViewParameter( "view.scroll.speed", m_ViewScrollSpeed );
 	getViewParameter( "view.rotate.speed", m_ViewRotateSensitivity );
 	getViewParameter( "view.rotate.keyboard.speed", m_ViewRotateSensitivityKeyboard );
 	getViewParameter( "view.rotate.abouttarget.speed", m_ViewRotateAboutTargetSensitivity );
 	getViewParameter( "view.rotate.keyboard.abouttarget.speed", m_ViewRotateAboutTargetSensitivityKeyboard );
 	getViewParameter( "view.drag.speed", m_ViewDragSensitivity );
 	getViewParameter( "view.zoom.speed", m_ViewZoomSensitivity );
 	getViewParameter( "view.zoom.wheel.speed", m_ViewZoomSensitivityWheel );
 	getViewParameter( "view.zoom.smoothness", m_ViewZoomSmoothness );
 	getViewParameter( "view.snap.smoothness", m_ViewSnapSmoothness );
 	
 	if( ( m_ViewZoomSmoothness < 0.0f ) || ( m_ViewZoomSmoothness > 1.0f ) ) m_ViewZoomSmoothness = 0.02f;
 	if( ( m_ViewSnapSmoothness < 0.0f ) || ( m_ViewSnapSmoothness > 1.0f ) ) m_ViewSnapSmoothness = 0.02f;
 
 #undef getViewParameter
-
-	InitResources();
 }
 
-struct ThunkParams
-{
-	CGameView* const this_;
-	CGameAttributes* const pAttribs;
-	ThunkParams(CGameView* this__, CGameAttributes* pAttribs_)
-		: this_(this__), pAttribs(pAttribs_) {}
-};
 
-static int LoadThunk(void* param, double time_left)
-{
-	const ThunkParams* p = (const ThunkParams*)param;
-	CGameView* const this_          = p->this_;
-	CGameAttributes* const pAttribs = p->pAttribs;
 
-	this_->Initialize(pAttribs);
-	delete p;
-	return 0;
-}
+
+
+
+
 
 void CGameView::RegisterInit(CGameAttributes *pAttribs)
 {
-	void* param = new ThunkParams(this, pAttribs);
-	THROW_ERR(LDR_Register(LoadThunk, param, L"CGameView", 1000));
+	// CGameView init
+	RegMemFun1(this, &CGameView::Initialize, pAttribs, L"CGameView init", 1);
+
+	// previously done by CGameView::InitResources
+	RegMemFun(g_TexMan.GetSingletonPtr(), &CTextureManager::LoadTerrainTextures, L"LoadTerrainTextures", 17);
+	RegMemFun(g_ObjMan.GetSingletonPtr(), &CObjectManager::LoadObjects, L"LoadObjects", 1063);
+	RegMemFun(g_Renderer.GetSingletonPtr(), &CRenderer::LoadAlphaMaps, L"LoadAlphaMaps", 36);
 }
 
 
 void CGameView::Render()
 {
 	g_Renderer.SetCamera(m_Camera);
 
 	MICROLOG(L"render terrain");
 	RenderTerrain(m_pWorld->GetTerrain());
 	MICROLOG(L"render models");
 	RenderModels(m_pWorld->GetUnitManager());
 }
 
 void CGameView::RenderTerrain(CTerrain *pTerrain)
 {
 	CFrustum frustum=m_Camera.GetFrustum();
 	u32 patchesPerSide=pTerrain->GetPatchesPerSide();
 	for (uint j=0; j<patchesPerSide; j++) {
 		for (uint i=0; i<patchesPerSide; i++) {
 			CPatch* patch=pTerrain->GetPatch(i,j);
 			if (frustum.IsBoxVisible (CVector3D(0,0,0),patch->GetBounds())) {
 				g_Renderer.Submit(patch);
 			}
 		}
 	}
 }
 
 void CGameView::RenderModels(CUnitManager *pUnitMan)
 {
 	CFrustum frustum=m_Camera.GetFrustum();
 
 	const std::vector<CUnit*>& units=pUnitMan->GetUnits();
 	for (uint i=0;i<units.size();++i) {
 		if (frustum.IsBoxVisible(CVector3D(0,0,0),units[i]->GetModel()->GetBounds())) {
 			SubmitModelRecursive(units[i]->GetModel());
 		}
 	}
 }
 
 void CGameView::SubmitModelRecursive(CModel* model)
 {
 	g_Renderer.Submit(model);
 
 	const std::vector<CModel::Prop>& props=model->GetProps();
 	for (uint i=0;i<props.size();i++) {
 		SubmitModelRecursive(props[i].m_Model);
 	}
 }
 
 void CGameView::RenderNoCull()
 {
 	CUnitManager *pUnitMan=m_pWorld->GetUnitManager();
 	CTerrain *pTerrain=m_pWorld->GetTerrain();
 
 	g_Renderer.SetCamera(m_Camera);
 
 	uint i,j;
 	const std::vector<CUnit*>& units=pUnitMan->GetUnits();
 	for (i=0;i<units.size();++i) {
 		SubmitModelRecursive(units[i]->GetModel());
 	}
 
 	u32 patchesPerSide=pTerrain->GetPatchesPerSide();
 	for (j=0; j<patchesPerSide; j++) {
 		for (i=0; i<patchesPerSide; i++) {
 			CPatch* patch=pTerrain->GetPatch(i,j);
 			g_Renderer.Submit(patch);
 		}
 	}
 }
 
-void CGameView::InitResources()
-{
-	TIMER(CGameView__InitResources);
-
-	g_TexMan.LoadTerrainTextures();
-	g_ObjMan.LoadObjects();
-
-	g_Renderer.LoadAlphaMaps();
-}
 
 void CGameView::UnloadResources()
 {
 	// Should probably do something like:
 	//   g_TexMan.UnloadTerrainTextures();
 	//   g_ObjMan.UnloadObjects();
 
 	g_Renderer.UnloadAlphaMaps();
 }
 
 
 void CGameView::ResetCamera()
 {
 	// quick hack to return camera home, for screenshots (after alt+tabbing)
 	m_Camera.SetProjection (1, 5000, DEGTORAD(20));
 	m_Camera.m_Orientation.SetXRotation(DEGTORAD(30));
 	m_Camera.m_Orientation.RotateY(DEGTORAD(-45));
 	m_Camera.m_Orientation.Translate (100, 150, -100);
 }
 
 void CGameView::ResetCameraOrientation()
 {
 
 	CVector3D origin = m_Camera.m_Orientation.GetTranslation();
 	CVector3D dir = m_Camera.m_Orientation.GetIn();
 
 	CVector3D target = origin + dir * ( ( 50.0f - origin.Y ) / dir.Y );
 
 	target -= CVector3D( -22.474480f, 50.0f, 22.474480f );
 
 	m_Camera.SetProjection (1, 5000, DEGTORAD(20));
 	m_Camera.m_Orientation.SetXRotation(DEGTORAD(30));
 	m_Camera.m_Orientation.RotateY(DEGTORAD(-45));
 	
 	target += CVector3D( 100.0f, 150.0f, -100.0f );
 
 	m_Camera.m_Orientation.Translate( target );
 }
 
 void CGameView::RotateAboutTarget()
 {
 	m_CameraPivot = m_Camera.GetWorldCoordinates();
 }
 
 void CGameView::Update(float DeltaTime)
 {
 	if (!g_active)
 		return;
 
 	float delta = powf( m_ViewSnapSmoothness, DeltaTime );
 	m_Camera.m_Orientation.Translate( m_CameraDelta * ( 1.0f - delta ) );
 	m_CameraDelta *= delta;
 
 #define CAMERASTYLE 2 // 0 = old style, 1 = relatively new style, 2 = newest style
 
 // #if CAMERASTYLE == 2
 
 	// This could be rewritten much more reliably, so it doesn't e.g. accidentally tilt
 	// the camera, assuming we know exactly what limits the camera should have.
 
 
 	// Calculate mouse movement
 	static int mouse_last_x = 0;
 	static int mouse_last_y = 0;
 	int mouse_dx = g_mouse_x - mouse_last_x;
 	int mouse_dy = g_mouse_y - mouse_last_y;
 	mouse_last_x = g_mouse_x;
 	mouse_last_y = g_mouse_y;
 
 	// Miscellaneous vectors
 	CVector3D forwards = m_Camera.m_Orientation.GetIn();
 	CVector3D rightwards = m_Camera.m_Orientation.GetLeft() * -1.0f; // upwards.Cross(forwards);
 	CVector3D upwards( 0.0f, 1.0f, 0.0f );
 	// rightwards.Normalize();
 	
 	CVector3D forwards_horizontal = forwards;
 	forwards_horizontal.Y = 0.0f;
 	forwards_horizontal.Normalize();
 
 	if( hotkeys[HOTKEY_CAMERA_ROTATE] || hotkeys[HOTKEY_CAMERA_ROTATE_KEYBOARD] )
 	{
 		// Ctrl + middle-drag or left-and-right-drag to rotate view
 
 		// Untranslate the camera, so it rotates around the correct point
 		CVector3D position = m_Camera.m_Orientation.GetTranslation();
 		m_Camera.m_Orientation.Translate(position*-1);
 
 		// Sideways rotation
 		
 		float rightways = 0.0f;
 		if( hotkeys[HOTKEY_CAMERA_ROTATE] )
 			rightways = (float)mouse_dx * m_ViewRotateSensitivity;
 		if( hotkeys[HOTKEY_CAMERA_ROTATE_KEYBOARD] )
 		{
 			if( hotkeys[HOTKEY_CAMERA_LEFT] )
 				rightways -= m_ViewRotateSensitivityKeyboard * DeltaTime;
 			if( hotkeys[HOTKEY_CAMERA_RIGHT] )
 				rightways += m_ViewRotateSensitivityKeyboard * DeltaTime;
 		}
 
 		m_Camera.m_Orientation.RotateY( rightways );
 
 		// Up/down rotation
 
 		float upways = 0.0f;
 		if( hotkeys[HOTKEY_CAMERA_ROTATE] )
 			upways = (float)mouse_dy * m_ViewRotateSensitivity;
 		if( hotkeys[HOTKEY_CAMERA_ROTATE_KEYBOARD] )
 		{
 			if( hotkeys[HOTKEY_CAMERA_UP] )
 				upways -= m_ViewRotateSensitivityKeyboard * DeltaTime;
 			if( hotkeys[HOTKEY_CAMERA_DOWN] )
 				upways += m_ViewRotateSensitivityKeyboard * DeltaTime;
 		}
 
 		CQuaternion temp;
 		temp.FromAxisAngle(rightwards, upways);
 		
 		m_Camera.m_Orientation.Rotate(temp);
 
 		// Retranslate back to the right position
 		m_Camera.m_Orientation.Translate(position);
 
 	}
 	else if( hotkeys[HOTKEY_CAMERA_ROTATE_ABOUT_TARGET] )
 	{
 		CVector3D origin = m_Camera.m_Orientation.GetTranslation();
 		CVector3D delta = origin - m_CameraPivot;
 		
 		CQuaternion rotateH, rotateV; CMatrix3D rotateM;
 
 		// Sideways rotation
 		
 		float rightways = (float)mouse_dx * m_ViewRotateAboutTargetSensitivity;
 		
 		rotateH.FromAxisAngle( upwards, rightways );
 
 		// Up/down rotation
 
 		float upways = (float)mouse_dy * m_ViewRotateAboutTargetSensitivity;
 		rotateV.FromAxisAngle( rightwards, upways );
 
 		rotateH *= rotateV;
 		rotateH.ToMatrix( rotateM );
 
 		delta = rotateM.Rotate( delta );
 
 		// Lock the inclination to a rather arbitrary values (for the sake of graphical decency)
 
 		float scan = sqrt( delta.X * delta.X + delta.Z * delta.Z ) / delta.Y;
 		if( ( scan >= 0.5f ) ) 
 		{
 			// Move the camera to the origin (in preparation for rotation )
 			m_Camera.m_Orientation.Translate( origin * -1.0f );
 
 			m_Camera.m_Orientation.Rotate( rotateH );
 
 			// Move the camera back to where it belongs
 			m_Camera.m_Orientation.Translate( m_CameraPivot + delta );
 		}
 		
 	}
 	else if( hotkeys[HOTKEY_CAMERA_ROTATE_ABOUT_TARGET_KEYBOARD] )
 	{
 		// Split up because the keyboard controls use the centre of the screen, not the mouse position.
 		CVector3D origin = m_Camera.m_Orientation.GetTranslation();
 		CVector3D pivot = m_Camera.GetFocus();
 		CVector3D delta = origin - pivot;
 		
 		CQuaternion rotateH, rotateV; CMatrix3D rotateM;
 
 		// Sideways rotation
 		
 		float rightways = 0.0f;
 		if( hotkeys[HOTKEY_CAMERA_LEFT] )
 			rightways -= m_ViewRotateAboutTargetSensitivityKeyboard * DeltaTime;
 		if( hotkeys[HOTKEY_CAMERA_RIGHT] )
 			rightways += m_ViewRotateAboutTargetSensitivityKeyboard * DeltaTime;
 		
 		rotateH.FromAxisAngle( upwards, rightways );
 
 		// Up/down rotation
 
 		float upways = 0.0f;
 		if( hotkeys[HOTKEY_CAMERA_UP] )
 			upways -= m_ViewRotateAboutTargetSensitivityKeyboard * DeltaTime;
 		if( hotkeys[HOTKEY_CAMERA_DOWN] )
 			upways += m_ViewRotateAboutTargetSensitivityKeyboard * DeltaTime;
 		
 		rotateV.FromAxisAngle( rightwards, upways );
 
 		rotateH *= rotateV;
 		rotateH.ToMatrix( rotateM );
 
 		delta = rotateM.Rotate( delta );
 
 		// Lock the inclination to a rather arbitrary values (for the sake of graphical decency)
 
 		float scan = sqrt( delta.X * delta.X + delta.Z * delta.Z ) / delta.Y;
 		if( ( scan >= 0.5f ) ) 
 		{
 			// Move the camera to the origin (in preparation for rotation )
 			m_Camera.m_Orientation.Translate( origin * -1.0f );
 
 			m_Camera.m_Orientation.Rotate( rotateH );
 
 			// Move the camera back to where it belongs
 			m_Camera.m_Orientation.Translate( pivot + delta );
 		}
 		
 	}
 	else if( hotkeys[HOTKEY_CAMERA_PAN] )
 	{
 		// Middle-drag to pan
 		m_Camera.m_Orientation.Translate(rightwards * (m_ViewDragSensitivity * mouse_dx));
 		m_Camera.m_Orientation.Translate(forwards_horizontal * (-m_ViewDragSensitivity * mouse_dy));
 	}
 
 	// Mouse movement
 
 	if( !hotkeys[HOTKEY_CAMERA_ROTATE] && !hotkeys[HOTKEY_CAMERA_ROTATE_ABOUT_TARGET] )
 	{
 		if (g_mouse_x >= g_xres-2 && g_mouse_x < g_xres)
 			m_Camera.m_Orientation.Translate(rightwards * (m_ViewScrollSpeed * DeltaTime));
 		else if (g_mouse_x <= 3 && g_mouse_x >= 0)
 			m_Camera.m_Orientation.Translate(-rightwards * (m_ViewScrollSpeed * DeltaTime));
 
 		if (g_mouse_y >= g_yres-2 && g_mouse_y < g_yres)
 			m_Camera.m_Orientation.Translate(-forwards_horizontal * (m_ViewScrollSpeed * DeltaTime));
 		else if (g_mouse_y <= 3 && g_mouse_y >= 0)
 			m_Camera.m_Orientation.Translate(forwards_horizontal * (m_ViewScrollSpeed * DeltaTime));
 	}
 
 
 	// Keyboard movement (added to mouse movement, so you can go faster if you want)
 
 	if( hotkeys[HOTKEY_CAMERA_PAN_KEYBOARD] )
 	{
 		if( hotkeys[HOTKEY_CAMERA_RIGHT] )
 			m_Camera.m_Orientation.Translate(rightwards * (m_ViewScrollSpeed * DeltaTime));
 		if( hotkeys[HOTKEY_CAMERA_LEFT] )
 			m_Camera.m_Orientation.Translate(-rightwards * (m_ViewScrollSpeed * DeltaTime));
 
 		if( hotkeys[HOTKEY_CAMERA_DOWN] )
 			m_Camera.m_Orientation.Translate(-forwards_horizontal * (m_ViewScrollSpeed * DeltaTime));
 		if( hotkeys[HOTKEY_CAMERA_UP] )
 			m_Camera.m_Orientation.Translate(forwards_horizontal * (m_ViewScrollSpeed * DeltaTime));
 	}
 
 	// Smoothed zooming (move a certain percentage towards the desired zoom distance every frame)
 
 	static float zoom_delta = 0.0f;
 
 	if( hotkeys[HOTKEY_CAMERA_ZOOM_WHEEL_IN] )
 		zoom_delta += m_ViewZoomSensitivityWheel;
 	else if( hotkeys[HOTKEY_CAMERA_ZOOM_WHEEL_OUT] )
 		zoom_delta -= m_ViewZoomSensitivityWheel;
 
 	if( hotkeys[HOTKEY_CAMERA_ZOOM_IN] )
 		zoom_delta += m_ViewZoomSensitivity*DeltaTime;
 	else if( hotkeys[HOTKEY_CAMERA_ZOOM_OUT] )
 		zoom_delta -= m_ViewZoomSensitivity*DeltaTime;
 
 	if (fabsf(zoom_delta) > 0.1f) // use a fairly high limit to avoid nasty flickering when zooming
 	{
 		float zoom_proportion = powf(m_ViewZoomSmoothness, DeltaTime);
 		m_Camera.m_Orientation.Translate(forwards * (zoom_delta * (1.0f-zoom_proportion)));
 		zoom_delta *= zoom_proportion;
 	}
 
 /*
 Just commented out to make it more obvious it's not in use.
 
 #elif CAMERASTYLE == 1
 
 	// Remember previous mouse position, to calculate changes
 	static mouse_last_x = 0;
 	static mouse_last_y = 0;
 
 	// Miscellaneous vectors
 	CVector3D forwards = m_Camera.m_Orientation.GetIn();
 	CVector3D upwards (0.0f, 1.0f, 0.0f);
 	CVector3D rightwards = upwards.Cross(forwards);
 
 	// Click and drag to look around
 	if (mouseButtons[0])
 	{
 		// Untranslate the camera, so it rotates around the correct point
 		CVector3D position = m_Camera.m_Orientation.GetTranslation();
 		m_Camera.m_Orientation.Translate(position*-1);
 
 		// Sideways rotation
 		m_Camera.m_Orientation.RotateY(m_ViewRotateSpeed*(float)(g_mouse_x-mouse_last_x));
 
 		// Up/down rotation
 		CQuaternion temp;
 		temp.FromAxisAngle(rightwards, m_ViewRotateSpeed*(float)(g_mouse_y-mouse_last_y));
 		m_Camera.m_Orientation.Rotate(temp);
 
 		// Retranslate back to the right position
 		m_Camera.m_Orientation.Translate(position);
 	}
 	mouse_last_x = g_mouse_x;
 	mouse_last_y = g_mouse_y;
 
 	// Calculate the necessary vectors for movement
 
 	rightwards.Normalize();
 	CVector3D forwards_horizontal = upwards.Cross(rightwards);
 	forwards_horizontal.Normalize();
 
 	// Move when desirable
 
 	if (g_mouse_x >= g_xres-2)
 		m_Camera.m_Orientation.Translate(rightwards);
 	else if (g_mouse_x <= 3)
 		m_Camera.m_Orientation.Translate(-rightwards);
 
 	if (g_mouse_y >= g_yres-2)
 		m_Camera.m_Orientation.Translate(forwards_horizontal);
 	else if (g_mouse_y <= 3)
 		m_Camera.m_Orientation.Translate(-forwards_horizontal);
 
 	// Smoothed height-changing (move a certain percentage towards the desired height every frame)
 
 	static float height_delta = 0.0f;
 
 	if (mouseButtons[SDL_BUTTON_WHEELUP])
 		height_delta -= 4.0f;
 	else if (mouseButtons[SDL_BUTTON_WHEELDOWN])
 		height_delta += 4.0f;
 
 	const float height_speed = 0.2f;
 	m_Camera.m_Orientation.Translate(0.0f, height_delta*height_speed, 0.0f);
 	height_delta *= (1.0f - height_speed);
 
 #else // CAMERASTYLE == 0
 
 	const float dx = m_ViewScrollSpeed * DeltaTime;
 	const CVector3D Right(dx,0, dx);
 	const CVector3D Up   (dx,0,-dx);
 
 	if (g_mouse_x >= g_xres-2)
 		m_Camera.m_Orientation.Translate(Right);
 	if (g_mouse_x <= 3)
 		m_Camera.m_Orientation.Translate(Right*-1);
 
 	if (g_mouse_y >= g_yres-2)
 		m_Camera.m_Orientation.Translate(Up);
 	if (g_mouse_y <= 3)
 		m_Camera.m_Orientation.Translate(Up*-1);
 
 	/*
 	janwas: grr, plotted the zoom vector on paper twice, but it appears
 	to be completely wrong. sticking with the FOV hack for now.
 	if anyone sees what's wrong, or knows how to correctly implement zoom,
 	please put this code out of its misery :)
 	*//*
 	// RC - added ScEd style zoom in and out (actually moving camera, rather than fudging fov)	
 
 	float dir=0;
 	if (mouseButtons[SDL_BUTTON_WHEELUP]) dir=-1;
 	else if (mouseButtons[SDL_BUTTON_WHEELDOWN]) dir=1;	
 
 	float factor=dir*dir;
 	if (factor) {
 		if (dir<0) factor=-factor;
 		CVector3D forward=m_Camera.m_Orientation.GetIn();
 
 		// check we're not going to zoom into the terrain, or too far out into space
 		float h=m_Camera.m_Orientation.GetTranslation().Y+forward.Y*factor*m_Camera.Zoom;
 		float minh=65536*HEIGHT_SCALE*1.05f;
 		
 		if (h<minh || h>1500) {
 			// yup, we will; don't move anywhere (do clamped move instead, at some point)
 		} else {
 			// do a full move
 			m_Camera.Zoom-=(factor)*0.1f;
 			if (m_Camera.Zoom<0.01f) m_Camera.Zoom=0.01f;
 			m_Camera.m_Orientation.Translate(forward*(factor*m_Camera.Zoom));
 		}
 	}
 #endif // CAMERASTYLE
 */
 
 	m_Camera.UpdateFrustum ();
 }
 
 void CGameView::PushCameraTarget( const CVector3D& target )
 {
 	// Save the current position
 	m_CameraTargets.push_back( m_Camera.m_Orientation.GetTranslation() );
 	// And set the camera
 	SetCameraTarget( target );
 }
 
 void CGameView::SetCameraTarget( const CVector3D& target )
 {
 	// Maintain the same orientation and level of zoom, if we can
 	// (do this by working out the point the camera is looking at, saving
 	//  the difference beteen that position and the camera point, and restoring
 	//  that difference to our new target)
 
 	CVector3D CurrentTarget = m_Camera.GetFocus();
 	m_CameraDelta = target - CurrentTarget;
 }
 
 void CGameView::PopCameraTarget()
 {
 	m_CameraDelta = m_CameraTargets.back() - m_Camera.m_Orientation.GetTranslation();
 	m_CameraTargets.pop_back();
 }
 
 int game_view_handler(const SDL_Event* ev)
 {
 	// put any events that must be processed even if inactive here
 
 	if(!g_active || !g_Game)
 		return EV_PASS;
 
 	CGameView *pView=g_Game->GetView();
 
 	switch(ev->type)
 	{
 
 	case SDL_HOTKEYDOWN:
 		switch(ev->user.code)
 		{
 		case HOTKEY_WIREFRAME:
 			if (g_Renderer.GetTerrainRenderMode()==WIREFRAME) {
 				g_Renderer.SetTerrainRenderMode(SOLID);
 			} else {
 				g_Renderer.SetTerrainRenderMode(WIREFRAME);
 			}
 			return( EV_HANDLED );
 
 		case HOTKEY_CAMERA_RESET_ORIGIN:
 			pView->ResetCamera();
 			return( EV_HANDLED );
 
 		case HOTKEY_CAMERA_RESET:
 			pView->ResetCameraOrientation();
 			return( EV_HANDLED );
 
 		case HOTKEY_CAMERA_ROTATE_ABOUT_TARGET:
 			pView->RotateAboutTarget();
 			return( EV_HANDLED );
 
 		default:
 
 			if( ( ev->user.code >= HOTKEY_CAMERA_BOOKMARK_0 ) && ( ev->user.code <= HOTKEY_CAMERA_BOOKMARK_9 ) )
 			{
 				// The above test limits it to 10 bookmarks, so don't worry about overflowing
 				i8 id = (i8)( ev->user.code - HOTKEY_CAMERA_BOOKMARK_0 );
 
 				if( hotkeys[HOTKEY_CAMERA_BOOKMARK_SAVE] )
 				{
 					// Attempt to track the ground we're looking at
 					cameraBookmarks[id] = pView->GetCamera()->GetFocus();
 					bookmarkInUse[id] = true;
 				}
 				else if( hotkeys[HOTKEY_CAMERA_BOOKMARK_SNAP] )
 				{
 					if( bookmarkInUse[id] && ( currentBookmark == -1 ) )
 					{
 						pView->PushCameraTarget( cameraBookmarks[id] );
 						currentBookmark = id;
 					}
 				}
 				else
 				{
 					if( bookmarkInUse[id] )
 						pView->SetCameraTarget( cameraBookmarks[id] );
 				}
 				return( EV_HANDLED );
 			}
 		}
 	case SDL_HOTKEYUP:
 		switch( ev->user.code )
 		{
 			case HOTKEY_CAMERA_BOOKMARK_SNAP:
 				if( currentBookmark != -1 )
 					pView->PopCameraTarget();
 				currentBookmark = -1;
 				break;
 			default:
 				return( EV_PASS );
 		}
 		return( EV_HANDLED );
 	}
 
 	return EV_PASS;
 }
Index: ps/trunk/source/graphics/MapReader.h
===================================================================
--- ps/trunk/source/graphics/MapReader.h	(revision 2037)
+++ ps/trunk/source/graphics/MapReader.h	(revision 2038)
@@ -1,55 +1,65 @@
 #ifndef _MAPREADER_H
 #define _MAPREADER_H
 
 #include "MapIO.h"
 #include "res/handle.h"
 #include "CStr.h"
 #include "LightEnv.h"
 #include "FileUnpacker.h"
 
 class CObjectEntry;
 class CTerrain;
 class CUnitManager;
 class CLightEnv;
 
 class CMapReader : public CMapIO
 {
 public:
 	// constructor
 	CMapReader();
 	// LoadMap: try to load the map from given file; reinitialise the scene to new data if successful
 	void LoadMap(const char* filename, CTerrain *pTerrain, CUnitManager *pUnitMan, CLightEnv *pLightEnv);
 
 private:
 	// UnpackMap: unpack the given data from the raw data stream into local variables
-	void UnpackMap(CFileUnpacker& unpacker);
+	void UnpackMap();
 	// UnpackTerrain: unpack the terrain from the input stream
-	void UnpackTerrain(CFileUnpacker& unpacker);
+	void UnpackTerrain();
 	// UnpackObjects: unpack world objects from the input stream
-	void UnpackObjects(CFileUnpacker& unpacker);
+	void UnpackObjects();
 	// UnpackObjects: unpack lighting parameters from the input stream
-	void UnpackLightEnv(CFileUnpacker& unpacker);
+	void UnpackLightEnv();
 
 	// ApplyData: take all the input data, and rebuild the scene from it
-	void ApplyData(CFileUnpacker& unpacker, CTerrain *pTerrain, CUnitManager *pUnitMan, CLightEnv *pLightEnv);
+	void ApplyData();
 
 	// ReadXML: read some other data (entities, etc) in XML format
-	void ReadXML(const char* filename);
+	void ReadXML();
+
+	// clean up everything used during delayed load
+	void DelayLoadFinished();
 
 	// size of map 
 	u32 m_MapSize;
 	// heightmap for map
 	std::vector<u16> m_Heightmap;
 	// list of terrain textures used by map
 	std::vector<Handle> m_TerrainTextures;
 	// tile descriptions for each tile
 	std::vector<STileDesc> m_Tiles;
 	// list of object types used by map
 	std::vector<CStr> m_ObjectTypes;
 	// descriptions for each objects
 	std::vector<SObjectDesc> m_Objects;
 	// lightenv stored in file
 	CLightEnv m_LightEnv;
+
+	// state latched by LoadMap and held until DelayedLoadFinished
+	CFileUnpacker unpacker;
+	CTerrain *pTerrain;
+	CUnitManager *pUnitMan;
+	CLightEnv *pLightEnv;
+	CStr filename_xml;
 };
 
 #endif
Index: ps/trunk/source/graphics/TextureManager.cpp
===================================================================
--- ps/trunk/source/graphics/TextureManager.cpp	(revision 2037)
+++ ps/trunk/source/graphics/TextureManager.cpp	(revision 2038)
@@ -1,151 +1,149 @@
 #include "precompiled.h"
 
 #include <algorithm>
 
 #include "TextureManager.h"
 #include "res/res.h"
 #include "ogl.h"
 #include "res/ogl_tex.h"
 #include "CLogger.h"
 #include "timer.h"
 
 #define LOG_CATEGORY "graphics"
 
 // filter for vfs_next_dirent
 static const char* SupportedTextureFormats[] = { "*.png", "*.dds", "*.tga", "*.bmp" };
 
 
 
 CTextureManager::CTextureManager()
 {
 	m_TerrainTextures.reserve(32);
 }
 
 CTextureManager::~CTextureManager()
 {
 	for (size_t i=0;i<m_TerrainTextures.size();i++) {
 		for (size_t j=0;j<m_TerrainTextures[i].m_Textures.size();j++) {
 			delete m_TerrainTextures[i].m_Textures[j];
 		}
 	}
 }
 
 void CTextureManager::AddTextureType(const char* name)
 {
 	m_TerrainTextures.resize(m_TerrainTextures.size()+1);
 	STextureType& ttype=m_TerrainTextures.back();
 	ttype.m_Name=name;
 	ttype.m_Index=(int)m_TerrainTextures.size()-1;
 }
 
 CTextureEntry* CTextureManager::FindTexture(const char* filename)
 {
 	// check if file already loaded
 	for (uint k=0;k<m_TerrainTextures.size();k++) {
 		STextureType& ttype=m_TerrainTextures[k];
 		for (uint i=0;i<ttype.m_Textures.size();i++) {
 			if (strcmp((const char*) ttype.m_Textures[i]->GetName(),filename)==0) {
 				return ttype.m_Textures[i];
 			}
 		}
 	}
 
 	return 0;
 }
 
 CTextureEntry* CTextureManager::FindTexture(Handle handle)
 {
 	for (uint k=0;k<m_TerrainTextures.size();k++) {
 		STextureType& ttype=m_TerrainTextures[k];
 		for (uint i=0;i<ttype.m_Textures.size();i++) {
 			// Don't bother looking at textures that haven't been loaded yet - since
 			// the caller has given us a Handle to the texture, it must be loaded.
 			// (This matters because GetHandle would load the texture, even though
 			// there's no need to.)
 			if (ttype.m_Textures[i]->IsLoaded() && handle==ttype.m_Textures[i]->GetHandle()) {
 				return ttype.m_Textures[i];
 			}
 		}
 	}
 
 	return 0;
 }
 
 CTextureEntry* CTextureManager::AddTexture(const char* filename,int type)
 {
 	assert((uint)type<m_TerrainTextures.size());
 
 	// create new texture entry
 	CTextureEntry* texentry=new CTextureEntry(filename,type);
 
 	// add entry to list ..
 	m_TerrainTextures[type].m_Textures.push_back(texentry);
 
 	return texentry;
 }
 
 void CTextureManager::DeleteTexture(CTextureEntry* entry)
 {
 	// find entry in list
 	std::vector<CTextureEntry*>& textures=m_TerrainTextures[entry->GetType()].m_Textures;
 
 	typedef std::vector<CTextureEntry*>::iterator Iter;
 	Iter i=std::find(textures.begin(),textures.end(),entry);
 	if (i!=textures.end()) {
 		textures.erase(i);
 	}
 	delete entry;
 }
 
 void CTextureManager::LoadTerrainTextures(int terraintype,const char* fileext_filter)
 {
 	CStr pathname("art/textures/terrain/types/");
 	pathname+=m_TerrainTextures[terraintype].m_Name;
 	pathname+="/";
 
 	Handle dir=vfs_open_dir(pathname.c_str());
 	vfsDirEnt dent;
 
 	if (dir > 0)
 	{
 		while (vfs_next_dirent(dir, &dent, fileext_filter) == 0)
 		{
 			LOG(NORMAL, LOG_CATEGORY, "CTextureManager::LoadTerrainTextures(): texture %s added to type %s", dent.name, m_TerrainTextures[terraintype].m_Name.c_str());
 			AddTexture(dent.name, terraintype);
 		}
 
 		vfs_close_dir(dir);
 	}
 }
 
 void CTextureManager::BuildTerrainTypes()
 {
 	Handle dir=vfs_open_dir("art/textures/terrain/types/");
 	vfsDirEnt dent;
 
 	if (dir > 0)
 	{
 		while (vfs_next_dirent(dir, &dent, "/") == 0)
 		{
 			AddTextureType(dent.name);
 		}
 
 		vfs_close_dir(dir);
 	}
 
 }
 
 void CTextureManager::LoadTerrainTextures()
 {
-	TIMER(__CTextureManager__LoadTerrainTextures);
-
 	// find all the terrain types by directory name
 	BuildTerrainTypes();
 
 	// now iterate through terrain types loading all textures of that type
 	for (uint i=0;i<m_TerrainTextures.size();i++) {
 		for (uint j=0;j<ARRAY_SIZE(SupportedTextureFormats);j++) {
 			LoadTerrainTextures(i,SupportedTextureFormats[j]);
 		}
 	}
 }
Index: ps/trunk/source/ps/World.cpp
===================================================================
--- ps/trunk/source/ps/World.cpp	(revision 2037)
+++ ps/trunk/source/ps/World.cpp	(revision 2038)
@@ -1,79 +1,62 @@
 #include "precompiled.h"
 
 #include "CStr.h"
 #include "CLogger.h"
 #include "ps/Errors.h"
 
 #include "World.h"
 #include "MapReader.h"
 #include "Game.h"
 #include "Terrain.h"
 #include "LightEnv.h"
 #include "BaseEntityCollection.h"
 #include "EntityManager.h"
 #include "timer.h"
 #include "Loader.h"
+#include "LoaderThunks.h"
 
 #define LOG_CATEGORY "world"
 
 CLightEnv g_LightEnv;
 
 void CWorld::Initialize(CGameAttributes *pAttribs)
 {
-	TIMER(CWorld__Initialize);
-
 	// TODO: Find a better way of handling these global things
-	ONCE(g_EntityTemplateCollection.loadTemplates());
+	ONCE(RegMemFun(CBaseEntityCollection::GetSingletonPtr(), &CBaseEntityCollection::loadTemplates, L"LoadTemplates", 960));
 
 	// Load the map, if one was specified
 	if (pAttribs->m_MapFile.Length())
 	{
 		CStr mapfilename("maps/scenarios/");
 
 		mapfilename += (CStr)pAttribs->m_MapFile;
 
+		CMapReader* reader = 0;
 		try {
-			CMapReader reader;
-			reader.LoadMap(mapfilename, &m_Terrain, &m_UnitManager, &g_LightEnv);
+			reader = new CMapReader;
+			reader->LoadMap(mapfilename, &m_Terrain, &m_UnitManager, &g_LightEnv);
+				// fails immediately, or registers for delay loading
 		} catch (...) {
+			delete reader;
 			LOG(ERROR, LOG_CATEGORY, "Failed to load map %s", mapfilename.c_str());
 			throw PSERROR_Game_World_MapLoadFailed();
 		}
 	}
 }
 
-struct ThunkParams
-{
-	CWorld* const this_;
-	CGameAttributes* const pAttribs;
-	ThunkParams(CWorld* this__, CGameAttributes* pAttribs_)
-		: this_(this__), pAttribs(pAttribs_) {}
-};
-
-static int LoadThunk(void* param, double time_left)
-{
-	const ThunkParams* p = (const ThunkParams*)param;
-	CWorld* const this_             = p->this_;
-	CGameAttributes* const pAttribs = p->pAttribs;
-
-	this_->Initialize(pAttribs);
-	delete p;
-	return 0;
-}
 
 void CWorld::RegisterInit(CGameAttributes *pAttribs)
 {
-	void* param = new ThunkParams(this, pAttribs);
-	THROW_ERR(LDR_Register(LoadThunk, param, L"CWorld", 1000));
+	Initialize(pAttribs);
 }
 
 
 CWorld::~CWorld()
 {
 	// The Entity Manager should perhaps be converted into a CWorld member..
 	// But for now, we'll just create and delete the global singleton instance
 	// following the creation and deletion of CWorld.
 	// The reason for not keeping the instance around is that we require a
 	// clean slate for each game start.
 	delete &m_EntityManager;
 }
Index: ps/trunk/source/ps/LoaderThunks.h
===================================================================
--- ps/trunk/source/ps/LoaderThunks.h	(nonexistent)
+++ ps/trunk/source/ps/LoaderThunks.h	(revision 2038)
@@ -0,0 +1,51 @@
+
+template<class T> struct MemFun_t
+{
+	T* const this_;
+	void(T::*func)(void);
+	MemFun_t(T* this__, void(T::*func_)(void))
+		: this_(this__), func(func_) {}
+};
+
+template<class T> static int MemFunThunk(void* param, double time_left)
+{
+	MemFun_t<T>* const mf = (MemFun_t<T>*)param;
+	(mf->this_->*mf->func)();
+	delete mf;
+	return 0;
+}
+
+template<class T> void RegMemFun(T* this_, void(T::*func)(void),
+								 const wchar_t* description, int estimated_duration_ms)
+{
+	void* param = new MemFun_t<T>(this_, func);
+	THROW_ERR(LDR_Register(MemFunThunk<T>, param, description, estimated_duration_ms));
+}
+
+
+////////////////////////////////////////////////////////
+
+
+template<class T, class Arg> struct MemFun1_t
+{
+	T* const this_;
+	Arg arg;
+	void(T::*func)(Arg);
+	MemFun1_t(T* this__, void(T::*func_)(Arg), Arg arg_)
+		: this_(this__), func(func_), arg(arg_) {}
+};
+
+template<class T, class Arg> static int MemFun1Thunk(void* param, double time_left)
+{
+	MemFun1_t<T, Arg>* const mf = (MemFun1_t<T, Arg>*)param;
+	(mf->this_->*mf->func)(mf->arg);
+	delete mf;
+	return 0;
+}
+
+template<class T, class Arg> void RegMemFun1(T* this_, void(T::*func)(Arg), Arg arg,
+											 const wchar_t* description, int estimated_duration_ms)
+{
+	void* param = new MemFun1_t<T, Arg>(this_, func, arg);
+	THROW_ERR(LDR_Register(MemFun1Thunk<T, Arg>, param, description, estimated_duration_ms));
+}
\ No newline at end of file
Index: ps/trunk/source/ps/Loader.cpp
===================================================================
--- ps/trunk/source/ps/Loader.cpp	(revision 2037)
+++ ps/trunk/source/ps/Loader.cpp	(revision 2038)
@@ -1,256 +1,280 @@
 // FIFO queue of load 'functors' with time limit; enables displaying
 // load progress without resorting to threads (complicated).
 //
 // Jan Wassenberg, initial implementation finished 2005-03-21
 // jan@wildfiregames.com
 
 #include "precompiled.h"
 
 #include <deque>
 #include <functional>
 
 #include "lib.h"	// error codes
 #include "timer.h"
 #include "CStr.h"
 #include "loader.h"
 
 
 // need a persistent counter so we can reset after each load,
 // and incrementally add "estimated/total".
 static int progress_percent = 0;
 
 // set by LDR_EndRegistering; used for progress % calculation. may be 0.
 static double total_estimated_duration;
 
+// used by LDR_ProgressiveLoad to add up the duration of requests that
+// time out by themselves (and therefore may be split across multiple calls)
+static double request_duration;
+
 // main purpose is to indicate whether a load is in progress, so that
 // LDR_ProgressiveLoad can return 0 iff loading just completed.
-// the REGISTERING state allows us to detect 2 simultaneous loads (bogus).
+// the REGISTERING state allows us to detect 2 simultaneous loads (bogus);
+// FIRST_LOAD is used to skip the first timeslice (see LDR_ProgressiveLoad).
 static enum
 {
 	IDLE,
 	REGISTERING,
+	FIRST_LOAD,
 	LOADING,
 }
 state = IDLE;
 
 
 // holds all state for one load request; stored in queue.
 struct LoadRequest
 {
 	// member documentation is in LDR_Register (avoid duplication).
 
 	LoadFunc func;
 	void* param;
 
 	const CStrW description;
 		// rationale for storing as CStrW here:
 		// - needs to be wide because it's user-visible and will be translated.
 		// - don't just store a pointer - the caller's string may be volatile.
 		// - the module interface must work in C, so we get/set as wchar_t*.
 
 	int estimated_duration_ms;
 
 	// LDR_Register gets these as parameters; pack everything together.
 	LoadRequest(LoadFunc func_, void* param_, const wchar_t* desc_, int ms_)
 		: func(func_), param(param_), description(desc_),
 		  estimated_duration_ms(ms_)
 	{
 	}
 };
 
 typedef std::deque<const LoadRequest> LoadRequests;
 static LoadRequests load_requests;
 
 // std::accumulate binary op; used by LDR_EndRegistering to sum up all
 // estimated durations (for % progress calculation)
 struct DurationAdder: public std::binary_function<double, const LoadRequest&, double>
 {
 	double operator()(double partial_result, const LoadRequest& lr) const
 	{
 		return partial_result + lr.estimated_duration_ms*1e-3;
 	}
 };
 
 
 // call before starting to register load requests.
 // this routine is provided so we can prevent 2 simultaneous load operations,
 // which is bogus. that can happen by clicking the load button quickly,
 // or issuing via console while already loading.
 int LDR_BeginRegistering()
 {
 	if(state != IDLE)
 		return -1;
 
 	state = REGISTERING;
 	load_requests.clear();
 	return 0;
 }
 
 
 // register a load request (later processed in FIFO order).
 // <func>: function that will perform the actual work; see LoadFunc.
 // <param>: (optional) parameter/persistent state; must be freed by func.
 // <description>: user-visible description of the current task, e.g.
 //   "Loading map".
 // <estimated_duration_ms>: used to calculate progress, and when checking
 //   whether there is enough of the time budget left to process this task
 //   (reduces timeslice overruns, making the main loop more responsive).
 int LDR_Register(LoadFunc func, void* param, const wchar_t* description,
 	int estimated_duration_ms)
 {
 	if(state != REGISTERING)
 	{
 		debug_warn("LDR_Register: not called between LDR_(Begin|End)Register - why?!");
 			// warn here instead of relying on the caller to CHECK_ERR because
 			// there will be lots of call sites spread around.
 		return -1;
 	}
 
 	const LoadRequest lr(func, param, description, estimated_duration_ms);
 	load_requests.push_back(lr);
 	return 0;
 }
 
 
 // call when finished registering load requests; subsequent calls to
 // LDR_ProgressiveLoad will then work off the queued entries.
 int LDR_EndRegistering()
 {
 	if(state != REGISTERING)
 		return -1;
 
 	if(load_requests.empty())
 		debug_warn("LDR_EndRegistering: no LoadRequests queued");
 
-	state = LOADING;
+	state = FIRST_LOAD;
 	progress_percent = 0;
 	total_estimated_duration = std::accumulate(load_requests.begin(), load_requests.end(), 0.0, DurationAdder());
+	request_duration = 0.0;
 	return 0;
 }
 
 
 // immediately cancel the load. note: no special notification will be
 // returned by LDR_ProgressiveLoad.
 int LDR_Cancel()
 {
 	// note: calling during registering doesn't make sense - that
 	// should be an atomic sequence of begin, register [..], end.
 	if(state != LOADING)
 		return -1;
 
 	state = IDLE;
 	// the queue doesn't need to be emptied now; that'll happen during the
 	// next LDR_StartRegistering. for now, it is sufficient to set the
 	// state, so that LDR_ProgressiveLoad is a no-op.
 	return 0;
 }
 
 
 // helper routine for LDR_ProgressiveLoad.
 // tries to prevent starting a long task when at the end of a timeslice.
 static bool HaveTimeForNextTask(double time_left, double time_budget, int estimated_duration_ms)
 {
 	// have already exceeded our time budget
 	if(time_left <= 0.0)
 		return false;
 
 	// we've already used up more than 60%:
 	// (if it's less than that, we won't check the next task length)
 	if(time_left < 0.40*time_budget)
 	{
 		const double estimated_duration = estimated_duration_ms*1e-3;
 		// .. and the upcoming task is expected to be long -
 		// leave it for the next timeslice.
 		if(estimated_duration > time_left + time_budget*0.20)
 			return false;
 	}
 
 	return true;
 }
 
 
 // process as many of the queued load requests as possible within
 // <time_budget> [s]. if a request is lengthy, the budget may be exceeded.
 // call from the main loop.
 //
 // passes back a description of the next task that will be undertaken
 // ("" if finished) and the progress value established by the
 // last request to complete.
 //
 // return semantics:
 // - if loading just completed, return 0.
 // - if loading is in progress but didn't finish, return ERR_TIMED_OUT.
 // - if not currently loading (no-op), return 1.
 // - any other value indicates a failure; the request has been de-queued.
 //
 // string interface rationale: for better interoperability, we avoid C++
 // std::wstring and PS CStr. since the registered description may not be
 // persistent, we can't just store a pointer. returning a pointer to
 // our copy of the description doesn't work either, since it's freed when
 // the request is de-queued. that leaves writing into caller's buffer.
 int LDR_ProgressiveLoad(double time_budget, wchar_t* description_,
 	size_t max_chars, int* progress_percent_)
 {
+	int ret;	// single exit; this is returned
+	double time_left = time_budget;
+
+	// don't do any work the first call so that a graphics update
+	// happens before the first (probably lengthy) timeslice.
+	if(state == FIRST_LOAD)
+	{
+		state = LOADING;
+		ret = ERR_TIMED_OUT;	// make caller think we did something
+		goto done;
+	}
+
 	// we're called unconditionally from the main loop, so this isn't
 	// an error; there is just nothing to do.
 	if(state != LOADING)
 		return 1;
 
-	const double end_time = get_time() + time_budget;
-	int ret;	// single exit; this is returned
-
 	while(!load_requests.empty())
 	{
-		double time_left = end_time - get_time();
-
 		// do actual work of loading
 		const LoadRequest& lr = load_requests.front();
+		const double t0 = get_time();
 		ret = lr.func(lr.param, time_left);
+		const double elapsed_time = get_time() - t0;
+
+		// time accounting
+		time_left -= elapsed_time;
+		request_duration += elapsed_time;
+		wcscpy_s(description_, max_chars, lr.description);	// HACK, used below
+
 		// .. either finished entirely, or failed => remove from queue
 		if(ret != ERR_TIMED_OUT)
 			load_requests.pop_front();
 		// .. failed or timed out => abort immediately; loading will
 		// continue when we're called in the next iteration of the main loop.
 		// rationale: bail immediately instead of remembering the first error
 		// that came up, so that we report can all errors that happen.
 		if(ret != 0)
 			goto done;
 		// .. completed normally => update progress
 		//    note: during development, estimates won't yet be set,
 		//    so allow this to be 0 and don't fail in LDR_EndRegistering
 		if(total_estimated_duration != 0.0)	// prevent division by zero
 		{
 			const double fraction = lr.estimated_duration_ms*1e-3 / total_estimated_duration;
 			progress_percent += (int)(fraction * 100.0);
 			assert(0 <= progress_percent && progress_percent <= 100);
 		}
+		debug_out("LOADER: completed %ls in %f ms\n", description_, elapsed_time*1e3);
+		request_duration = 0.0;
 
 		// check if we're out of time; take into account next task length.
 		// note: do this at the end of the loop to make sure there's
 		// progress even if the timer is low-resolution (=> time_left = 0).
-		time_left = end_time - get_time();
-		if(!HaveTimeForNextTask(time_left, time_budget, lr.estimated_duration_ms))
+//		if(!HaveTimeForNextTask(time_left, time_budget, lr.estimated_duration_ms))
 		{
 			ret = ERR_TIMED_OUT;
 			goto done;
 		}
 	}
 
 	// queue is empty, we just finished.
 	state = IDLE;
 	ret = 0;
 
+
 	// set output params (there are several return points above)
 done:
 	*progress_percent_ = progress_percent;
 	// we want the next task, instead of what just completed:
 	// it will be displayed during the next load phase.
 	const wchar_t* description = L"";	// assume finished
 	if(!load_requests.empty())
 		description = load_requests.front().description.c_str();
 	wcscpy_s(description_, max_chars, description);
 
 	debug_out("LDR_ProgressiveLoad RETURNING; desc=%ls progress=%d\n", description_, progress_percent);
 
 	return ret;
 }
Index: ps/trunk/source/simulation/Simulation.cpp
===================================================================
--- ps/trunk/source/simulation/Simulation.cpp	(revision 2037)
+++ ps/trunk/source/simulation/Simulation.cpp	(revision 2038)
@@ -1,139 +1,120 @@
 #include "precompiled.h"
 
 #include <timer.h>
 
 #include "Simulation.h"
 #include "TurnManager.h"
 #include "Game.h"
 #include "EntityManager.h"
 #include "Scheduler.h"
 #include "Network/NetMessage.h"
 #include "CLogger.h"
 #include "CConsole.h"
 #include "Unit.h"
 #include "Model.h"
 #include "Loader.h"
+#include "LoaderThunks.h"
 
 #include "gui/CGUI.h"
 
 extern CConsole *g_Console;
 
 CSimulation::CSimulation(CGame *pGame):
 	m_pGame(pGame),
 	m_pWorld(pGame->GetWorld()),
 	m_pTurnManager((g_SinglePlayerTurnManager=new CSinglePlayerTurnManager())),
 	m_DeltaTime(0)
 {}
 
 CSimulation::~CSimulation()
 {
 	delete g_SinglePlayerTurnManager;
 	g_SinglePlayerTurnManager=NULL;
 }
 
 void CSimulation::Initialize(CGameAttributes *pAttribs)
 {
 	m_pTurnManager->Initialize(m_pGame->GetNumPlayers());
 
 	g_EntityManager.InitializeAll();
 }
 
 
-struct ThunkParams
-{
-	CSimulation* const this_;
-	CGameAttributes* const pAttribs;
-	ThunkParams(CSimulation* this__, CGameAttributes* pAttribs_)
-		: this_(this__), pAttribs(pAttribs_) {}
-};
-
-static int LoadThunk(void* param, double time_left)
-{
-	const ThunkParams* p = (const ThunkParams*)param;
-	CSimulation* const this_        = p->this_;
-	CGameAttributes* const pAttribs = p->pAttribs;
-
-	this_->Initialize(pAttribs);
-	delete p;
-	return 0;
-}
-
 void CSimulation::RegisterInit(CGameAttributes *pAttribs)
 {
-	void* param = new ThunkParams(this, pAttribs);
-	THROW_ERR(LDR_Register(LoadThunk, param, L"CSimulation", 1000));
+	RegMemFun1(this, &CSimulation::Initialize, pAttribs, L"CSimulation", 31);
 }
 
 
 
 void CSimulation::Update(double frameTime)
 {
 	m_DeltaTime += frameTime;
 	
 	if( m_DeltaTime >= 0.0 )
 	{
 		// A new simulation frame is required.
 		MICROLOG( L"calculate simulation" );
 		Simulate();
 		m_DeltaTime -= (m_pTurnManager->GetTurnLength()/1000.0);
 		if( m_DeltaTime >= 0.0 )
 		{
 			// The desired sim frame rate can't be achieved. Settle for process & render
 			// frames as fast as possible.
 			m_DeltaTime = 0.0;
 		}
 	}
 
 	Interpolate(frameTime, ((1000.0*m_DeltaTime) / (float)m_pTurnManager->GetTurnLength()) + 1.0);
 }
 
 void CSimulation::Interpolate(double frameTime, double offset)
 {
 	const std::vector<CUnit*>& units=m_pWorld->GetUnitManager()->GetUnits();
 	for (uint i=0;i<units.size();++i)
 		units[i]->GetModel()->Update((float)frameTime);
 
 	g_EntityManager.interpolateAll((float)offset);
 }
 
 void CSimulation::Simulate()
 {
 	g_Scheduler.update(m_pTurnManager->GetTurnLength());
 	g_EntityManager.updateAll( m_pTurnManager->GetTurnLength() );
 
 	m_pTurnManager->NewTurn();
 	m_pTurnManager->IterateBatch(0, TranslateMessage, this);
 }
 
 uint CSimulation::TranslateMessage(CNetMessage *pMsg, uint clientMask, void *userdata)
 {
 	CSimulation *pSimulation=(CSimulation *)userdata;
 
 	CEntityOrder entOrder;
 	switch (pMsg->GetType())
 	{
 	case NMT_GotoCommand:
 		CGotoCommand *msg=(CGotoCommand *)pMsg;
 		entOrder.m_type=CEntityOrder::ORDER_GOTO;
 		entOrder.m_data[0].location.x=(float)msg->m_TargetX;
 		entOrder.m_data[0].location.y=(float)msg->m_TargetY;
 		CEntity *ent=msg->m_Entity;
 		ent->pushOrder( entOrder );
 		break;
 	}
 
 	return clientMask;
 }
 
 uint CSimulation::GetMessageMask(CNetMessage *pMsg, uint oldMask, void *userdata)
 {
 	CSimulation *pSimulation=(CSimulation *)userdata;
 	// Pending a complete visibility/minimal-update implementation, we'll
 	// simply select the first 32 connected clients ;-)
 	return 0xffffffff;
 }
 
 void CSimulation::QueueLocalCommand(CNetMessage *pMsg)
 {
 	m_pTurnManager->QueueLocalCommand(pMsg);
 }
Index: ps/trunk/source/main.cpp
===================================================================
--- ps/trunk/source/main.cpp	(revision 2037)
+++ ps/trunk/source/main.cpp	(revision 2038)
@@ -1,1410 +1,1397 @@
 #include "precompiled.h"
 
 #ifdef SCED
 # include "ui/StdAfx.h"
 # undef ERROR
 #endif // SCED
 
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>
 #include <cmath>
 #include <stdarg.h>
 
 
 #include "sdl.h"
 #include "ogl.h"
 #include "detect.h"
 #include "timer.h"
 #include "input.h"
 #include "lib.h"
 #include "lib/res/res.h"
 #include "lib/res/tex.h"
 #include "lib/res/hotload.h"
 #ifdef _M_IX86
 # include "sysdep/ia32.h"	// _control87
 #endif
 #include "lib/res/cursor.h"
 
 #include "ps/Loader.h"
 #include "ps/Font.h"
 #include "ps/CConsole.h"
 
 #include "ps/Game.h"
 
 #include "MapReader.h"
 #include "Terrain.h"
 #include "TextureManager.h"
 #include "ObjectManager.h"
 #include "SkeletonAnimManager.h"
 #include "Renderer.h"
 #include "LightEnv.h"
 #include "Model.h"
 #include "UnitManager.h"
 #include "MaterialManager.h"
 #include "MeshManager.h"
 #include "Overlay.h"
 
 #include "Interact.h"
 #include "Hotkey.h"
 #include "BaseEntityCollection.h"
 #include "Entity.h"
 #include "EntityHandles.h"
 #include "EntityManager.h"
 #include "PathfindEngine.h"
 #include "Scheduler.h"
 #include "StringConvert.h"
 
 #include "scripting/ScriptingHost.h"
 #include "scripting/JSInterface_Entity.h"
 #include "scripting/JSInterface_BaseEntity.h"
 #include "scripting/JSInterface_Vector3D.h"
 #include "scripting/JSInterface_Camera.h"
 #include "scripting/JSInterface_Selection.h"
 #include "scripting/JSInterface_Console.h"
 #include "scripting/JSCollection.h"
 #include "scripting/DOMEvent.h"
 #ifndef NO_GUI
 # include "gui/scripting/JSInterface_IGUIObject.h"
 # include "gui/scripting/JSInterface_GUITypes.h"
 #endif
 
 #include "ConfigDB.h"
 #include "CLogger.h"
 
 #include "ps/i18n.h"
 
 #define LOG_CATEGORY "main"
 
 #ifndef NO_GUI
 # include "gui/GUI.h"
 #endif
 
 #include "sound/CMusicPlayer.h"
 #include "sound/JSI_Sound.h"
 #include "lib/res/snd.h"
 
 #include "Network/SessionManager.h"
 #include "Network/Server.h"
 #include "Network/Client.h"
 
 CConsole* g_Console = 0;
 extern int conInputHandler(const SDL_Event* ev);
 
 // Globals
 
 bool keys[SDLK_LAST];
 bool mouseButtons[5];
 int g_mouse_x=50, g_mouse_y=50;
 
 int g_xres, g_yres;
 int g_bpp;
 int g_freq;
 bool g_active = true;
 
 // flag to disable extended GL extensions until fix found - specifically, crashes
 // using VBOs on laptop Radeon cards
 static bool g_NoGLVBO=false;
 // flag to switch on shadows
 static bool g_Shadows=false;
 // flag to switch off pbuffers
 static bool g_NoPBuffer=true;
 // flag to switch on fixed frame timing (RC: I'm using this for profiling purposes)
 static bool g_FixedFrameTiming=false;
 static bool g_VSync = false;
 static float g_LodBias = 0.0f;
 
 static bool g_Quickstart=false;
 
 extern CLightEnv g_LightEnv;
 
 static bool g_EntGraph = false;
 
 static float g_Gamma = 1.0f;
 
 extern int game_view_handler(const SDL_Event* ev);
 
 static CMusicPlayer MusicPlayer;
 
 CStr g_CursorName = "test";
 CStr g_ActiveProfile = "default";
 
 extern int allow_reload();
 extern int dir_add_watch(const char* dir, bool watch_subdirs);
 
 extern void sle(int);
 
 extern size_t frameCount;
 static bool quit = false;	// break out of main loop
 
 const wchar_t* HardcodedErrorString(int err)
 {
 #define E(sym) case sym: return L ## #sym;
 
 	switch(err)
 	{
 	E(ERR_NO_MEM)
 	E(ERR_FILE_NOT_FOUND)
 	E(ERR_INVALID_HANDLE)
 	E(ERR_INVALID_PARAM)
 	E(ERR_EOF)
 	E(ERR_PATH_NOT_FOUND)
 	E(ERR_PATH_LENGTH)
 	default:
 		return 0;
 	}
 }
 
 const wchar_t* ErrorString(int err)
 {
 	// language file not available (yet)
 	if(1)
 		return HardcodedErrorString(err);
 
 	// TODO: load from language file
 }
 
 
 ERROR_GROUP(System);
 ERROR_TYPE(System, SDLInitFailed);
 ERROR_TYPE(System, VmodeFailed);
 ERROR_TYPE(System, RequiredExtensionsMissing);
 
 void Testing (void)
 {
 	g_Console->InsertMessage(L"Testing Function Registration");
 }
 
 static std::string SplitExts(const char *exts)
 {
 	std::string str = exts;
 	std::string ret = "";
 	size_t idx = str.find_first_of(" ");
 	while(idx != std::string::npos)
 	{
 		if(idx >= str.length() - 1)
 		{
 			ret += str;
 			break;
 		}
 
 		ret += str.substr(0, idx);
 		ret += "\n";
 		str = str.substr(idx + 1);
 		idx = str.find_first_of(" ");
 	}
 
 	return ret;
 }
 
 static void WriteSysInfo()
 {
 double t1 = get_time();
 	get_gfx_info();
 	get_cpu_info();
 	get_snd_info();
 	get_mem_status();
 double t2 = get_time();
 debug_out("SYS DETECT TIME %g\n\n", t2-t1);
 
 
 	struct utsname un;
 	uname(&un);
 
 	FILE* f = fopen("../logs/system_info.txt", "w");
 	if(!f)
 		return;
 
 	// .. OS
 	fprintf(f, "%s %s (%s)\n", un.sysname, un.release, un.version);
 
 	// .. CPU
 	fprintf(f, "%s, %s", un.machine, cpu_type);
 	if(cpus > 1)
 		fprintf(f, " (x%d)", cpus);
 	if(cpu_freq != 0.0f)
 	{
 		if(cpu_freq < 1e9)
 			fprintf(f, ", %.2f MHz\n", cpu_freq*1e-6);
 		else
 			fprintf(f, ", %.2f GHz\n", cpu_freq*1e-9);
 	}
 	else
 		fprintf(f, "\n");
 
 	// .. memory
 	fprintf(f, "%lu MB RAM; %lu MB free\n", tot_mem/MiB, avl_mem/MiB);
 
 	// .. graphics card
 	fprintf(f, "%s\n", gfx_card);
 	fprintf(f, "%s\n", gfx_drv_ver);
 	fprintf(f, "%dx%d:%d@%d\n", g_xres, g_yres, g_bpp, g_freq);
 	fprintf(f, "OpenGL: %s\n", glGetString(GL_VERSION));
 
 	// .. sound card
 	fprintf(f, "%s\n", snd_card);
 	fprintf(f, "%s\n", snd_drv_ver);
 
 	// .. network name / ips
 	//    note: can't use un.nodename because it is for an
 	//    "implementation-defined communications network".
 	char hostname[128];
 	if (gethostname(hostname, sizeof(hostname)) == 0) // make sure it succeeded
 	{
 		fprintf(f, "%s\n", hostname);
 		hostent* host = gethostbyname(hostname);
 		if(host)
 		{
 			struct in_addr** ips = (struct in_addr**)host->h_addr_list;
 			for(int i = 0; ips && ips[i]; i++)
 				fprintf(f, "%s ", inet_ntoa(*ips[i]));
 			fprintf(f, "\n");
 		}
 	}
 
 	// Write extensions last, because there are lots of them
 	const char* exts = oglExtList();
 	if (!exts) exts = "{unknown}";
 	fprintf(f, "\nSupported extensions: \n%s\n", SplitExts(exts).c_str());
 
 	fclose(f);
 	f = 0;
 }
 
 
 
 
 static int set_vmode(int w, int h, int bpp, bool fullscreen)
 {
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
 	if(!SDL_SetVideoMode(w, h, bpp, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0)))
 		return -1;
 
 	glViewport(0, 0, w, h);
 
 #ifndef NO_GUI
 	g_GUI.UpdateResolution();
 #endif
 
 	oglInit();	// required after each mode change
 
 	if(SDL_SetGamma(g_Gamma, g_Gamma, g_Gamma) < 0)
 		debug_warn("SDL_SetGamma failed");
 
 	return 0;
 }
 
 
 // <extension> identifies the file format that is to be written
 // (case-insensitive). examples: "bmp", "png", "jpg".
 // BMP is good for quick output at the expense of large files.
 static void WriteScreenshot(const char* extension = "png")
 {
 	// determine next screenshot number.
 	//
 	// current approach: increment number until that file doesn't yet exist.
 	// this is fairly slow, but it's typically only done once, since the last
 	// number is cached. binary search shouldn't be necessary.
 	//
 	// known bug: after program restart, holes in the number series are
 	// filled first. example: add 1st and 2nd; [exit] delete 1st; [restart]
 	// add 3rd -> it gets number 1, not 3. 
 	// could fix via enumerating all files, but it's not worth it ATM.
 	char fn[VFS_MAX_PATH];
 
 	const char* file_format_string = "screenshots/screenshot%04d.%s";
 		// %04d -> always 4 digits, so sorting by filename works correctly.
 
 	static int next_num = 1;
 	do
 		sprintf(fn, file_format_string, next_num++, extension);
 	while(vfs_exists(fn));
 
 	const int w = g_xres, h = g_yres;
 	const int bpp = 24;
 	GLenum fmt = GL_RGB;
 	int flags = TEX_BOTTOM_UP;
 	// we want writing BMP to be as fast as possible,
 	// so read data from OpenGL in BMP format to obviate conversion.
 	if(!stricmp(extension, "bmp"))
 	{
 		fmt = GL_BGR;
 		flags |= TEX_BGR;
 	}
 		
 	const size_t size = w * h * bpp;
 	void* img = mem_alloc(size);
 
 	glReadPixels(0, 0, w, h, fmt, GL_UNSIGNED_BYTE, img);
 
 	if(tex_write(fn, w, h, bpp, flags, img) < 0)
 		debug_warn("WriteScreenshot: tex_write failed");
 
 	mem_free(img);
 }
 
 
 
 // HACK: Let code from other files (i.e. the scripting system) quit
 void kill_mainloop()
 {
 	quit = true;
 }
 
 static int handler(const SDL_Event* ev)
 {
 	int c;
 
 	switch(ev->type)
 	{
 	case SDL_ACTIVEEVENT:
 		g_active = ev->active.gain != 0;
 		break;
 
 	case SDL_MOUSEMOTION:
 		g_mouse_x = ev->motion.x;
 		g_mouse_y = ev->motion.y;
 		break;
 
 	case SDL_KEYDOWN:
 		c = ev->key.keysym.sym;
 		keys[c] = true;
 		break;
 
 	case SDL_HOTKEYDOWN:
 
 		switch( ev->user.code )
 		{
 		case HOTKEY_EXIT:
 			quit = true;
 			break;
 
 		case HOTKEY_SCREENSHOT:
 			WriteScreenshot();
 			break;
 
 		case HOTKEY_PLAYMUSIC:
 			{
 //			MusicPlayer.open("audio/music/germanic peace 3.ogg");
 //			MusicPlayer.play();
 			Handle hs = snd_open(
 				//"audio/music/germanic peace 3.ogg"
 				"audio/voice/hellenes/soldier/Attack-ZeusSaviourandVictory.ogg"
 				);
 				
 
 			snd_set_pos(hs, 0,0,0, true);
 			snd_play(hs);
 			}
 			break;
 
 		default:
 			return( EV_PASS );
 		}
 		return( EV_HANDLED );
 
 	case SDL_KEYUP:
 		c = ev->key.keysym.sym;
 		keys[c] = false;
 		break;
 	case SDL_MOUSEBUTTONDOWN:
 		c = ev->button.button;
 		if( c < 5 )
 			mouseButtons[c] = true;
 		else
 			debug_warn("SDL mouse button defs changed; fix mouseButton array def");
 		break;
 	case SDL_MOUSEBUTTONUP:
 		c = ev->button.button;
 		if( c < 5 )
 			mouseButtons[c] = false;
 		else
 			debug_warn("SDL mouse button defs changed; fix mouseButton array def");
 		break;
 	}
 
 	return EV_PASS;
 }
 
 void EndGame()
 {
 	if (g_NetServer)
 	{
 		delete g_NetServer;
 		g_NetServer=NULL;
 	}
 	else if (g_NetClient)
 	{
 		delete g_NetClient;
 		g_NetClient=NULL;
 	}
 
 	delete g_Game;
 	g_Game=NULL;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // RenderNoCull: render absolutely everything to a blank frame to force renderer
 // to load required assets
 void RenderNoCull()
 {
 	g_Renderer.BeginFrame();
 
 	if (g_Game)
 		g_Game->GetView()->RenderNoCull();
 
 	g_Renderer.FlushFrame();
 	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 	g_Renderer.EndFrame();
 }
 
 
 static void Render()
 {
 	MICROLOG(L"begin frame");
 
 	oglCheck();
 
 #ifndef NO_GUI // HACK: because colour-parsing requires the GUI
 	CStr skystring = "61 193 255";
 	CConfigValue* val;
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "skycolor")))
 		val->GetString(skystring);
 	CColor skycol;
 	GUI<CColor>::ParseString(skystring, skycol);
 	g_Renderer.SetClearColor(skycol.Int());
 #endif
 
 	// start new frame
 	g_Renderer.BeginFrame();
 
 	oglCheck();
 
 	if (g_Game && g_Game->IsGameStarted())
 	{
 		g_Game->GetView()->Render();
 
 		oglCheck();
 
 		MICROLOG(L"flush frame");
 		g_Renderer.FlushFrame();
 
 		glPushAttrib( GL_ENABLE_BIT );
 		glDisable( GL_LIGHTING );
 		glDisable( GL_TEXTURE_2D );
 		glDisable( GL_DEPTH_TEST );
 		
 		if( g_EntGraph )
 		{
 			glColor3f( 1.0f, 0.0f, 1.0f );
 
 			MICROLOG(L"render entities");
 			g_EntityManager.renderAll(); // <-- collision outlines, pathing routes
 		}
 
 		g_Mouseover.renderSelectionOutlines();
 		g_Selection.renderSelectionOutlines();
 		
 		glPopAttrib();
 	}
 	else
 		g_Renderer.FlushFrame();
 
 	oglCheck();
 
 	MICROLOG(L"render fonts");
 	// overlay mode
 	glPushAttrib(GL_ENABLE_BIT);
 	glEnable(GL_TEXTURE_2D);
 	glDisable(GL_CULL_FACE);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glLoadIdentity();
 	glOrtho(0.f, (float)g_xres, 0.f, (float)g_yres, -1.f, 1000.f);
 
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 
 	oglCheck();
 
 #ifndef NO_GUI
 	// Temp GUI message GeeTODO
 	glLoadIdentity();
 	MICROLOG(L"render GUI");
 	g_GUI.Draw();
 #endif
 
 	oglCheck();
 
 	// Text:
 
 	// Use the GL_ALPHA texture as the alpha channel with a flat colouring
 	glDisable(GL_ALPHA_TEST);
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 	// Added --
 	glEnable(GL_TEXTURE_2D);
 	// -- GL
 
 	oglCheck();
 
 	{
 		glLoadIdentity();
 
 		MICROLOG(L"render console");
 		CFont font("console");
 		font.Bind();
 		g_Console->Render();
 	}
 
 	oglCheck();
 
 	if (g_Game)
 	{
 		g_Mouseover.renderOverlays();
 		g_Selection.renderOverlays();
 	}
 
 	oglCheck();
 
 	// Draw the cursor (or set the Windows cursor, on Windows)
 	cursor_draw(g_CursorName);
 
 	// restore
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
 	glMatrixMode(GL_MODELVIEW);
 	glPopMatrix();
 	glPopAttrib();
 
 	MICROLOG(L"end frame");
 	g_Renderer.EndFrame();
 
 	oglCheck();
 }
 
 static void LoadProfile( CStr profile )
 {
 	CStr filename = CStr( "profiles/" ) + profile + CStr( ".cfg" );
 	g_ConfigDB.SetConfigFile( CFG_USER, true, filename );
 	g_ConfigDB.Reload( CFG_USER );
 }
 
 // Fill in the globals from the config files.
 static void LoadGlobals()
 {
 	CConfigValue *val;
 
 	if ((val=g_ConfigDB.GetValue(CFG_SYSTEM, "profile")))
 		val->GetString( g_ActiveProfile );
 
 	// Now load the profile before trying to retrieve the values of the rest of these.
 
 	LoadProfile( g_ActiveProfile );
 
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "xres")))
 		val->GetInt(g_xres);
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "yres")))
 		val->GetInt(g_yres);
 
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "vsync")))
 		val->GetBool(g_VSync);
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "novbo")))
 		val->GetBool(g_NoGLVBO);
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "shadows")))
 		val->GetBool(g_Shadows);
 
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "lodbias")))
 		val->GetFloat(g_LodBias);
 
 	if ((val=g_ConfigDB.GetValue(CFG_USER, "sound.mastergain")))
 	{
 		float gain;
 		val->GetFloat(gain);
 		int ret = snd_set_master_gain(gain);
 		assert2(ret == 0);
 	}
 
 	LOG(NORMAL, LOG_CATEGORY, "g_x/yres is %dx%d", g_xres, g_yres);
 	LOG(NORMAL, LOG_CATEGORY, "Active profile is %s", g_ActiveProfile.c_str());
 }
 
 static void ParseArgs(int argc, char* argv[])
 {
 	for(int i = 1; i < argc; i++)
 	{
 		// this arg isn't an option; skip
 		if(argv[i][0] != '-')
 			continue;
 
 		char* name = argv[i]+1;	// no leading '-'
 
 		// switch first letter of option name
 		switch(argv[i][1])
 		{
 		case 'c':
 			if(strcmp(name, "conf") == 0)
 			{
 				if(argc-i >= 1) // at least one arg left
 				{
 					i++;
 					char* arg = argv[i];
 					char* equ = strchr(arg, '=');
 					if(equ)
 					{
 						*equ = 0;
 						g_ConfigDB.CreateValue(CFG_COMMAND, arg)
 							->m_String = (equ+1);
 					}
 				}
 			}
 			break;
 		case 'e':
 			g_EntGraph = true;
 			break;
 		case 'f':
 			if(strncmp(name, "fixedframe", 10) == 0)
 				g_FixedFrameTiming=true;
 			break;
 		case 'g':
 			if(strncmp(name, "g=", 2) == 0)
 			{
 				g_Gamma = (float)atof(argv[i] + 3);
 				if(g_Gamma == 0.0f)
 					g_Gamma = 1.0f;
 			}
 			break;
 		case 'l':
 			if(strncmp(name, "listfiles", 9) == 0)
 				vfs_enable_file_listing(true);
 			break;
 		case 'n':
 			if(strncmp(name, "novbo", 5) == 0)
 				g_ConfigDB.CreateValue(CFG_COMMAND, "novbo")->m_String="true";
 			else if(strncmp(name, "nopbuffer", 9) == 0)
 				g_NoPBuffer = true;
 			break;
 		case 'q':
 			if(strncmp(name, "quickstart", 10) == 0)
 				g_Quickstart = true;
 			break;
 		case 's':
 			if(strncmp(name, "shadows", 7) == 0)
 				g_ConfigDB.CreateValue(CFG_COMMAND, "shadows")->m_String="true";
 			break;
 		case 'v':
 			g_ConfigDB.CreateValue(CFG_COMMAND, "vsync")->m_String="true";
 			break;
 		case 'x':
 			if(strncmp(name, "xres=", 6) == 0)
 				g_ConfigDB.CreateValue(CFG_COMMAND, "xres")->m_String=argv[i]+6;
 			break;
 		case 'y':
 			if(strncmp(name, "yres=", 6) == 0)
 				g_ConfigDB.CreateValue(CFG_COMMAND, "yres")->m_String=argv[i]+6;
 			break;
 		case 'p':
 			if(strncmp(name, "profile=", 8) == 0 )
 				g_ConfigDB.CreateValue(CFG_COMMAND, "profile")->m_String = argv[i]+9;
 			break;
 		}	// switch
 	}
 
 	
 }
 
 
 static void InitScripting()
 {
 TIMER(InitScripting)
 	// Create the scripting host.  This needs to be done before the GUI is created.
 	new ScriptingHost;
 
 	// It would be nice for onLoad code to be able to access the setTimeout() calls.
 	new CScheduler;
 
 	// Register the JavaScript interfaces with the runtime
 	CEntity::ScriptingInit();
 	CBaseEntity::ScriptingInit();
 	JSI_Sound::ScriptingInit();
 	
 #ifndef NO_GUI
 	JSI_IGUIObject::init();
 	JSI_GUITypes::init();
 #endif
 	JSI_Vector3D::init();
 	EntityCollection::Init( "EntityCollection" );
 	SColour::ScriptingInit();
 	CPlayer::ScriptingInit();
 	
 	PlayerCollection::Init( "PlayerCollection" );
 	CDamageType::ScriptingInit();
 	CJSPropertyAccessor<CEntity>::ScriptingInit(); // <-- Doesn't really matter which we use, but we know CJSPropertyAccessor<T> is already being compiled for T = CEntity.
 	CScriptEvent::ScriptingInit();
 	
 
 	g_ScriptingHost.DefineConstant( "ORDER_NONE", -1 );
 	g_ScriptingHost.DefineConstant( "ORDER_GOTO", CEntityOrder::ORDER_GOTO );
 	g_ScriptingHost.DefineConstant( "ORDER_PATROL", CEntityOrder::ORDER_PATROL );
 	g_ScriptingHost.DefineConstant( "ORDER_ATTACK", CEntityOrder::ORDER_ATTACK_MELEE );
 
 	JSI_Camera::init();
 	JSI_Console::init();
 }
 
 
 static void InitVfs(const char* argv0)
 {
 TIMER(InitVfs)
 	// set current directory to "$game_dir/data".
 	// this is necessary because it is otherwise unknown,
 	// especially if run from a shortcut / symlink.
 	//
 	// "../data" is relative to the executable (in "$game_dir/system").
 	//
 	// rationale for data/ being root: untrusted scripts must not be
 	// allowed to overwrite critical game (or worse, OS) files.
 	// the VFS prevents any accesses to files above this directory.
 	int err = file_rel_chdir(argv0, "../data");
 	if(err < 0)
 		throw err;
 
 //		display_startup_error(L"error setting current directory.\n"\
 //			L"argv[0] is probably incorrect. please start the game via command-line.");
 
 	vfs_mount("", "mods/official", VFS_MOUNT_RECURSIVE|VFS_MOUNT_ARCHIVES);
 	vfs_mount("screenshots/", "screenshots");
 	vfs_mount("profiles/", "profiles");
 
 	// don't try vfs_display yet: SDL_Init hasn't yet redirected stdout
 }
 
 static void InitPs()
 {
 	// console
 	{
 	TIMER(ps_console)
 
 		float ConsoleHeight = g_yres * 0.6f;
 		g_Console->SetSize(0, g_yres-ConsoleHeight, (float)g_xres, ConsoleHeight);
 
 		// Calculate and store the line spacing
 		CFont font("console");
 		g_Console->m_iFontHeight = font.GetLineSpacing();
 		// Offset by an arbitrary amount, to make it fit more nicely
 		g_Console->m_iFontOffset = 9;
 	}
 
 	// language and hotkeys
 	{
 	TIMER(ps_lang_hotkeys)
 
 		CConfigValue* val = g_ConfigDB.GetValue(CFG_SYSTEM, "language");
 		std::string lang = "english";
 		if (val)
 			val->GetString(lang);
 		I18n::LoadLanguage(lang.c_str());
 
 		loadHotkeys();
 	}
 
 #ifndef NO_GUI
 	{
 		// GUI uses VFS, so this must come after VFS init.
 		{TIMER(ps_gui_init)
 		g_GUI.Initialize();}
 
 		{TIMER(ps_gui_setup_xml)
 		g_GUI.LoadXMLFile("gui/test/setup.xml");}
 		{TIMER(ps_gui_styles_xml)
 		g_GUI.LoadXMLFile("gui/test/styles.xml");}
 		{TIMER(ps_gui_sprite1_xml)
 		g_GUI.LoadXMLFile("gui/test/sprite1.xml");}
 	}
 
 	// Temporary hack until revised GUI structure is completed.
 	{
 //	TIMER(ps_gui_hack)
 
 		{TIMER(ps_gui_1)
 		g_GUI.LoadXMLFile("gui/test/1_init.xml");}
 		{TIMER(ps_gui_2)
 		g_GUI.LoadXMLFile("gui/test/2_mainmenu.xml");}
 		{TIMER(ps_gui_3)
 		g_GUI.LoadXMLFile("gui/test/3_loading.xml");}
 		{TIMER(ps_gui_4)
 		g_GUI.LoadXMLFile("gui/test/4_session.xml");}
 		{TIMER(ps_gui_5)
 		g_GUI.LoadXMLFile("gui/test/5_manual.xml");}
 		{TIMER(ps_gui_6)
 		g_GUI.LoadXMLFile("gui/test/6_subwindows.xml");}
 		{TIMER(ps_gui_7)
 		g_GUI.LoadXMLFile("gui/test/7_atlas.xml");}
 		{TIMER(ps_gui_9)
 		g_GUI.LoadXMLFile("gui/test/9_global.xml");}
 	}
 
 //	{
 //	TIMER(ps_gui_hello_xml)
 //		g_GUI.LoadXMLFile("gui/test/hello.xml");
 //	}
 #endif
 }
 
 static void psShutdown()
 {
 #ifndef NO_GUI
 	g_GUI.Destroy();
 	delete &g_GUI;
 #endif
 
 	delete g_Console;
 
 	// disable the special Windows cursor, or free textures for OGL cursors
 	cursor_draw(NULL);
 
 	// close down Xerces if it was loaded
 	CXeromyces::Terminate();
 
 	MusicPlayer.release();
 
 	// Unload the real language (since it depends on the scripting engine,
 	// which is going to be killed later) and use the English fallback messages
 	I18n::LoadLanguage(NULL);
 }
 
 
 static void InitConfig(int argc, char* argv[])
 {
 TIMER(InitConfig)
 	MICROLOG(L"init config");
 
 	new CConfigDB;
 
 	g_ConfigDB.SetConfigFile(CFG_SYSTEM, false, "config/system.cfg");
 	g_ConfigDB.Reload(CFG_SYSTEM);
 
 	g_ConfigDB.SetConfigFile(CFG_MOD, true, "config/mod.cfg");
 	// No point in reloading mod.cfg here - we haven't mounted mods yet
 	
 	ParseArgs(argc, argv);
 
 	LoadGlobals(); // Collects information from system.cfg, the profile file, and any command-line overrides
 				   // to fill in the globals.
 }
 
 
 static void InitRenderer()
 {
 TIMER(InitRenderer)
 	// create renderer
 	new CRenderer;
 
 	// set renderer options from command line options - NOVBO must be set before opening the renderer
 	g_Renderer.SetOptionBool(CRenderer::OPT_NOVBO,g_NoGLVBO);
 	g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWS,g_Shadows);
 	g_Renderer.SetOptionBool(CRenderer::OPT_NOPBUFFER,g_NoPBuffer);
 	g_Renderer.SetOptionFloat(CRenderer::OPT_LODBIAS, g_LodBias);
 
 	// create terrain related stuff
 	new CTextureManager;
 
 	// create the material manager
 	new CMaterialManager;
 	new CMeshManager;
 
 	// create actor related stuff
 	new CSkeletonAnimManager;
 	new CObjectManager;
 	new CUnitManager;
 
 	MICROLOG(L"init renderer");
 	g_Renderer.Open(g_xres,g_yres,g_bpp);
 
 	// Setup default lighting environment. Since the Renderer accesses the
 	// lighting environment through a pointer, this has to be done before
 	// the first Frame.
 	g_LightEnv.m_SunColor=RGBColor(1,1,1);
 	g_LightEnv.SetRotation(DEGTORAD(270));
 	g_LightEnv.SetElevation(DEGTORAD(45));
 	g_LightEnv.m_TerrainAmbientColor=RGBColor(0,0,0);
 	g_LightEnv.m_UnitsAmbientColor=RGBColor(0.4f,0.4f,0.4f);
 	g_Renderer.SetLightEnv(&g_LightEnv);
 
 	// I haven't seen the camera affecting GUI rendering and such, but the
 	// viewport has to be updated according to the video mode
 	SViewPort vp;
 	vp.m_X=0;
 	vp.m_Y=0;
 	vp.m_Width=g_xres;
 	vp.m_Height=g_yres;
 	g_Renderer.SetViewport(vp);
 }
 
 
 static int ProgressiveLoad()
 {
 	wchar_t description[100];
 	int progress_percent;
 	int ret = LDR_ProgressiveLoad(100e-3, description, ARRAY_SIZE(description), &progress_percent);
 	switch(ret)
 	{
 	// no load active => no-op (skip code below)
 	case 1:
 		return 1;
-	// current task isn't complete (we don't care about this distinction)
+	// current task didn't complete. we only care about this insofar as the
+	// load process is therefore not yet finished.
 	case ERR_TIMED_OUT:
 		break;
 	// just finished loading
 	case 0:
 		g_Game->ReallyStartGame();
 		wcscpy_s(description, ARRAY_SIZE(description), L"Game is starting..");
 			// LDR_ProgressiveLoad returns L""; set to valid text to
 			// avoid problems in converting to JSString
 		break;
 	// error!
 	default:
 		CHECK_ERR(ret);
 			// can't do this above due to legit ERR_TIMED_OUT
 		break;
 	}
 
 	// display progress / description in loading screen
 	CStrW i18n_description = translate(description);
 	JSString* js_desc = StringConvert::wstring_to_jsstring(g_ScriptingHost.getContext(), i18n_description);
 	g_ScriptingHost.SetGlobal("g_Progress", INT_TO_JSVAL(progress_percent)); 
 	g_ScriptingHost.SetGlobal("g_LoadDescription", STRING_TO_JSVAL(js_desc));
 	g_GUI.SendEventToAll("progress");
 	return 0;
 }
 
 
 
 u64 PREVTSC;
 
 static void Shutdown()
 {
 	psShutdown(); // Must delete g_GUI before g_ScriptingHost
 
 	if (g_Game)
 		EndGame();
 
 	delete &g_Scheduler;
 
 	delete &g_SessionManager;
 
 	delete &g_Mouseover;
 	delete &g_Selection;
 
 	delete &g_Pathfinder;
 	// Managed by CWorld
 	// delete &g_EntityManager;
 
 	delete &g_GameAttributes;
 
 	delete &g_EntityTemplateCollection;
 
 	delete &g_ScriptingHost;
 
 	// destroy actor related stuff
 	delete &g_UnitMan;
 	delete &g_ObjMan;
 	delete &g_SkelAnimMan;
 
 	delete &g_MaterialManager;
 	delete &g_MeshManager;
 
 	// destroy terrain related stuff
 	delete &g_TexMan;
 
 	// destroy renderer
 	delete &g_Renderer;
 
 	delete &g_ConfigDB;
 
 	// Shut down the network loop
 	CSocketBase::Shutdown();
 
 	// Really shut down the i18n system. Any future calls
 	// to translate() will crash.
 	I18n::Shutdown();
 
 	snd_shutdown();
 
 	vfs_shutdown();
 
 	h_mgr_shutdown();
 	mem_shutdown();
 }
 
 static void Init(int argc, char* argv[], bool setup_gfx = true)
 {
 #ifdef _WIN32
 	sle(11340106);
 #endif
 
 	MICROLOG(L"In init");
 
 	// If you ever want to catch a particular allocation:
 	//_CrtSetBreakAlloc(187);
 
 #ifdef _MSC_VER
 u64 TSC=rdtsc();
 debug_out(
 "----------------------------------------\n"\
 "MAIN\n"\
 "----------------------------------------\n");
 PREVTSC=TSC;
 #endif
 
 	// Call LoadLanguage(NULL) to initialise the I18n system, but
 	// without loading an actual language file - translate() will
 	// just show the English key text, which is better than crashing
 	// from a null pointer when attempting to translate e.g. error messages.
 	// Real languages can only be loaded when the scripting system has
 	// been initialised.
 	MICROLOG(L"init i18n");
 	I18n::LoadLanguage(NULL);
 
 	// set 24 bit (float) FPU precision for faster divides / sqrts
 #ifdef _M_IX86
 	_control87(_PC_24, _MCW_PC);
 #endif
 
 	// Do this as soon as possible, because it chdirs
 	// and will mess up the error reporting if anything
 	// crashes before the working directory is set.
 	MICROLOG(L"init vfs");
 	const char* argv0 = argc? argv[0] : NULL;
 		// ScEd doesn't have a main(argc, argv), and so it has no argv. In that
 		// case, just pass NULL to InitVfs, which will work out the current
 		// directory for itself.
 	InitVfs(argv0);
 
 	// Set up the console early, so that debugging
 	// messages can be logged to it. (The console's size
 	// and fonts are set later in InitPs())
 	g_Console = new CConsole();
 
 	if (setup_gfx)
 	{
 		MICROLOG(L"init sdl");
 		// init SDL
 		if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0)
 		{
 			LOG(ERROR, LOG_CATEGORY, "SDL library initialization failed: %s", SDL_GetError());
 			throw PSERROR_System_SDLInitFailed();
 		}
 		atexit(SDL_Quit);
 		SDL_EnableUNICODE(1);
 	}
 
 	// preferred video mode = current desktop settings
 	// (command line params may override these)
 	get_cur_vmode(&g_xres, &g_yres, &g_bpp, &g_freq);
 
 	MICROLOG(L"init scripting");
 	InitScripting();	// before GUI
 	
 	// g_ConfigDB, command line args, globals
 	InitConfig(argc, argv);
 
 	// GUI is notified in set_vmode, so this must come before that.
 #ifndef NO_GUI
 	new CGUI;
 #endif
 
 	CConfigValue *val=g_ConfigDB.GetValue(CFG_SYSTEM, "windowed");
 	bool windowed=false;
 	if (val) val->GetBool(windowed);
 
 #ifdef _WIN32
 sle(11340106);
 #endif
 
 	if (setup_gfx)
 	{
 		MICROLOG(L"set vmode");
 
 		if(set_vmode(g_xres, g_yres, 32, !windowed) < 0)
 		{
 			LOG(ERROR, LOG_CATEGORY, "Could not set %dx%d graphics mode: %s", g_xres, g_yres, SDL_GetError());
 			throw PSERROR_System_VmodeFailed();
 		}
 		SDL_WM_SetCaption("0 A.D.", "0 A.D.");
 	}
 
 	if(!g_Quickstart)
 	{
 		WriteSysInfo();
 		vfs_display();
 	}
 	else
 		// speed up startup by disabling all sound
 		// (OpenAL init will be skipped).
 		// must be called before first snd_open.
 		snd_disable(true);
 
 	if(!oglHaveExtension("GL_ARB_multitexture") || !oglHaveExtension("GL_ARB_texture_env_combine") ||
 		!glActiveTexture)	// prevent crashing later if multitexture support is falsely
 							// advertised (janwas 2004-08-25, for bug #18)
 	{
 		LOG(ERROR, LOG_CATEGORY, "Required ARB_multitexture or ARB_texture_env_combine extension not available");
 		throw PSERROR_System_RequiredExtensionsMissing();
 	}
 
 	// enable/disable VSync
 	// note: "GL_EXT_SWAP_CONTROL" is "historical" according to dox.
 	if(oglHaveExtension("WGL_EXT_swap_control"))
 		wglSwapIntervalEXT(g_VSync? 1 : 0);
 
-#ifdef _MSC_VER
-u64 CURTSC=rdtsc();
-debug_out(
-"----------------------------------------\n"\
-"low-level ready (elapsed = %f ms)\n"\
-"----------------------------------------\n", (CURTSC-PREVTSC)/2e9*1e3);
-PREVTSC=CURTSC;
-#endif
-
 	MICROLOG(L"init ps");
 	InitPs();
 
 	InitRenderer();
 
 TIMER(init_after_InitRenderer);
 
 	// This needs to be done after the renderer has loaded all its actors...
 	new CBaseEntityCollection;
 	// CEntityManager is managed by CWorld
 	//new CEntityManager;
 	new CPathfindEngine;
 	new CSelectedEntities;
 	new CMouseoverEntities;
 
 	new CSessionManager;
 
 	new CGameAttributes;
 
 	// Register a few Game/Network JS globals
 	g_ScriptingHost.SetGlobal("g_GameAttributes", OBJECT_TO_JSVAL(g_GameAttributes.GetScript()));
 
 	// Check for heap corruption after every allocation. Very, very slowly.
 	// (And it highlights the allocation just after the one you care about,
 	// so you need to run it again and tell it to break on the one before.)
 /*
 	extern void memory_debug_extreme_turbo_plus();
 	memory_debug_extreme_turbo_plus();
 	_CrtSetBreakAlloc(36367);
 //*/
 
 	// register input handlers
 	{
 		// This stack is constructed so the first added, will be the last
 		//  one called. This is important, because each of the handlers
 		//  has the potential to block events to go further down
 		//  in the chain. I.e. the last one in the list added, is the
 		//  only handler that can block all messages before they are
 		//  processed.
 		in_add_handler(game_view_handler);
 
 		in_add_handler(interactInputHandler);
 
 		in_add_handler(conInputHandler);
 
 		in_add_handler(hotkeyInputHandler); // <- Leave this one until after all the others.
 
 		// I don't know how much this screws up, but the gui_handler needs
 		//  to be after the hotkey, so that input boxes can be typed in
 		//  without setting off hotkeys.
 #ifndef NO_GUI
 		in_add_handler(gui_handler);
 #endif
 
 		in_add_handler(handler); // must be after gui_handler. Should mayhap even be last.
 	}
 
 #ifndef NO_GUI
 	g_GUI.SendEventToAll("load");
 #endif
 
 	if (setup_gfx)
 	{
 		MICROLOG(L"render blank");
 		// render everything to a blank frame to force renderer to load everything
 		RenderNoCull();
 	}
 
 	if (g_FixedFrameTiming) {
 		CCamera &g_Camera=*g_Game->GetView()->GetCamera();
 #if 0		// TOPDOWN
 		g_Camera.SetProjection(1.0f,10000.0f,DEGTORAD(90));
 		g_Camera.m_Orientation.SetIdentity();
 		g_Camera.m_Orientation.RotateX(DEGTORAD(90));
 		g_Camera.m_Orientation.Translate(CELL_SIZE*250*0.5, 250, CELL_SIZE*250*0.5);
 #else		// std view
 		g_Camera.SetProjection(1.0f,10000.0f,DEGTORAD(20));
 		g_Camera.m_Orientation.SetXRotation(DEGTORAD(30));
 		g_Camera.m_Orientation.RotateY(DEGTORAD(-45));
 		g_Camera.m_Orientation.Translate(350, 350, -275);
 #endif
 		g_Camera.UpdateFrustum();
 	}
 
 	g_Console->RegisterFunc(Testing, L"Testing");
 
-#ifdef _MSC_VER
-{
-u64 CURTSC=rdtsc();
 debug_out(
 "----------------------------------------\n"\
 "READY (elapsed = %f ms)\n"\
-"----------------------------------------\n", (CURTSC-PREVTSC)/2e9*1e3);
-PREVTSC=CURTSC;
-}
-#endif
+"----------------------------------------\n"
+);
 
 
 
 
 }
 
 static void Frame()
 {
 	MICROLOG(L"In frame");
 
 	MusicPlayer.update();
 
 	static double last_time;
 	const double time = get_time();
 	const float TimeSinceLastFrame = (float)(time-last_time);
 	last_time = time;
 	ONCE(return);
 			// first call: set last_time and return
 	assert(TimeSinceLastFrame >= 0.0f);
 
 	MICROLOG(L"reload files");
 	res_reload_changed_files();
 
 	ProgressiveLoad();
 
 	MICROLOG(L"input");
 	in_get_events();
 	g_SessionManager.Poll();
 	
 #ifndef NO_GUI
 	g_GUI.TickObjects();
 #endif
 	
 	if (g_Game && g_Game->IsGameStarted())
 	{
 		g_Game->Update(TimeSinceLastFrame);
 
 		if (!g_FixedFrameTiming)
 			g_Game->GetView()->Update(float(TimeSinceLastFrame));
 
 		// TODO Where does GameView end and other things begin?
 		g_Mouseover.update( TimeSinceLastFrame );
 		g_Selection.update();
 
 
 		CCamera* camera = g_Game->GetView()->GetCamera();
 		CMatrix3D& orientation = camera->m_Orientation;
 
 		float* pos = &orientation._data[12];
 		float* dir = &orientation._data[8];
 		float* up  = &orientation._data[4];
 		if(snd_update(pos, dir, up) < 0)
 			debug_out("snd_update failed\n");
 	}
 	else
 	{
 		// CSimulation would do this with the proper turn length if we were in
 		// a game. This is basically just to keep script timers running.
 		g_Scheduler.update((uint)(TimeSinceLastFrame*1000));
 		if(snd_update(0, 0, 0) < 0)
 			debug_out("snd_update (pos=0 version) failed\n");
 	}
 
 	g_Console->Update(TimeSinceLastFrame);
 
 	// ugly, but necessary. these are one-shot events, have to be reset.
 
 	// Spoof mousebuttonup events for the hotkey system
 	SDL_Event spoof;
 	spoof.type = SDL_MOUSEBUTTONUP;
 	spoof.button.button = SDL_BUTTON_WHEELUP;
 	if( mouseButtons[SDL_BUTTON_WHEELUP] )
 		hotkeyInputHandler( &spoof );
 	spoof.button.button = SDL_BUTTON_WHEELDOWN;
 	if( mouseButtons[SDL_BUTTON_WHEELDOWN] )
 		hotkeyInputHandler( &spoof );
 
 	mouseButtons[SDL_BUTTON_WHEELUP] = false;
 	mouseButtons[SDL_BUTTON_WHEELDOWN] = false;
 
 	if(g_active)
 	{
 		MICROLOG(L"render");
 		Render();
 		MICROLOG(L"finished render");
 		SDL_GL_SwapBuffers();
 	}
 	// inactive; relinquish CPU for a little while
 	// don't use SDL_WaitEvent: don't want the main loop to freeze until app focus is restored
 	else
 		SDL_Delay(10);
 
 	calc_fps();
 	if (g_FixedFrameTiming && frameCount==100) quit=true;
 }
 
 
 
 #ifndef SCED
 
 int main(int argc, char* argv[])
 {
 	MICROLOG(L"In main");
 
 	MICROLOG(L"Init");
 	Init(argc, argv, true);
 
 	// Do some limited tests to ensure things aren't broken
 #ifndef NDEBUG
 	{
 	extern void PerformTests();
 	PerformTests();
 	}
 #endif
 
 	while(!quit)
 	{
 		MICROLOG(L"(Simulation) Frame");
 		Frame();
 	}
 
 	MICROLOG(L"Shutdown");
 	Shutdown();
 
 	exit(0);
 }
 
 #else // SCED:
 
 void ScEd_Init()
 {
 	g_Quickstart = true;
 
 	Init(0, NULL, false);
 }
 
 void ScEd_Shutdown()
 {
 	Shutdown();
 }
 
 #endif // SCED
Index: ps/trunk/source/renderer/Renderer.cpp
===================================================================
--- ps/trunk/source/renderer/Renderer.cpp	(revision 2037)
+++ ps/trunk/source/renderer/Renderer.cpp	(revision 2038)
@@ -1,1265 +1,1261 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Name:		Renderer.cpp
 // Author:		Rich Cross
 // Contact:		rich@wildfiregames.com
 //
 // Description: OpenGL renderer class; a higher level interface
 //	on top of OpenGL to handle rendering the basic visual games
 //	types - terrain, models, sprites, particles etc
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 
 #include "precompiled.h"
 
 #include <map>
 #include <set>
 #include <algorithm>
 #include "Renderer.h"
 #include "TransparencyRenderer.h"
 #include "PlayerRenderer.h"
 #include "Terrain.h"
 #include "Matrix3D.h"
 #include "Camera.h"
 #include "PatchRData.h"
 #include "Texture.h"
 #include "LightEnv.h"
 #include "CLogger.h"
 #include "ps/Game.h"
 
 #include "Model.h"
 #include "ModelDef.h"
 
 #include "ogl.h"
 #include "res/mem.h"
 #include "res/ogl_tex.h"
 #include "timer.h"
 
 #define LOG_CATEGORY "graphics"
 
 struct TGAHeader {
 	// header stuff
 	unsigned char  iif_size;
 	unsigned char  cmap_type;
 	unsigned char  image_type;
 	unsigned char  pad[5];
 
 	// origin : unused
 	unsigned short d_x_origin;
 	unsigned short d_y_origin;
 
 	// dimensions
 	unsigned short width;
 	unsigned short height;
 
 	// bits per pixel : 16, 24 or 32
 	unsigned char  bpp;
 
 	// image descriptor : Bits 3-0: size of alpha channel
 	//					  Bit 4: must be 0 (reserved)
 	//					  Bit 5: should be 0 (origin)
 	//					  Bits 6-7: should be 0 (interleaving)
 	unsigned char image_descriptor;
 };
 
 static bool saveTGA(const char* filename,int width,int height,int bpp,unsigned char* data)
 {
 	FILE* fp=fopen(filename,"wb");
 	if (!fp) return false;
 
 	// fill file header
 	TGAHeader header;
 	header.iif_size=0;
 	header.cmap_type=0;
 	header.image_type=2;
 	memset(header.pad,0,sizeof(header.pad));
 	header.d_x_origin=0;
 	header.d_y_origin=0;
 	header.width=(unsigned short)width;
 	header.height=(unsigned short)height;
 	header.bpp=(unsigned char)bpp;
 	header.image_descriptor=(bpp==32) ? 8 : 0;
 
 	if (fwrite(&header,sizeof(TGAHeader),1,fp)!=1) {
 		fclose(fp);
 		return false;
 	}
 
 	// write data
 	if (fwrite(data,width*height*bpp/8,1,fp)!=1) {
 		fclose(fp);
 		return false;
 	}
 
 	// return success ..
 	fclose(fp);
 	return true;
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////////
 // CRenderer destructor
 CRenderer::CRenderer()
 {
 	m_Width=0;
 	m_Height=0;
 	m_Depth=0;
 	m_FrameCounter=0;
 	m_TerrainRenderMode=SOLID;
 	m_ModelRenderMode=SOLID;
 	m_ClearColor[0]=m_ClearColor[1]=m_ClearColor[2]=m_ClearColor[3]=0;
 	m_ShadowMap=0;
 
 	m_Options.m_NoVBO=false;
 	m_Options.m_Shadows=true;
 	m_Options.m_ShadowColor=RGBAColor(0.4f,0.4f,0.4f,1.0f);
 
 	for (uint i=0;i<MaxTextureUnits;i++) {
 		m_ActiveTextures[i]=0;
 	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////////
 // CRenderer destructor
 CRenderer::~CRenderer()
 {
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////////
 // EnumCaps: build card cap bits
 void CRenderer::EnumCaps()
 {
 	// assume support for nothing
 	m_Caps.m_VBO=false;
 	m_Caps.m_TextureBorderClamp=false;
 	m_Caps.m_GenerateMipmaps=false;
 
 	// now start querying extensions
 	if (!m_Options.m_NoVBO) {
 		if (oglHaveExtension("GL_ARB_vertex_buffer_object")) {
 			m_Caps.m_VBO=true;
 		}
 	}
 	if (oglHaveExtension("GL_ARB_texture_border_clamp")) {
 		m_Caps.m_TextureBorderClamp=true;
 	}
 	if (oglHaveExtension("GL_SGIS_generate_mipmap")) {
 		m_Caps.m_GenerateMipmaps=true;
 	}
 }
 
 bool CRenderer::Open(int width, int height, int depth)
 {
 	m_Width = width;
 	m_Height = height;
 	m_Depth = depth;
 
 	// set packing parameters
 	glPixelStorei(GL_PACK_ALIGNMENT,1);
 	glPixelStorei(GL_UNPACK_ALIGNMENT,1);
 
 	// setup default state
 	glDepthFunc(GL_LEQUAL);
 	glEnable(GL_DEPTH_TEST);
 	glCullFace(GL_BACK);
 	glFrontFace(GL_CCW);
 	glEnable(GL_CULL_FACE);
 
 	// query card capabilities
 	EnumCaps();
 
 	GLint bits;
 	glGetIntegerv(GL_DEPTH_BITS,&bits);
 	LOG(NORMAL, LOG_CATEGORY, "CRenderer::Open: depth bits %d",bits);
 	glGetIntegerv(GL_STENCIL_BITS,&bits);
 	LOG(NORMAL, LOG_CATEGORY, "CRenderer::Open: stencil bits %d",bits);
 	glGetIntegerv(GL_ALPHA_BITS,&bits);
 	LOG(NORMAL, LOG_CATEGORY, "CRenderer::Open: alpha bits %d",bits);
 
 	return true;
 }
 
 void CRenderer::Close()
 {
 }
 
 // resize renderer view
 void CRenderer::Resize(int width,int height)
 {
 	if (m_ShadowMap && (width>m_Width || height>m_Height)) {
 		glDeleteTextures(1,(GLuint*) &m_ShadowMap);
 		m_ShadowMap=0;
 	}
 	m_Width=width;
 	m_Height=height;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // SetOptionBool: set boolean renderer option
 void CRenderer::SetOptionBool(enum Option opt,bool value)
 {
 	switch (opt) {
 		case OPT_NOVBO:
 			m_Options.m_NoVBO=value;
 			break;
 		case OPT_SHADOWS:
 			m_Options.m_Shadows=value;
 			break;
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // GetOptionBool: get boolean renderer option
 bool CRenderer::GetOptionBool(enum Option opt) const
 {
 	switch (opt) {
 		case OPT_NOVBO:
 			return m_Options.m_NoVBO;
 		case OPT_SHADOWS:
 			return m_Options.m_Shadows;
 	}
 
 	return false;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // SetOptionColor: set color renderer option
 void CRenderer::SetOptionColor(enum Option opt,const RGBAColor& value)
 {
 	switch (opt) {
 		case OPT_SHADOWCOLOR:
 			m_Options.m_ShadowColor=value;
 			break;
 	}
 }
 
 void CRenderer::SetOptionFloat(enum Option opt, float val)
 {
 	switch(opt)
 	{
 	case OPT_LODBIAS:
 		m_Options.m_LodBias = val;
 		break;
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // GetOptionColor: get color renderer option
 const RGBAColor& CRenderer::GetOptionColor(enum Option opt) const
 {
 	static const RGBAColor defaultColor(1.0f,1.0f,1.0f,1.0f);
 
 	switch (opt) {
 		case OPT_SHADOWCOLOR:
 			return m_Options.m_ShadowColor;
 	}
 
 	return defaultColor;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // BeginFrame: signal frame start
 void CRenderer::BeginFrame()
 {
 #ifndef SCED
 	if(!g_Game || !g_Game->IsGameStarted())
 		return;
 #endif
 
 	// bump frame counter
 	m_FrameCounter++;
 
 	// zero out all the per-frame stats
 	m_Stats.Reset();
 
 	// calculate coefficients for terrain and unit lighting
 	m_SHCoeffsUnits.Clear();
 	m_SHCoeffsTerrain.Clear();
 
 	if (m_LightEnv) {
 		m_SHCoeffsUnits.AddDirectionalLight(m_LightEnv->m_SunDir, m_LightEnv->m_SunColor);
 		m_SHCoeffsTerrain.AddDirectionalLight(m_LightEnv->m_SunDir, m_LightEnv->m_SunColor);
 
 		m_SHCoeffsUnits.AddAmbientLight(m_LightEnv->m_UnitsAmbientColor);
 		m_SHCoeffsTerrain.AddAmbientLight(m_LightEnv->m_TerrainAmbientColor);
 	}
 
 	// init per frame stuff
 	m_ShadowRendered=false;
 	m_ShadowBound.SetEmpty();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // SetClearColor: set color used to clear screen in BeginFrame()
 void CRenderer::SetClearColor(u32 color)
 {
 	m_ClearColor[0]=float(color & 0xff)/255.0f;
 	m_ClearColor[1]=float((color>>8) & 0xff)/255.0f;
 	m_ClearColor[2]=float((color>>16) & 0xff)/255.0f;
 	m_ClearColor[3]=float((color>>24) & 0xff)/255.0f;
 }
 
 static int RoundUpToPowerOf2(int x)
 {
 	if ((x & (x-1))==0) return x;
 	int d=x;
 	while (d & (d-1)) {
 		d&=(d-1);
 	}
 	return d<<1;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // BuildTransformation: build transformation matrix from a position and standard basis vectors
 void CRenderer::BuildTransformation(const CVector3D& pos,const CVector3D& right,const CVector3D& up,
 						 const CVector3D& dir,CMatrix3D& result)
 {
 	// build basis
 	result._11=right.X;
 	result._12=right.Y;
 	result._13=right.Z;
 	result._14=0;
 
 	result._21=up.X;
 	result._22=up.Y;
 	result._23=up.Z;
 	result._24=0;
 
 	result._31=dir.X;
 	result._32=dir.Y;
 	result._33=dir.Z;
 	result._34=0;
 
 	result._41=0;
 	result._42=0;
 	result._43=0;
 	result._44=1;
 
 	CMatrix3D trans;
 	trans.SetTranslation(-pos.X,-pos.Y,-pos.Z);
 	result=result*trans;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ConstructLightTransform: build transformation matrix for light at given position casting in
 // given direction
 void CRenderer::ConstructLightTransform(const CVector3D& pos,const CVector3D& dir,CMatrix3D& result)
 {
 	CVector3D right,up;
 
 	CVector3D viewdir=m_Camera.m_Orientation.GetIn();
 	if (fabs(dir.Y)>0.01f) {
 		up=CVector3D(viewdir.X,(-dir.Z*viewdir.Z-dir.X*dir.X)/dir.Y,viewdir.Z);
 	} else {
 		up=CVector3D(0,0,1);
 	}
 
 	up.Normalize();
 	right=dir.Cross(up);
 	right.Normalize();
 	BuildTransformation(pos,right,up,dir,result);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // CalcShadowMatrices: calculate required matrices for shadow map generation - the light's
 // projection and transformation matrices
 void CRenderer::CalcShadowMatrices()
 {
 	int i;
 
 	// get bounds of shadow casting objects
 	const CBound& bounds=m_ShadowBound;
 
 	// get centre of bounds
 	CVector3D centre;
 	bounds.GetCentre(centre);
 
 	// get sunlight direction
 	// ??? RC more optimal light placement?
 	CVector3D lightpos=centre-(m_LightEnv->m_SunDir * 1000);
 
 	// make light transformation matrix
 	ConstructLightTransform(lightpos,m_LightEnv->m_SunDir,m_LightTransform);
 
 	// transform shadow bounds to light space, calculate near and far bounds
 	CVector3D vp[8];
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[0].Y,bounds[0].Z),vp[0]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[0].Y,bounds[0].Z),vp[1]);
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[1].Y,bounds[0].Z),vp[2]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[1].Y,bounds[0].Z),vp[3]);
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[0].Y,bounds[1].Z),vp[4]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[0].Y,bounds[1].Z),vp[5]);
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[1].Y,bounds[1].Z),vp[6]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[1].Y,bounds[1].Z),vp[7]);
 
 	float left=vp[0].X;
 	float right=vp[0].X;
 	float top=vp[0].Y;
 	float bottom=vp[0].Y;
 	float znear=vp[0].Z;
 	float zfar=vp[0].Z;
 
 	for (i=1;i<8;i++) {
 		if (vp[i].X<left) left=vp[i].X;
 		else if (vp[i].X>right) right=vp[i].X;
 
 		if (vp[i].Y<bottom) bottom=vp[i].Y;
 		else if (vp[i].Y>top) top=vp[i].Y;
 
 		if (vp[i].Z<znear) znear=vp[i].Z;
 		else if (vp[i].Z>zfar) zfar=vp[i].Z;
 	}
 
 	// shift near and far clip planes slightly to avoid artifacts with points
 	// exactly on the clip planes
 	znear=(znear<m_Camera.GetNearPlane()+0.01f) ? m_Camera.GetNearPlane() : znear-0.01f;
 	zfar+=0.01f;
 
 	m_LightProjection.SetZero();
 	m_LightProjection._11=2/(right-left);
 	m_LightProjection._22=2/(top-bottom);
 	m_LightProjection._33=2/(zfar-znear);
 	m_LightProjection._14=-(right+left)/(right-left);
 	m_LightProjection._24=-(top+bottom)/(top-bottom);
 	m_LightProjection._34=-(zfar+znear)/(zfar-znear);
 	m_LightProjection._44=1;
 
 #if 0
 
 #if 0
 	// TODO, RC - trim against frustum?
 	// get points of view frustum in world space
 	CVector3D frustumPts[8];
 	m_Camera.GetFrustumPoints(frustumPts);
 
 	// transform to light space
 	for (i=0;i<8;i++) {
 		m_LightTransform.Transform(frustumPts[i],vp[i]);
 	}
 
 	float left1=vp[0].X;
 	float right1=vp[0].X;
 	float top1=vp[0].Y;
 	float bottom1=vp[0].Y;
 	float znear1=vp[0].Z;
 	float zfar1=vp[0].Z;
 
 	for (int i=1;i<8;i++) {
 		if (vp[i].X<left1) left1=vp[i].X;
 		else if (vp[i].X>right1) right1=vp[i].X;
 
 		if (vp[i].Y<bottom1) bottom1=vp[i].Y;
 		else if (vp[i].Y>top1) top1=vp[i].Y;
 
 		if (vp[i].Z<znear1) znear1=vp[i].Z;
 		else if (vp[i].Z>zfar1) zfar1=vp[i].Z;
 	}
 
 	left=max(left,left1);
 	right=min(right,right1);
 	top=min(top,top1);
 	bottom=max(bottom,bottom1);
 	znear=max(znear,znear1);
 	zfar=min(zfar,zfar1);
 #endif
 
 	// experimental stuff, do not use ..
 	// TODO, RC - desperately need to improve resolution here if we're using shadow maps; investigate
 	// feasibility of PSMs
 
 	// transform light space bounds to image space - TODO, RC: safe to just use 3d transform here?
 	CVector4D vph[8];
 	for (i=0;i<8;i++) {
 		CVector4D tmp(vp[i].X,vp[i].Y,vp[i].Z,1.0f);
 		m_LightProjection.Transform(tmp,vph[i]);
 		vph[i][0]/=vph[i][2];
 		vph[i][1]/=vph[i][2];
 	}
 
 	// find the two points furthest apart
 	int p0,p1;
 	float maxdistsqrd=-1;
 	for (i=0;i<8;i++) {
 		for (int j=i+1;j<8;j++) {
 			float dx=vph[i][0]-vph[j][0];
 			float dy=vph[i][1]-vph[j][1];
 			float distsqrd=dx*dx+dy*dy;
 			if (distsqrd>maxdistsqrd) {
 				p0=i;
 				p1=j;
 				maxdistsqrd=distsqrd;
 			}
 		}
 	}
 
 	// now we want to rotate the camera such that the longest axis lies the diagonal at 45 degrees -
 	// get angle between points
 	float angle=atan2(vph[p0][1]-vph[p1][1],vph[p0][0]-vph[p1][0]);
 	float rotation=-angle;
 
 	// build rotation matrix
 	CQuaternion quat;
 	quat.FromAxisAngle(lightdir,rotation);
 	CMatrix3D m;
 	quat.ToMatrix(m);
 
 	// rotate up vector by given rotation
 	CVector3D up(m_LightTransform._21,m_LightTransform._22,m_LightTransform._23);
 	up=m.Rotate(up);
 	up.Normalize();		// TODO, RC - required??
 
 	// rebuild right vector
 	CVector3D rightvec;
 	rightvec=lightdir.Cross(up);
 	rightvec.Normalize();
 	BuildTransformation(lightpos,rightvec,up,lightdir,m_LightTransform);
 
 	// retransform points
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[0].Y,bounds[0].Z),vp[0]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[0].Y,bounds[0].Z),vp[1]);
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[1].Y,bounds[0].Z),vp[2]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[1].Y,bounds[0].Z),vp[3]);
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[0].Y,bounds[1].Z),vp[4]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[0].Y,bounds[1].Z),vp[5]);
 	m_LightTransform.Transform(CVector3D(bounds[0].X,bounds[1].Y,bounds[1].Z),vp[6]);
 	m_LightTransform.Transform(CVector3D(bounds[1].X,bounds[1].Y,bounds[1].Z),vp[7]);
 
 	// recalculate projection
 	left=vp[0].X;
 	right=vp[0].X;
 	top=vp[0].Y;
 	bottom=vp[0].Y;
 	znear=vp[0].Z;
 	zfar=vp[0].Z;
 
 	for (i=1;i<8;i++) {
 		if (vp[i].X<left) left=vp[i].X;
 		else if (vp[i].X>right) right=vp[i].X;
 
 		if (vp[i].Y<bottom) bottom=vp[i].Y;
 		else if (vp[i].Y>top) top=vp[i].Y;
 
 		if (vp[i].Z<znear) znear=vp[i].Z;
 		else if (vp[i].Z>zfar) zfar=vp[i].Z;
 	}
 
 	// shift near and far clip planes slightly to avoid artifacts with points
 	// exactly on the clip planes
 	znear-=0.01f;
 	zfar+=0.01f;
 
 	m_LightProjection.SetZero();
 	m_LightProjection._11=2/(right-left);
 	m_LightProjection._22=2/(top-bottom);
 	m_LightProjection._33=2/(zfar-znear);
 	m_LightProjection._14=-(right+left)/(right-left);
 	m_LightProjection._24=-(top+bottom)/(top-bottom);
 	m_LightProjection._34=-(zfar+znear)/(zfar-znear);
 	m_LightProjection._44=1;
 #endif
 }
 
 void CRenderer::CreateShadowMap()
 {
 	// get shadow map size as next power of two up from view width and height
 	m_ShadowMapWidth=m_Width;
 	m_ShadowMapWidth=RoundUpToPowerOf2(m_ShadowMapWidth);
 	m_ShadowMapHeight=m_Height;
 	m_ShadowMapHeight=RoundUpToPowerOf2(m_ShadowMapHeight);
 
 	// create texture object - initially filled with white, so clamp to edge clamps to correct color
 	glGenTextures(1,(GLuint*) &m_ShadowMap);
 	BindTexture(0,(GLuint) m_ShadowMap);
 
 	u32 size=m_ShadowMapWidth*m_ShadowMapHeight;
 	u32* buf=new u32[size];
 	for (uint i=0;i<size;i++) buf[i]=0x00ffffff;
 	glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA8,m_ShadowMapWidth,m_ShadowMapHeight,0,GL_RGBA,GL_UNSIGNED_BYTE,buf);
 	delete[] buf;
 
 	// set texture parameters
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
 }
 
 void CRenderer::RenderShadowMap()
 {
 	// create shadow map if we haven't already got one
 	if (!m_ShadowMap) CreateShadowMap();
 
 	// clear buffers
 	glClearColor(1,1,1,0);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
 	// build required matrices
 	CalcShadowMatrices();
 
 	// setup viewport
 	glViewport(0,0,m_Width,m_Height);
 
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glLoadMatrixf(&m_LightProjection._11);
 
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glLoadMatrixf(&m_LightTransform._11);
 
 #if 0
 	// debug aid - render actual bounds of shadow casting objects; helps see where
 	// the lights projection/transform can be optimised
 	glColor3f(1.0,0.0,0.0);
 	const CBound& bounds=m_ShadowBound;
 
 	glBegin(GL_LINE_LOOP);
 	glVertex3f(bounds[0].X,bounds[0].Y,bounds[0].Z);
 	glVertex3f(bounds[0].X,bounds[0].Y,bounds[1].Z);
 	glVertex3f(bounds[0].X,bounds[1].Y,bounds[1].Z);
 	glVertex3f(bounds[0].X,bounds[1].Y,bounds[0].Z);
 	glEnd();
 
 	glBegin(GL_LINE_LOOP);
 	glVertex3f(bounds[1].X,bounds[0].Y,bounds[0].Z);
 	glVertex3f(bounds[1].X,bounds[0].Y,bounds[1].Z);
 	glVertex3f(bounds[1].X,bounds[1].Y,bounds[1].Z);
 	glVertex3f(bounds[1].X,bounds[1].Y,bounds[0].Z);
 	glEnd();
 
 	glBegin(GL_LINE_LOOP);
 	glVertex3f(bounds[0].X,bounds[0].Y,bounds[0].Z);
 	glVertex3f(bounds[0].X,bounds[0].Y,bounds[1].Z);
 	glVertex3f(bounds[1].X,bounds[0].Y,bounds[1].Z);
 	glVertex3f(bounds[1].X,bounds[0].Y,bounds[0].Z);
 	glEnd();
 
 	glBegin(GL_LINE_LOOP);
 	glVertex3f(bounds[0].X,bounds[1].Y,bounds[0].Z);
 	glVertex3f(bounds[0].X,bounds[1].Y,bounds[1].Z);
 	glVertex3f(bounds[1].X,bounds[1].Y,bounds[1].Z);
 	glVertex3f(bounds[1].X,bounds[1].Y,bounds[0].Z);
 	glEnd();
 #endif // 0
 
 	// setup client states
 	glEnableClientState(GL_VERTEX_ARRAY);
 
 	glEnable(GL_SCISSOR_TEST);
 	glScissor(1,1,m_Width-2,m_Height-2);
 
 	glActiveTexture(GL_TEXTURE0);
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
 	glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_REPLACE);
 	glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_PRIMARY_COLOR_ARB);
 	glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB, GL_SRC_COLOR);
 	glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
 	glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_PRIMARY_COLOR_ARB);
 	glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB, GL_SRC_ALPHA);
 	
 	// Set the proper LOD bias
 	glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, m_Options.m_LodBias);
 
 	glColor4fv(m_Options.m_ShadowColor);
 
 	glDisable(GL_CULL_FACE);
 
 	// render models
 	CModelRData::RenderModels(STREAM_POS,MODELFLAG_CASTSHADOWS);
 
 	// call on the player renderer to render all of the player shadows.
 	g_PlayerRenderer.RenderShadows();
 
 	// call on the transparency renderer to render all the transparent stuff
 	g_TransparencyRenderer.RenderShadows();
 
 	glEnable(GL_CULL_FACE);
 
 	glColor3f(1.0f,1.0f,1.0f);
 
 	glDisable(GL_SCISSOR_TEST);
 	glDisableClientState(GL_VERTEX_ARRAY);
 
 	// copy result into shadow map texture
 	BindTexture(0,m_ShadowMap);
 	glCopyTexSubImage2D(GL_TEXTURE_2D,0,0,0,0,0,m_Width,m_Height);
 
 	// restore matrix stack
 	glPopMatrix();
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
 	glMatrixMode(GL_MODELVIEW);
 
 #if 0
 	// debug aid - dump generated shadow map to file; helps verify shadow map
 	// space being well used (not that it is at the minute .. (TODO, RC))
 	unsigned char* data=new unsigned char[m_ShadowMapWidth*m_ShadowMapHeight*3];
 	glGetTexImage(GL_TEXTURE_2D,0,GL_BGR_EXT,GL_UNSIGNED_BYTE,data);
 	saveTGA("d:\\test4.tga",m_ShadowMapWidth,m_ShadowMapHeight,24,data);
 	delete[] data;
 #endif // 0
 #if 0
 	unsigned char* data=new unsigned char[m_Width*m_Height*4];
 	glReadBuffer(GL_BACK);
 	glReadPixels(0,0,m_Width,m_Height,GL_BGRA_EXT,GL_UNSIGNED_BYTE,data);
 	saveTGA("d:\\test3.tga",m_Width,m_Height,32,data);
 	delete[] data;
 #endif // 0
 }
 
 void CRenderer::ApplyShadowMap()
 {
 	CMatrix3D tmp2;
 	CMatrix3D texturematrix;
 
 	float dx=0.5f*float(m_Width)/float(m_ShadowMapWidth);
 	float dy=0.5f*float(m_Height)/float(m_ShadowMapHeight);
 	texturematrix.SetTranslation(dx,dy,0);				// transform (-0.5, 0.5) to (0,1) - texture space
 	tmp2.SetScaling(dx,dy,0);						// scale (-1,1) to (-0.5,0.5)
 	texturematrix=texturematrix*tmp2;
 
 	texturematrix=texturematrix*m_LightProjection;						// transform light -> projected light space (-1 to 1)
 	texturematrix=texturematrix*m_LightTransform;						// transform world -> light space
 
 	glMatrixMode(GL_TEXTURE);
 	glLoadMatrixf(&texturematrix._11);
 	glMatrixMode(GL_MODELVIEW);
 
 	CPatchRData::ApplyShadowMap(m_ShadowMap);
 
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);
 }
 
 void CRenderer::RenderPatches()
 {
 	// switch on wireframe if we need it
 	if (m_TerrainRenderMode==WIREFRAME) {
 		MICROLOG(L"wireframe on");
 		glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 	}
 
 	// render all the patches, including blend pass
 	MICROLOG(L"render patch submissions");
 	RenderPatchSubmissions();
 
 	if (m_TerrainRenderMode==WIREFRAME) {
 		// switch wireframe off again
 		MICROLOG(L"wireframe off");
 		glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
 	} else if (m_TerrainRenderMode==EDGED_FACES) {
 		// edged faces: need to make a second pass over the data:
 		// first switch on wireframe
 		glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 
 		// setup some renderstate ..
 		glDepthMask(0);
 		SetTexture(0,0);
 		glColor4f(1,1,1,0.35f);
 		glLineWidth(2.0f);
 
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 
 		// .. and some client states
 		glEnableClientState(GL_VERTEX_ARRAY);
 		CPatchRData::RenderStreamsAll(STREAM_POS);
 
 		// set color for outline
 		glColor3f(0,0,1);
 		glLineWidth(4.0f);
 
 		// render outline of each patch
 		CPatchRData::RenderOutlines();
 
 		// .. and switch off the client states
 		glDisableClientState(GL_VERTEX_ARRAY);
 
 		// .. and restore the renderstates
 		glDisable(GL_BLEND);
 		glDepthMask(1);
 
 		// restore fill mode, and we're done
 		glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
 	}
 }
 
 
 void CRenderer::RenderModelSubmissions()
 {
 	// set up texture environment for base pass - modulate texture and primary color
 	glActiveTexture(GL_TEXTURE0);
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
 	glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
 	glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
 	glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB, GL_SRC_COLOR);
 	glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PRIMARY_COLOR);
 	glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_ARB, GL_SRC_COLOR);
 
 	// Set the proper LOD bias
 	glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, m_Options.m_LodBias);
 
 	// pass one through as alpha; transparent textures handled specially by CTransparencyRenderer
 	// (gl_constant means the colour comes from the gl_texture_env_color)
 	glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
 	glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_CONSTANT);
 	glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB, GL_SRC_ALPHA);
 
 	float color[] = { 1.0, 1.0, 1.0, 1.0 };
 	glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);
 
 	// setup client states
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	glEnableClientState(GL_COLOR_ARRAY);
 
 	// render models
 	CModelRData::RenderModels(STREAM_POS|STREAM_COLOR|STREAM_UV0);
 
 	// switch off client states
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	glDisableClientState(GL_VERTEX_ARRAY);
 	glDisableClientState(GL_COLOR_ARRAY);
 }
 
 void CRenderer::RenderModels()
 {
 	// switch on wireframe if we need it
 	if (m_ModelRenderMode==WIREFRAME) {
 		glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 	}
 
 	// render all the models
 	RenderModelSubmissions();
 
 	if (m_ModelRenderMode==WIREFRAME) {
 		// switch wireframe off again
 		glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
 	} else if (m_ModelRenderMode==EDGED_FACES) {
 		// edged faces: need to make a second pass over the data:
 		// first switch on wireframe
 		glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 
 		// setup some renderstate ..
 		glDepthMask(0);
 		SetTexture(0,0);
 		glColor4f(1,1,1,0.75f);
 		glLineWidth(1.0f);
 
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 
 		// .. and some client states
 		glEnableClientState(GL_VERTEX_ARRAY);
 
 		// render each model
 		CModelRData::RenderModels(STREAM_POS);
 
 		// .. and switch off the client states
 		glDisableClientState(GL_VERTEX_ARRAY);
 
 		// .. and restore the renderstates
 		glDisable(GL_BLEND);
 		glDepthMask(1);
 
 		// restore fill mode, and we're done
 		glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
 	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // SortModelsByTexture: sorting class used for batching models with identical textures
 struct SortModelsByTexture {
 	typedef CModel* SortObj;
 
 	bool operator()(const SortObj& lhs,const SortObj& rhs) {
 		return lhs->GetTexture()<rhs->GetTexture() ? true : false;
 	}
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // FlushFrame: force rendering of any batched objects
 void CRenderer::FlushFrame()
 {
 #ifndef SCED
 	if(!g_Game || !g_Game->IsGameStarted())
 		return;
 #endif
 
 	oglCheck();
 
 	// sort all the transparent stuff
 	MICROLOG(L"sorting");
 	g_TransparencyRenderer.Sort();
 
 	if (!m_ShadowRendered) {
 		if (m_Options.m_Shadows) {
 			MICROLOG(L"render shadows");
 			RenderShadowMap();
 		}
 		// clear buffers
 		MICROLOG(L"clear buffer");
 		glClearColor(m_ClearColor[0],m_ClearColor[1],m_ClearColor[2],m_ClearColor[3]);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 	}
 
 	oglCheck();
 
 	// render submitted patches and models
 	MICROLOG(L"render patches");
 	RenderPatches();
 	oglCheck();
 
 	MICROLOG(L"render models");
 	RenderModels();
 	oglCheck();
 
 	if (m_Options.m_Shadows && !m_ShadowRendered) {
 		MICROLOG(L"apply shadows");
 		ApplyShadowMap();
 		oglCheck();
 	}
 	m_ShadowRendered=true;
 
 	MICROLOG(L"render player models");
 	g_PlayerRenderer.Render();
 	oglCheck();
 
 	// call on the transparency renderer to render all the transparent stuff
 	MICROLOG(L"render transparent");
 	g_TransparencyRenderer.Render();
 	oglCheck();
 
 	// empty lists
 	MICROLOG(L"empty lists");
 	g_TransparencyRenderer.Clear();
 	g_PlayerRenderer.Clear();
 	CPatchRData::ClearSubmissions();
 	CModelRData::ClearSubmissions();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // EndFrame: signal frame end; implicitly flushes batched objects
 void CRenderer::EndFrame()
 {
 #ifndef SCED
 	if(!g_Game || !g_Game->IsGameStarted())
 		return;
 #endif
 
 	FlushFrame();
 	g_Renderer.SetTexture(0,0);
 
 	static bool once=false;
 	if (!once && glGetError()) {
 		LOG(ERROR, LOG_CATEGORY, "CRenderer::EndFrame: GL errors occurred");
 		once=true;
 	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // SetCamera: setup projection and transform of camera and adjust viewport to current view
 void CRenderer::SetCamera(CCamera& camera)
 {
 	CMatrix3D view;
 	camera.m_Orientation.GetInverse(view);
 	const CMatrix3D& proj=camera.GetProjection();
 
 	glMatrixMode(GL_PROJECTION);
 	glLoadMatrixf(&proj._11);
 
 	glMatrixMode(GL_MODELVIEW);
 	glLoadMatrixf(&view._11);
 
 	SetViewport(camera.GetViewPort());
 
 	m_Camera=camera;
 }
 
 void CRenderer::SetViewport(const SViewPort &vp)
 {
 	glViewport(vp.m_X,vp.m_Y,vp.m_Width,vp.m_Height);
 }
 
 void CRenderer::Submit(CPatch* patch)
 {
 	CPatchRData::Submit(patch);
 }
 
 void CRenderer::Submit(CModel* model)
 {
 	if (model->GetFlags() & MODELFLAG_CASTSHADOWS) {
 		m_ShadowBound+=model->GetBounds();
 	}
 
 	CModelRData::Submit(model);
 }
 
 void CRenderer::Submit(CSprite* sprite)
 {
 }
 
 void CRenderer::Submit(CParticleSys* psys)
 {
 }
 
 void CRenderer::Submit(COverlay* overlay)
 {
 }
 
 void CRenderer::RenderPatchSubmissions()
 {
 	// switch on required client states 
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glEnableClientState(GL_COLOR_ARRAY);
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	
 	// render everything 
 	CPatchRData::RenderBaseSplats();
 	CPatchRData::RenderBlendSplats();
 
 	// switch off all client states
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	glDisableClientState(GL_COLOR_ARRAY);
 	glDisableClientState(GL_VERTEX_ARRAY);
 }
 
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // LoadTexture: try and load the given texture; set clamp/repeat flags on texture object if necessary
 bool CRenderer::LoadTexture(CTexture* texture,u32 wrapflags)
 {
 	const Handle errorhandle = -1;
 
 	Handle h=texture->GetHandle();
 	if (h) {
 		// already tried to load this texture, nothing to do here - just return success according
 		// to whether this is a valid handle or not
 		return h==errorhandle ? true : false;
 	} else {
 		h=tex_load(texture->GetName());
 		if (h <= 0) {
 			LOG(ERROR, LOG_CATEGORY, "LoadTexture failed on \"%s\"",(const char*) texture->GetName());
 			texture->SetHandle(errorhandle);
 			return false;
 		} else {
 			int tw,th;
 			tex_info(h, &tw, &th, NULL, NULL, NULL);
 
 			tw&=(tw-1);
 			th&=(th-1);
 			if (tw || th) {
 				LOG(ERROR, LOG_CATEGORY, "LoadTexture failed on \"%s\" : not a power of 2 texture",(const char*) texture->GetName());
 				tex_free(h);
 				texture->SetHandle(errorhandle);
 				return false;
 			} else {
 				BindTexture(0,tex_id(h));
 				tex_upload(h,GL_LINEAR_MIPMAP_LINEAR);
 
 				if (wrapflags) {
 					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapflags);
 					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapflags);
 				} else {
 					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 				}
 				texture->SetHandle(h);
 				return true;
 			}
 		}
 	}
 }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // BindTexture: bind a GL texture object to current active unit
 void CRenderer::BindTexture(int unit,GLuint tex)
 {
 #if 0
 	glActiveTexture(GL_TEXTURE0+unit);
 	if (tex==m_ActiveTextures[unit]) return;
 
 	if (tex) {
 		glBindTexture(GL_TEXTURE_2D,tex);
 		if (!m_ActiveTextures[unit]) {
 			glEnable(GL_TEXTURE_2D);
 		}
 	} else if (m_ActiveTextures[unit]) {
 		glDisable(GL_TEXTURE_2D);
 	}
 	m_ActiveTextures[unit]=tex;
 #endif
 
 	glActiveTexture(GL_TEXTURE0+unit);
 
 	glBindTexture(GL_TEXTURE_2D,tex);
 	if (tex) {
 		glEnable(GL_TEXTURE_2D);
 	} else {
 		glDisable(GL_TEXTURE_2D);
 	}
 	m_ActiveTextures[unit]=tex;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // SetTexture: set the given unit to reference the given texture; pass a null texture to disable texturing on any unit
 void CRenderer::SetTexture(int unit,CTexture* texture)
 {
 	if (texture) {
 		Handle h=texture->GetHandle();
 		BindTexture(unit,tex_id(h));
 	} else {
 		BindTexture(unit,0);
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // IsTextureTransparent: return true if given texture is transparent, else false - note texture must be loaded
 // beforehand
 bool CRenderer::IsTextureTransparent(CTexture* texture)
 {
 	if (!texture) return false;
 
 	Handle h=texture->GetHandle();
 	if (h<=0) return false;
 
 	int fmt;
 	int bpp;
 
 	tex_info(h, NULL, NULL, &fmt, &bpp, NULL);
 	if (bpp==24 || fmt == GL_COMPRESSED_RGB_S3TC_DXT1_EXT) {
 		return false;
 	}
 	return true;
 }
 
 
 
 
 inline void CopyTriple(unsigned char* dst,const unsigned char* src)
 {
 	dst[0]=src[0];
 	dst[1]=src[1];
 	dst[2]=src[2];
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // LoadAlphaMaps: load the 14 default alpha maps, pack them into one composite texture and
 // calculate the coordinate of each alphamap within this packed texture .. need to add
 // validation that all maps are the same size
-bool CRenderer::LoadAlphaMaps()
+void CRenderer::LoadAlphaMaps()
 {
-	TIMER(__CRenderer__LoadAlphaMaps);
-
 	Handle textures[NumAlphaMaps];
 
 
 	const char* fnames[CRenderer::NumAlphaMaps] = {
 		"art/textures/terrain/alphamaps/special/blendcircle.png",
 			"art/textures/terrain/alphamaps/special/blendlshape.png",
 			"art/textures/terrain/alphamaps/special/blendedge.png",
 			"art/textures/terrain/alphamaps/special/blendedgecorner.png",
 			"art/textures/terrain/alphamaps/special/blendedgetwocorners.png",
 			"art/textures/terrain/alphamaps/special/blendfourcorners.png",
 			"art/textures/terrain/alphamaps/special/blendtwooppositecorners.png",
 			"art/textures/terrain/alphamaps/special/blendlshapecorner.png",
 			"art/textures/terrain/alphamaps/special/blendtwocorners.png",
 			"art/textures/terrain/alphamaps/special/blendcorner.png",
 			"art/textures/terrain/alphamaps/special/blendtwoedges.png",
 			"art/textures/terrain/alphamaps/special/blendthreecorners.png",
 			"art/textures/terrain/alphamaps/special/blendushape.png",
 			"art/textures/terrain/alphamaps/special/blendbad.png"
 	};
 
 
 	int i;
 
 	for (i=0;i<NumAlphaMaps;i++) {
 		textures[i]=tex_load(fnames[i]);
 		if (textures[i] <= 0) {
-			return false;
+			throw textures[i];	// FIXTHROW
 		}
 	}
 
 	int base;
 
 	i=tex_info(textures[0], &base, NULL, NULL, NULL, NULL);
 
 	int size=(base+4)*NumAlphaMaps;
 	int texsize=RoundUpToPowerOf2(size);
 
 	unsigned char* data=new unsigned char[texsize*base*3];
 
 	// for each tile on row
 	for (i=0;i<NumAlphaMaps;i++) {
 
 		int bpp;
 		// get src of copy
 		const u8* src;
 
 		tex_info(textures[i], NULL, NULL, NULL, &bpp, (void **)&src);
 
 		int srcstep=bpp/8;
 
 		// get destination of copy
 		u8* dst=data+3*(i*(base+4));
 
 		// for each row of image
 		for (int j=0;j<base;j++) {
 			// duplicate first pixel
 			CopyTriple(dst,src);
 			dst+=3;
 			CopyTriple(dst,src);
 			dst+=3;
 
 			// copy a row
 			for (int k=0;k<base;k++) {
 				CopyTriple(dst,src);
 				dst+=3;
 				src+=srcstep;
 			}
 			// duplicate last pixel
 			CopyTriple(dst,(src-srcstep));
 			dst+=3;
 			CopyTriple(dst,(src-srcstep));
 			dst+=3;
 
 			// advance write pointer for next row
 			dst+=3*(texsize-(base+4));
 		}
 
 		m_AlphaMapCoords[i].u0=float(i*(base+4)+2)/float(texsize);
 		m_AlphaMapCoords[i].u1=float((i+1)*(base+4)-2)/float(texsize);
 		m_AlphaMapCoords[i].v0=0.0f;
 		m_AlphaMapCoords[i].v1=1.0f;
 	}
 
 	for (i=0;i<NumAlphaMaps;i++)
 		tex_free(textures[i]);
 
 	glGenTextures(1,(GLuint*) &m_CompositeAlphaMap);
 	BindTexture(0,m_CompositeAlphaMap);
 	glTexImage2D(GL_TEXTURE_2D,0,GL_INTENSITY,texsize,base,0,GL_RGB,GL_UNSIGNED_BYTE,data);
 
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE);
 
 	delete[] data;
-
-	return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // UnloadAlphaMaps: frees the resources allocates by LoadAlphaMaps
 void CRenderer::UnloadAlphaMaps()
 {
 	glDeleteTextures(1, (GLuint*) &m_CompositeAlphaMap);
 }
Index: ps/trunk/source/renderer/Renderer.h
===================================================================
--- ps/trunk/source/renderer/Renderer.h	(revision 2037)
+++ ps/trunk/source/renderer/Renderer.h	(revision 2038)
@@ -1,314 +1,314 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Name:		Renderer.h
 // Author:		Rich Cross
 // Contact:		rich@wildfiregames.com
 //
 // Description: OpenGL renderer class; a higher level interface
 //	on top of OpenGL to handle rendering the basic visual games 
 //	types - terrain, models, sprites, particles etc
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef RENDERER_H
 #define RENDERER_H
 
 #include <vector>
 #include "ogl.h"
 #include "Camera.h"
 #include "Frustum.h"
 #include "PatchRData.h"
 #include "ModelRData.h"
 #include "SHCoeffs.h"
 #include "Terrain.h"
 #include "Singleton.h"
 
 // necessary declarations
 class CCamera;
 class CPatch;
 class CSprite;
 class CParticleSys;
 class COverlay;
 class CMaterial;
 class CLightEnv;
 class CTexture;
 class CTerrain;
 
 
 // rendering modes
 enum ERenderMode { WIREFRAME, SOLID, EDGED_FACES };
 
 // stream flags
 #define STREAM_POS		0x01
 #define STREAM_NORMAL	0x02
 #define STREAM_COLOR	0x04
 #define STREAM_UV0		0x08
 #define STREAM_UV1		0x10
 #define STREAM_UV2		0x20
 #define STREAM_UV3		0x40
 #define STREAM_POSTOUV0 0x80
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // SVertex3D: simple 3D vertex declaration
 struct SVertex3D
 {
 	float m_Position[3];
 	float m_TexCoords[2];
 	unsigned int m_Color;
 };
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // SVertex2D: simple 2D vertex declaration
 struct SVertex2D
 {
 	float m_Position[2];
 	float m_TexCoords[2];
 	unsigned int m_Color;
 };
 
 // access to sole renderer object
 #define g_Renderer CRenderer::GetSingleton()
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 // CRenderer: base renderer class - primary interface to the rendering engine
 class CRenderer : public Singleton<CRenderer>
 {
 public:
 	// various enumerations and renderer related constants
 	enum { NumAlphaMaps=14 };
 	enum { MaxTextureUnits=16 };
 	enum Option {
 		OPT_NOVBO,
 		OPT_NOPBUFFER,
 		OPT_SHADOWS,
 		OPT_SHADOWCOLOR,
 		OPT_LODBIAS
 	};
 
 	// stats class - per frame counts of number of draw calls, poly counts etc
 	struct Stats {
 		// set all stats to zero
 		void Reset() { memset(this,0,sizeof(*this)); }
 		// add given stats to this stats
 		Stats& operator+=(const Stats& rhs) {
 			m_Counter++;
 			m_DrawCalls+=rhs.m_DrawCalls;
 			m_TerrainTris+=rhs.m_TerrainTris;
 			m_ModelTris+=rhs.m_ModelTris;
 			m_BlendSplats+=rhs.m_BlendSplats;
 			return *this;
 		}
 		// count of the number of stats added together 
 		u32 m_Counter;
 		// number of draw calls per frame - total DrawElements + Begin/End immediate mode loops
 		u32 m_DrawCalls;
 		// number of terrain triangles drawn
 		u32 m_TerrainTris;
 		// number of (non-transparent) model triangles drawn
 		u32 m_ModelTris;
 		// number of splat passes for alphamapping
 		u32 m_BlendSplats;
 	};
 
 public:
 	// constructor, destructor
 	CRenderer();
 	~CRenderer();
 
 	// open up the renderer: performs any necessary initialisation
 	bool Open(int width,int height,int depth);
 	// shutdown the renderer: performs any necessary cleanup
 	void Close();
 
 	// resize renderer view
 	void Resize(int width,int height);
 	
 	// set/get boolean renderer option 
 	void SetOptionBool(enum Option opt,bool value);
 	bool GetOptionBool(enum Option opt) const;
 	// set/get RGBA color renderer option 
 	void SetOptionColor(enum Option opt,const RGBAColor& value);
 	void SetOptionFloat(enum Option opt, float val);
 	const RGBAColor& GetOptionColor(enum Option opt) const;
 
 	// return view width
 	int GetWidth() const { return m_Width; }
 	// return view height
 	int GetHeight() const { return m_Height; }
 	// return view aspect ratio
 	float GetAspect() const { return float(m_Width)/float(m_Height); }
 
 	// signal frame start
 	void BeginFrame();
 	// force rendering of any batched objects
 	void FlushFrame();
 	// signal frame end : implicitly flushes batched objects 
 	void EndFrame();
 
 	// set color used to clear screen in BeginFrame()
 	void SetClearColor(u32 color);
 
 	// return current frame counter
 	int GetFrameCounter() const { return m_FrameCounter; }
 
 	// set camera used for subsequent rendering operations; includes viewport, projection and modelview matrices
 	void SetCamera(CCamera& camera);
 
 	// set the viewport
 	void SetViewport(const SViewPort &);
 
 	// submission of objects for rendering; the passed matrix indicating the transform must be scoped such that it is valid beyond
 	// the call to frame end, as must the object itself
 	void Submit(CPatch* patch);
 	void Submit(CModel* model);
 	void Submit(CSprite* sprite);
 	void Submit(CParticleSys* psys);
 	void Submit(COverlay* overlay);
 
 	// basic primitive rendering operations in 2 and 3D; handy for debugging stuff, but also useful in 
 	// editor tools (eg for highlighting specific terrain patches) 
 	// note: 
 	//		* all 3D vertices specified in world space
 	//		* primitive operations rendered immediatedly, never batched
 	//		* primitives rendered in current material (set via SetMaterial)
 	void RenderLine(const SVertex2D* vertices);
 	void RenderLineLoop(int len,const SVertex2D* vertices);
 	void RenderTri(const SVertex2D* vertices);
 	void RenderQuad(const SVertex2D* vertices);
 	void RenderLine(const SVertex3D* vertices);
 	void RenderLineLoop(int len,const SVertex3D* vertices);
 	void RenderTri(const SVertex3D* vertices);
 	void RenderQuad(const SVertex3D* vertices);
 
 	// set the current lighting environment; (note: the passed pointer is just copied to a variable within the renderer,
 	// so the lightenv passed must be scoped such that it is not destructed until after the renderer is no longer rendering)
 	void SetLightEnv(CLightEnv* lightenv) {
 		m_LightEnv=lightenv;
 	}
 
 	// set the mode to render subsequent terrain patches
 	void SetTerrainRenderMode(ERenderMode mode) { m_TerrainRenderMode=mode; }
 	// get the mode to render subsequent terrain patches
 	ERenderMode GetTerrainRenderMode() const { return m_TerrainRenderMode; }
 
 	// set the mode to render subsequent models
 	void SetModelRenderMode(ERenderMode mode) { m_ModelRenderMode=mode; }
 	// get the mode to render subsequent models
 	ERenderMode GetModelRenderMode() const { return m_ModelRenderMode; }
 
 	// try and load the given texture
 	bool LoadTexture(CTexture* texture,u32 wrapflags);
 	// set the given unit to reference the given texture; pass a null texture to disable texturing on any unit;
 	// active texture unit always set to given unit on exit
 	void SetTexture(int unit,CTexture* texture);
 	// bind a GL texture object to active unit
 	void BindTexture(int unit,GLuint tex);
 	// query transparency of given texture
 	bool IsTextureTransparent(CTexture* texture);
 
 	// load the default set of alphamaps; return false if any alphamap fails to load, true otherwise
-	bool LoadAlphaMaps();
+	void LoadAlphaMaps();
 
 	void UnloadAlphaMaps();
 
 	// return stats accumulated for current frame
 	const Stats& GetStats() { return m_Stats; }
 
     // return the current light environment
     const CLightEnv &GetLightEnv() { return *m_LightEnv; }
 protected:
 	friend class CVertexBuffer;
 	friend class CPatchRData;
 	friend class CModelRData;
 	friend class CTransparencyRenderer;
 	friend class CPlayerRenderer;
 
 	// update renderdata of everything submitted
 	void UpdateSubmittedObjectData();
 
 	// patch rendering stuff
 	void RenderPatchSubmissions();
 	void RenderPatches();
 
 	// model rendering stuff
 	void RenderModelSubmissions();
 	void RenderModels();
 
 	// shadow rendering stuff
 	void CreateShadowMap();
 	void RenderShadowMap();
 	void ApplyShadowMap();
 	void BuildTransformation(const CVector3D& pos,const CVector3D& right,const CVector3D& up,
 						 const CVector3D& dir,CMatrix3D& result);
 	void ConstructLightTransform(const CVector3D& pos,const CVector3D& lightdir,CMatrix3D& result);
 	void CalcShadowMatrices();
 	void CalcShadowBounds(CBound& bounds);
 
 	// RENDERER DATA:
 	// view width
 	int m_Width;
 	// view height
 	int	m_Height;
 	// view depth (bpp)
 	int	m_Depth;
 	// frame counter
 	int m_FrameCounter;
 	// current terrain rendering mode
 	ERenderMode m_TerrainRenderMode;
 	// current model rendering mode
 	ERenderMode m_ModelRenderMode;
 	// current view camera
 	CCamera m_Camera;
 	// color used to clear screen in BeginFrame
 	float m_ClearColor[4];
 	// submitted object lists for batching
 	std::vector<CSprite*> m_Sprites;
 	std::vector<CParticleSys*> m_ParticleSyses;
 	std::vector<COverlay*> m_Overlays;
 	// current lighting setup
 	CLightEnv* m_LightEnv;
 	// current spherical harmonic coefficients (for unit lighting), derived from lightenv
 	CSHCoeffs m_SHCoeffsUnits;
 	// current spherical harmonic coefficients (for terrain lighting), derived from lightenv
 	CSHCoeffs m_SHCoeffsTerrain;
 	// handle of composite alpha map (all the alpha maps packed into one texture)
 	u32 m_CompositeAlphaMap;
 	// handle of shadow map
 	u32 m_ShadowMap;
 	// width, height of shadow map
 	u32 m_ShadowMapWidth,m_ShadowMapHeight;
 	// object space bound of shadow casting objects
 	CBound m_ShadowBound;
 	// per-frame flag: has the shadow map been rendered this frame?
 	bool m_ShadowRendered;
 	// projection matrix of shadow casting light
 	CMatrix3D m_LightProjection;
 	// transformation matrix of shadow casting light
 	CMatrix3D m_LightTransform;
 	// coordinates of each (untransformed) alpha map within the packed texture
 	struct {
 		float u0,u1,v0,v1;
 	} m_AlphaMapCoords[NumAlphaMaps];
 	// card capabilities
 	struct Caps {
 		bool m_VBO;
 		bool m_TextureBorderClamp;
 		bool m_GenerateMipmaps;
 	} m_Caps;
 	// renderer options 
 	struct Options {
 		bool m_NoVBO;
 		bool m_Shadows;
 		RGBAColor m_ShadowColor;
 		float m_LodBias;
 	} m_Options;
 	// build card cap bits
 	void EnumCaps();
 	// per-frame renderer stats
 	Stats m_Stats;
 	// active textures on each unit
 	GLuint m_ActiveTextures[MaxTextureUnits];
 };
 
 
 #endif