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
commit d0a32518cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 27 deletions

View File

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

View File

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