AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix YAML faux pas in SpecialFunction

This commit is contained in:
Phillip Stephens 2016-12-24 11:31:25 -08:00
parent 777419ad4e
commit 770c3e6395
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNAMP1/MLVL.cpp
View File

@ -221,9 +221,9 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat
else if (obj->type == 0x3A) else if (obj->type == 0x3A)
{ {
SpecialFunction& specialFunc = static_cast<SpecialFunction&>(*obj); SpecialFunction& specialFunc = static_cast<SpecialFunction&>(*obj);
if (specialFunc.type == ESpecialFunctionType::CinematicSkip) if (specialFunc.function == ESpecialFunctionType::CinematicSkip)
savw.skippableCutscenes.push_back(specialFunc.id); savw.skippableCutscenes.push_back(specialFunc.id);
else if (specialFunc.type == ESpecialFunctionType::ScriptLayerController) else if (specialFunc.function == ESpecialFunctionType::ScriptLayerController)
{ {
savw.layers.emplace_back(); savw.layers.emplace_back();
SAVWCommon::Layer& layer = savw.layers.back(); SAVWCommon::Layer& layer = savw.layers.back();

2
DataSpec/DNAMP1/ScriptObjects/SpecialFunction.hpp
View File

@ -15,7 +15,7 @@ struct SpecialFunction : IScriptObject
String<-1> name; String<-1> name;
Value<atVec3f> location; Value<atVec3f> location;
Value<atVec3f> orientation; Value<atVec3f> orientation;
Value<ESpecialFunctionType> type; Value<ESpecialFunctionType> function;
String<-1> unknown1; String<-1> unknown1;
Value<float> unknown2; Value<float> unknown2;
Value<float> unknown3; Value<float> unknown3;