mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-28 01:52:16 +00:00
Entities: Removed Tag attribute; it is taken from the filename instead. Made entity XML files be loaded on demand. Probably stopped crash when maps contain non-existent entities. Fixed a few bugs in entity definitions.
Maps: Stored non-entity objects in XML instead of PMP, for easier manual editing. Updated existing maps to newest format, so that they can still work. Added undocumented _rewriteMaps() JS function. Also renamed _mem to vmem, and reclassified its undocumentedness as unintentional, since it's reasonably useful. Loader: added NonprogressiveLoad function, for ScEd/_rewriteMaps/etc which don't care about progressiveness. main.cpp: re-enabled vfs_display, since it doesn't crash now Vector3D: stopped warning This was SVN commit r2078.
This commit is contained in:
@@ -28,13 +28,15 @@
|
||||
|
||||
class CBaseEntityCollection : public Singleton<CBaseEntityCollection>
|
||||
{
|
||||
std::vector<CBaseEntity*> m_templates;
|
||||
typedef std::map<CStrW, CBaseEntity*> templateMap;
|
||||
typedef std::map<CStrW, CStr> templateFilenameMap;
|
||||
templateMap m_templates;
|
||||
templateFilenameMap m_templateFilenames;
|
||||
public:
|
||||
~CBaseEntityCollection();
|
||||
CBaseEntity* getTemplate( CStrW entityType );
|
||||
void loadTemplates();
|
||||
void LoadFile( const char* path );
|
||||
CBaseEntity* getTemplateByActor( CStrW actorName );
|
||||
|
||||
// Create a list of the names of all templates, for display in ScEd's
|
||||
// entity-selection box. (This isn't really very good, since it includes
|
||||
|
||||
Reference in New Issue
Block a user