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

Use pas::EAnimationState in CPAS*

Browse Source
This commit is contained in:
Luke Street
2020-04-22 05:08:02 -04:00
parent 535717fbd8
commit 14c92e85ce
26 changed files with 337 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Character/CPASAnimState.cpp
View File

@@ -2,6 +2,7 @@
#include "Runtime/CRandom16.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Character/CharacterCommon.hpp"
#include "Runtime/Character/CPASAnimParmData.hpp"
#include <algorithm>
@@ -13,7 +14,7 @@
namespace urde {
CPASAnimState::CPASAnimState(CInputStream& in) {
x0_id = in.readUint32Big();
x0_id = static_cast<pas::EAnimationState>(in.readUint32Big());
u32 parmCount = in.readUint32Big();
u32 animCount = in.readUint32Big();
@@ -58,7 +59,7 @@ CPASAnimState::CPASAnimState(CInputStream& in) {
}
}
CPASAnimState::CPASAnimState(int stateId) : x0_id(stateId) {}
CPASAnimState::CPASAnimState(pas::EAnimationState stateId) : x0_id(stateId) {}
CPASAnimParm CPASAnimState::GetAnimParmData(s32 animId, size_t parmIdx) const {
const auto search = rstl::binary_find(x14_anims.cbegin(), x14_anims.cend(), animId,