1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +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
GameVersion.cpp
+9 -9
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR #ifdef JA2EDITOR
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8571 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8571 (Development Build)" };
#endif #endif
// ------------------------------ // ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION //DEBUG BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8571 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8571 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8571 (Development Build)" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8571 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8571 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Release v1.13.8561 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.8571 (Development Build)" };
#endif #endif
#endif #endif
CHAR8 czVersionNumber[16] = { "Build 18.05.14" }; //YY.MM.DD CHAR8 czVersionNumber[16] = { "Build 18.06.11" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zTrackingNumber[16] = { L"Z" };
// SAVE_GAME_VERSION is defined in header, change it there // SAVE_GAME_VERSION is defined in header, change it there
Tactical/Faces.cpp
+4 -6
View File
@@ -803,15 +803,13 @@ void InternalSetAutoFaceActive( UINT32 uiDisplayBuffer, UINT32 uiRestoreBuffer,
pFace->fAutoDisplayBuffer = FALSE; pFace->fAutoDisplayBuffer = FALSE;
pFace->uiAutoDisplayBuffer = uiDisplayBuffer; pFace->uiAutoDisplayBuffer = uiDisplayBuffer;
} }
usMercProfileID = pFace->ubCharacterNum; usMercProfileID = pFace->ubCharacterNum;
pFace->usFaceX = usFaceX; pFace->usFaceX = usFaceX;
pFace->usFaceY = usFaceY; pFace->usFaceY = usFaceY;
pFace->fCanHandleInactiveNow = FALSE; pFace->fCanHandleInactiveNow = FALSE;
//Take eyes x,y from profile unless we are an RPC and we are small faced..... //Take eyes x,y from profile unless we are an RPC and we are small faced.....
pFace->usEyesX = usEyesX + usFaceX; pFace->usEyesX = usEyesX + usFaceX;
pFace->usEyesY = usEyesY + usFaceY; pFace->usEyesY = usEyesY + usFaceY;
@@ -824,8 +822,8 @@ void InternalSetAutoFaceActive( UINT32 uiDisplayBuffer, UINT32 uiRestoreBuffer,
pFace->usMouthOffsetY = usMouthY; pFace->usMouthOffsetY = usMouthY;
pFace->usMouthOffsetX = usMouthX; pFace->usMouthOffsetX = usMouthX;
// 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 ( pFace->usEyesY == usFaceY || pFace->usMouthY == usFaceY ) if ( !usEyesX && !usEyesY && !usMouthY && !usMouthX )
{ {
pFace->fInvalidAnim = TRUE; pFace->fInvalidAnim = TRUE;
} }