AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

MSVC & zeus fixes; update hecl-gui

Browse Source
This commit is contained in:
Luke Street
2020-04-19 21:09:30 -04:00
parent ec5d680be0
commit 24acb585f8
24 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/CStateManager.cpp
View File

@@ -1357,8 +1357,8 @@ std::pair<TEditorId, TUniqueId> CStateManager::LoadScriptObject(TAreaId aid, ESc
}
CEntity* ent = nullptr;
const CEntityInfo info(aid, std::move(conns), id);
if (loader) {
const CEntityInfo info(aid, std::move(conns), id);
ent = loader(*this, in, propCount, info);
} else {
error = true;
@@ -1377,7 +1377,11 @@ std::pair<TEditorId, TUniqueId> CStateManager::LoadScriptObject(TAreaId aid, ESc
in.readByte();
if (error || ent == nullptr) {
LogModule.report(logvisor::Error, FMT_STRING("Script load error while loading {}"), ScriptObjectTypeToStr(type));
in.seek(startPos, athena::SeekOrigin::Begin);
std::string name; //= HashInstanceName(in);
LogModule.report(logvisor::Error, FMT_STRING("Script load error while loading {}, name: {}"),
ScriptObjectTypeToStr(type), name);
loader(*this, in, propCount, info);
return {kInvalidEditorId, kInvalidUniqueId};
} else {
LogModule.report(logvisor::Info, FMT_STRING("Loaded {} in area {}"), ent->GetName(), ent->GetAreaIdAlways());