1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change: only deactivate facial animations if all 4 offsets are 0

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-06-11 18:16:13 +00:00
parent e7de185669
commit ef2fb4dda6
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Faces.cpp
+4 -6
View File
@@ -803,15 +803,13 @@ void InternalSetAutoFaceActive( UINT32 uiDisplayBuffer, UINT32 uiRestoreBuffer,
pFace->fAutoDisplayBuffer = FALSE;
pFace->uiAutoDisplayBuffer = uiDisplayBuffer;
}
usMercProfileID = pFace->ubCharacterNum;
pFace->usFaceX = usFaceX;
pFace->usFaceY = usFaceY;
pFace->fCanHandleInactiveNow = FALSE;
//Take eyes x,y from profile unless we are an RPC and we are small faced.....
pFace->usEyesX = usEyesX + usFaceX;
pFace->usEyesY = usEyesY + usFaceY;
@@ -824,8 +822,8 @@ void InternalSetAutoFaceActive( UINT32 uiDisplayBuffer, UINT32 uiRestoreBuffer,
pFace->usMouthOffsetY = usMouthY;
pFace->usMouthOffsetX = usMouthX;
if ( pFace->usEyesY == usFaceY || pFace->usMouthY == usFaceY )
// Flugente: the old check as silly. Play no animations if no offsets exist (that would mean eyes and mouth overlap, which is an indicator it wouldn't work)
if ( !usEyesX && !usEyesY && !usMouthY && !usMouthX )
{
pFace->fInvalidAnim = TRUE;
}