AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Update hecl

Browse Source
This commit is contained in:
Jack Andersen
2016-04-15 10:58:49 -10:00
parent abff623cf6
commit 3bab36faba
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Editor/ProjectManager.cpp
View File

@@ -103,7 +103,7 @@ bool ProjectManager::openProject(const hecl::SystemString& path)
if (!fp) if (!fp)
{ {
needsSave = true; needsSave = true;
goto makeDefault; goto makeProj;
} }
yaml_parser_set_input_file(r.getParser(), fp); yaml_parser_set_input_file(r.getParser(), fp);
@@ -111,7 +111,7 @@ bool ProjectManager::openProject(const hecl::SystemString& path)
{ {
needsSave = true; needsSave = true;
fclose(fp); fclose(fp);
goto makeDefault; goto makeProj;
} }
r.reset(); r.reset();
@@ -121,13 +121,17 @@ bool ProjectManager::openProject(const hecl::SystemString& path)
{ {
needsSave = true; needsSave = true;
fclose(fp); fclose(fp);
goto makeDefault; goto makeProj;
} }
fclose(fp); fclose(fp);
makeDefault: makeProj:
m_vm.ProjectChanged(*m_proj); m_vm.ProjectChanged(*m_proj);
m_vm.SetupEditorView();
if (!needsSave)
m_vm.SetupEditorView(r);
else
m_vm.SetupEditorView();
m_factoryMP1.IndexMP1Resources(*m_proj); m_factoryMP1.IndexMP1Resources(*m_proj);
m_mainMP1.emplace(m_factoryMP1, m_objStore); m_mainMP1.emplace(m_factoryMP1, m_objStore);

2
hecl

Submodule hecl updated: 7393a88a0d...dabc519fe1