1
0
forked from mirrors/0ad

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:
Ykkrosh
2005-03-29 20:50:04 +00:00
parent e6c56d0537
commit 22dd4dd67b
294 changed files with 607 additions and 531 deletions
+1 -9
View File
@@ -176,15 +176,7 @@ bool CEditorData::Init()
return false;
}
int progress_percent;
wchar_t description[100];
int ret2;
do
{
ret2 = LDR_ProgressiveLoad(100.f, description, ARRAY_SIZE(description), &progress_percent);
assert(ret2 == 0 || ret2 == 1 || ret2 == ERR_TIMED_OUT);
}
while (ret2 != 0);
LDR_NonprogressiveLoad();
// create the scene - terrain, camera, light environment etc
if (!InitScene()) return false;
+1 -11
View File
@@ -624,17 +624,7 @@ void CMainFrame::OnFileLoadMap()
CMapReader* reader = new CMapReader(); // freed by the progressive loader
reader->LoadMap(loadname, g_Game->GetWorld()->GetTerrain(), &g_UnitMan, &g_LightEnv);
LDR_EndRegistering();
int progress_percent;
wchar_t description[100];
int ret;
do
{
ret = LDR_ProgressiveLoad(100.f, description, ARRAY_SIZE(description), &progress_percent);
assert(ret == 0 || ret == 1 || ret == ERR_TIMED_OUT);
}
while (ret != 0);
LDR_NonprogressiveLoad();
CStr filetitle=loaddlg.m_ofn.lpstrFileTitle;
int index=filetitle.ReverseFind(CStr("."));