mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-22 03:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
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:
Ykkrosh
2005-03-29 20:50:04 +00:00
parent e6c56d0537
commit 22dd4dd67b
294 changed files with 607 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/BaseEntity.cpp
+5 -11
View File
@@ -79,12 +79,12 @@ bool CBaseEntity::loadXML( CStr filename )
EL(script);
EL(footprint);
EL(event);
AT(tag);
AT(parent);
AT(radius);
AT(width);
AT(height);
AT(on);
AT(file);
#undef AT
#undef EL
@@ -98,13 +98,7 @@ bool CBaseEntity::loadXML( CStr filename )
XMBElementList RootChildren = Root.getChildNodes();
m_Tag = Root.getAttributes().getNamedItem( at_tag );
if( !m_Tag.Length() )
{
LOG( ERROR, LOG_CATEGORY, "CBaseEntity::LoadXML: Tag attribute was not specified in file %s. Load failed.", filename.c_str() );
return( false );
}
m_Tag = CStr(filename).AfterLast("/").BeforeLast(".xml");
m_Base_Name = Root.getAttributes().getNamedItem( at_parent );
@@ -116,7 +110,7 @@ bool CBaseEntity::loadXML( CStr filename )
if( ChildName == el_script )
{
CStr Include = Child.getAttributes().getNamedItem( XeroFile.getAttributeID( "file" ) );
CStr Include = Child.getAttributes().getNamedItem( at_file );
jsval dy;
@@ -164,9 +158,9 @@ bool CBaseEntity::loadXML( CStr filename )
else if( ChildName == el_event )
{
// Action...On for consistency with the GUI.
CStrW EventName = CStrW( L"on" ) + (CStrW)Child.getAttributes().getNamedItem( at_on );
CStrW EventName = L"on" + (CStrW)Child.getAttributes().getNamedItem( at_on );
CStrW Code = (CStrW)Child.getText();
CStrW Code (Child.getText());
// Does a property with this name already exist?