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

CScriptMidi and work on CGameArea loading

Browse Source
This commit is contained in:
Jack Andersen
2017-02-26 19:25:14 -10:00
parent 628e5b41df
commit e923d83617
28 changed files with 446 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DataSpec/DNAMP1/MLVL.cpp
View File

@@ -270,7 +270,8 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat
{
addedPaths.insert(path.hash());
urde::SObjectTag tag = g_curSpec->BuildTagFromPath(path, btok);
areaOut.deps.emplace_back(tag.id, tag.type);
if (tag.id != -1)
areaOut.deps.emplace_back(tag.id, tag.type);
}
}
}
@@ -308,12 +309,14 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat
{
addedPaths.insert(path.hash());
urde::SObjectTag tag = g_curSpec->BuildTagFromPath(path, btok);
areaOut.deps.emplace_back(tag.id, tag.type);
if (tag.id != -1)
areaOut.deps.emplace_back(tag.id, tag.type);
}
}
urde::SObjectTag tag = g_curSpec->BuildTagFromPath(areaPath, btok);
areaOut.deps.emplace_back(tag.id, tag.type);
if (tag.id != -1)
areaOut.deps.emplace_back(tag.id, tag.type);
}
++areaIdx;

2
DataSpec/DNAMP1/MREA.cpp
View File

@@ -518,7 +518,7 @@ bool MREA::PCCook(const hecl::ProjectPath& outPath,
}
}
if (!good)
secs.emplace_back(0, 0);
secs.emplace_back(4, 0);
}
/* PATH */

8
DataSpec/DNAMP1/ScriptObjects/Midi.hpp
View File

@@ -13,11 +13,11 @@ struct Midi : IScriptObject
{
DECL_YAML
String<-1> name;
Value<bool> unknown1;
Value<bool> active;
UniqueID32 song;
Value<float> unknown2;
Value<float> unknown3;
Value<atUint32> unknown4;
Value<float> fadeInTime;
Value<float> fadeOutTime;
Value<atUint32> volume;
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
{