diff --git a/GameVersion.cpp b/GameVersion.cpp index 5ec2ad99..19b9e9a7 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -15,9 +15,9 @@ #ifdef JA2EDITOR #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 - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8561 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8571 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #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) - 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 - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8561 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8571 (Development Build)" }; #endif #elif defined CRIPPLED_VERSION @@ -46,16 +46,16 @@ //RELEASE BUILD VERSION #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) - 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 - CHAR16 zVersionLabel[256] = { L"Release v1.13.8561 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.8571 (Development Build)" }; #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" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp index f61613dd..5511e593 100644 --- a/Tactical/Faces.cpp +++ b/Tactical/Faces.cpp @@ -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; }