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

Merge pull request #21 from lioncash/anim 

CAnimationParameters: Add missing break in switch cases in SetUnknown()
This commit is contained in:
LC 2020-06-15 15:33:31 -04:00 committed by GitHub
parent 7ba5a0cc58 7824d0720d
commit d0a32518cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Core/Resource/Animation/CAnimationParameters.cpp
View File

@ -2,33 +2,16 @@
#include "CAnimSet.h" #include "CAnimSet.h"
#include "Core/GameProject/CResourceStore.h" #include "Core/GameProject/CResourceStore.h"
#include <Common/Log.h> #include <Common/Log.h>
#include <iostream>
CAnimationParameters::CAnimationParameters() CAnimationParameters::CAnimationParameters() = default;
: mGame(EGame::Prime)
, mCharIndex(0)
, mAnimIndex(0)
, mUnknown2(0)
, mUnknown3(0)
{
}
CAnimationParameters::CAnimationParameters(EGame Game) CAnimationParameters::CAnimationParameters(EGame Game)
: mGame(Game) : mGame(Game), mCharacterID(CAssetID::InvalidID(Game))
, mCharacterID( CAssetID::InvalidID(Game) )
, mCharIndex(0)
, mAnimIndex(0)
, mUnknown2(0)
, mUnknown3(0)
{ {
} }
CAnimationParameters::CAnimationParameters(IInputStream& rSCLY, EGame Game) CAnimationParameters::CAnimationParameters(IInputStream& rSCLY, EGame Game)
: mGame(Game) : mGame(Game)
, mCharIndex(0)
, mAnimIndex(0)
, mUnknown2(0)
, mUnknown3(0)
{ {
if (Game <= EGame::Echoes) if (Game <= EGame::Echoes)
{ {
@ -225,8 +208,14 @@ void CAnimationParameters::SetUnknown(uint32 Index, uint32 Value)
{ {
switch (Index) switch (Index)
{ {
case 0: mAnimIndex = Value; case 0:
case 1: mUnknown2 = Value; mAnimIndex = Value;
case 2: mUnknown3 = Value; break;
case 1:
mUnknown2 = Value;
break;
case 2:
mUnknown3 = Value;
break;
} }
} }

10
src/Core/Resource/Animation/CAnimationParameters.h
View File

@ -8,13 +8,13 @@ class CModel;
class CAnimationParameters class CAnimationParameters
{ {
EGame mGame; EGame mGame = EGame::Prime;
CAssetID mCharacterID; CAssetID mCharacterID;
uint32 mCharIndex; uint32 mCharIndex = 0;
uint32 mAnimIndex; uint32 mAnimIndex = 0;
uint32 mUnknown2; uint32 mUnknown2 = 0;
uint32 mUnknown3; uint32 mUnknown3 = 0;
public: public:
CAnimationParameters(); CAnimationParameters();