quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up the reload-if-failed code

Browse Source
This commit is contained in:
Rudolf Polzer 2010-10-10 14:10:10 +02:00
parent 182f62c459
commit e1ed914df2
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
radiant/map.cpp
View File

@ -1032,29 +1032,28 @@ void Map_LoadFile (const char *filename)
globalOutputStream() << "Loading map from " << filename << "\n"; globalOutputStream() << "Loading map from " << filename << "\n";
ScopeDisableScreenUpdates disableScreenUpdates("Processing...", "Loading Map"); ScopeDisableScreenUpdates disableScreenUpdates("Processing...", "Loading Map");
g_map.m_name = filename;
Map_UpdateTitle(g_map);
{ {
ScopeTimer timer("map load"); ScopeTimer timer("map load");
g_map.m_resource = GlobalReferenceCache().capture(g_map.m_name.c_str()); const MapFormat* format = NULL;
const char* moduleName = findModuleName(&GlobalFiletypes(), MapFormat::Name(), path_get_extension(filename));
if(string_not_empty(moduleName))
format = ReferenceAPI_getMapModules().findModule(moduleName);
const MapFormat* format = ReferenceAPI_getMapModules().findModule("mapq3"); for(int i = 0; i < Brush_toggleFormatCount(); ++i)
format->wrongFormat = false;
g_map.m_resource->attach(g_map);
if(format->wrongFormat)
{
// try toggling BrushPrimitives
for(i = 1; i < Brush_toggleFormatCount(); ++i)
{ {
if(i)
Map_Free(); Map_Free();
Brush_toggleFormat(i); Brush_toggleFormat(i);
g_map.m_name = filename; g_map.m_name = filename;
Map_UpdateTitle(g_map); Map_UpdateTitle(g_map);
g_map.m_resource = GlobalReferenceCache().capture(g_map.m_name.c_str()); g_map.m_resource = GlobalReferenceCache().capture(g_map.m_name.c_str());
if(format)
format->wrongFormat = false;
g_map.m_resource->attach(g_map); g_map.m_resource->attach(g_map);
} if(format)
if(!format->wrongFormat)
break;
} }
Node_getTraversable(GlobalSceneGraph().root())->traverse(entity_updateworldspawn()); Node_getTraversable(GlobalSceneGraph().root())->traverse(entity_updateworldspawn());