summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-26 19:10:55 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-26 19:10:55 +0100
commit9b1db9709b8470fd8eb8662ada10a4a120bb80c8 (patch)
tree40391b2a2c064b523c61966e4c22dfff3a118416 /src/control
parentenum change (diff)
parentMerge branch 'miami' into lcs (diff)
downloadre3-9b1db9709b8470fd8eb8662ada10a4a120bb80c8.tar
re3-9b1db9709b8470fd8eb8662ada10a4a120bb80c8.tar.gz
re3-9b1db9709b8470fd8eb8662ada10a4a120bb80c8.tar.bz2
re3-9b1db9709b8470fd8eb8662ada10a4a120bb80c8.tar.lz
re3-9b1db9709b8470fd8eb8662ada10a4a120bb80c8.tar.xz
re3-9b1db9709b8470fd8eb8662ada10a4a120bb80c8.tar.zst
re3-9b1db9709b8470fd8eb8662ada10a4a120bb80c8.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Replay.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 1fb4b9b0..5f481234 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -521,7 +521,7 @@ void CReplay::StoreDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationState
state->aFunctionCallbackID[i] = 0;
}
}else{
- state->aAnimId[i] = NUM_ANIMS;
+ state->aAnimId[i] = NUM_STD_ANIMS;
state->aCurTime[i] = 0;
state->aSpeed[i] = 85;
state->aFunctionCallbackID[i] = 0;
@@ -548,7 +548,7 @@ void CReplay::StoreDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationState
}
}
else {
- state->aAnimId2[i] = NUM_ANIMS;
+ state->aAnimId2[i] = NUM_STD_ANIMS;
state->aCurTime2[i] = 0;
state->aSpeed2[i] = 85;
state->aFunctionCallbackID2[i] = 0;
@@ -659,7 +659,7 @@ void CReplay::RetrieveDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationSt
for (int i = 0; ((assoc = RpAnimBlendClumpGetMainPartialAssociation_N(ped->GetClump(), i))); i++)
assoc->SetBlend(0.0f, -1.0f);
for (int i = 0; i < NUM_MAIN_ANIMS_IN_REPLAY; i++) {
- if (state->aAnimId[i] == NUM_ANIMS)
+ if (state->aAnimId[i] == NUM_STD_ANIMS)
continue;
CAnimBlendAssociation* anim = CAnimManager::AddAnimation(ped->GetClump(),
state->aAnimId[i] > 3 ? (AssocGroupId)state->aGroupId[i] : ped->m_animGroup,
@@ -677,7 +677,7 @@ void CReplay::RetrieveDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationSt
anim->SetDeleteCallback(FindCBFunction(callback & 0x7F), ped);
}
for (int i = 0; i < NUM_PARTIAL_ANIMS_IN_REPLAY; i++) {
- if (state->aAnimId2[i] == NUM_ANIMS)
+ if (state->aAnimId2[i] == NUM_STD_ANIMS)
continue;
CAnimBlendAssociation* anim = CAnimManager::AddAnimation(ped->GetClump(),
state->aAnimId2[i] > 3 ? (AssocGroupId)state->aGroupId2[i] : ped->m_animGroup,