fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow death animations to finish when entering combat

Browse Source 
(to prevent animation glitch, #584)
This commit is contained in:
NovaRain
2025-03-05 10:28:09 +08:00
parent bdf6046df2
commit e18df80980
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/Animations.cpp
+8 -1
View File
@@ -518,7 +518,13 @@ static void __stdcall combat_begin_anim_stop_hook() {
for (int i = 0; i < animationLimit; i++) {
const fo::AnimationSet& set = animSet[i];
if (set.currentAnim >= 1 && set.animations[set.currentAnim - 1].animType == fo::ANIM_TYPE_ANIMATE_FOREVER) continue;
if (set.currentAnim >= 1 &&
(set.animations[set.currentAnim - 1].animType == fo::ANIM_TYPE_ANIMATE_FOREVER ||
(set.animations[set.currentAnim - 1].source->IsCritter() &&
set.animations[set.currentAnim - 1].source->critter.damageFlags & fo::DAM_DEAD)))
{
continue;
}
fo::func::anim_set_end(i);
}
@@ -637,6 +643,7 @@ void Animations::init() {
}
// Prevent the "forever" type of animation on objects from stopping when entering combat
// also allow death animations to finish
HookCall(0x421A48, combat_begin_anim_stop_hook);
}