archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-16 12:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse Source 
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/audio/AudioManager.cpp
This commit is contained in:
Sergeanur
2020-05-16 23:58:44 +03:00
parent 1a42d62d3a ad0b99231e
commit 77f97ad2ad
6 changed files with 9478 additions and 9541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/animation/AnimManager.cpp
View File

@ -901,7 +901,7 @@ char const* aChainsawStrafeRightAnimations[] = {
const AnimAssocDefinition CAnimManager::ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_GROUPS] = {
{ "man", "ped", MI_COP, 173, aStdAnimations, aStdAnimDescs },
{ "man", "ped", MI_COP, awc(aStdAnimations), aStdAnimDescs },
{ "van", "van", MI_COP, 8, aVanAnimations, aVanAnimDescs },
{ "coach", "coach", MI_COP, 5, aCoachAnimations, aCoachAnimDescs },
{ "bikes", "bikes", MI_COP, 18, aBikesAnimations, aBikeAnimDescs },
@ -963,6 +963,7 @@ const AnimAssocDefinition CAnimManager::ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_
{ "csawleft", "ped", MI_COP, 5, aChainsawStrafeLeftAnimations, aStdAnimDescsSide },
{ "csawright", "ped", MI_COP, 5, aChainsawStrafeRightAnimations, aStdAnimDescsSide },
};
#undef awc
void
CAnimManager::Initialise(void)