2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00

AuxiliaryID32 implemented for sub-resources

This commit is contained in:
Jack Andersen
2016-04-05 15:44:07 -10:00
parent 5cd372592c
commit 28b9cd9e3f
19 changed files with 497 additions and 75 deletions

View File

@@ -12,12 +12,12 @@ UniqueID32 AnimationParameters::getCINF(PAKRouter<PAKBridge>& pakRouter) const
return UniqueID32();
const nod::Node* node;
const PAK::Entry* ancsEnt = pakRouter.lookupEntry(animationCharacterSet, &node);
ANCS ancs;
ANCS ancs(ancsEnt->id);
{
PAKEntryReadStream rs = ancsEnt->beginReadStream(*node);
ancs.read(rs);
}
return ancs.characterSet.characters.at(character).cinf;
return ancs.characterSet.characters.at(character).cinf.getBaseId();
}
}

View File

@@ -354,9 +354,9 @@ struct ActorParameters : BigYAML
LightParameters lightParameters;
ScannableParameters scannableParameters;
UniqueID32 xrayModel;
UniqueID32 xraySkin;
AuxiliaryID32 xraySkin = _S("skin");
UniqueID32 thermalModel;
UniqueID32 thermalSkin;
AuxiliaryID32 thermalSkin = _S("skin");
Value<bool> unknown1;
Value<float> unknown2;
Value<float> unknown3;