mirror of
https://github.com/Pinsplash/halflife2chaos.git
synced 2024-10-29 23:32:38 +01:00
fixed #102 hopefully not creating other bugs
This commit is contained in:
parent
054e5d5899
commit
d5c071e2af
@ -6081,7 +6081,14 @@ Activity CAI_BaseNPC::TranslateActivity( Activity idealActivity, Activity *pIdea
|
||||
return baseTranslation;
|
||||
|
||||
if (idealWeaponActivity != baseTranslation && HaveSequenceForActivity(idealWeaponActivity))
|
||||
return idealActivity;
|
||||
{
|
||||
//this used to return idealActivity instead, but i found that this was causing grigori to use non-weapon activities in town 02a.
|
||||
//i don't know when this bug started happening.
|
||||
//no other NPCs appear to go down this same code path, but if in the future an NPC is animating incorrectly and this message appears, now you know why.
|
||||
//this may also remove the need for some weapon acttables referencing readiness levels.
|
||||
Msg("%s weapon activity is %s, ideal activity %s\n", GetClassname(), GetActivityName(idealWeaponActivity), GetActivityName(idealActivity));
|
||||
return idealWeaponActivity;
|
||||
}
|
||||
|
||||
if ( idealActivity != idealWeaponActivity && HaveSequenceForActivity( idealActivity ) )
|
||||
return idealActivity;
|
||||
|
Loading…
Reference in New Issue
Block a user