diff --git a/GameVersion.cpp b/GameVersion.cpp index ffd96ab1..605bf477 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -55,8 +55,8 @@ #endif -CHAR8 czVersionNumber[16] = { "Build 19.04.22" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 19.06.27" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; -CHAR16 zRevisionNumber[16] = { L"Revision 8675" }; +CHAR16 zRevisionNumber[16] = { L"Revision 8679" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Laptop/merccompare.cpp b/Laptop/merccompare.cpp index 4f8c029f..ea1ed512 100644 --- a/Laptop/merccompare.cpp +++ b/Laptop/merccompare.cpp @@ -582,7 +582,7 @@ BOOLEAN DisplayMercData( UINT8 usProfileA, UINT8 usProfileB ) { if ( pProfileA->bRefinement * pProfileB->bRefinement == 2 ) val = -2 * gGameExternalOptions.sMoraleModRefinement; - else if ( pProfileA->bRefinement * pProfileB->bRefinement == 0 ) + else if ( (pProfileA->bRefinement * pProfileB->bRefinement == 0) && (pProfileA->bRefinement != pProfileB->bRefinement) ) val = -gGameExternalOptions.sMoraleModRefinement; else val = gGameExternalOptions.sMoraleModRefinement; diff --git a/Tactical/DynamicDialogue.cpp b/Tactical/DynamicDialogue.cpp index 61133858..907946b5 100644 --- a/Tactical/DynamicDialogue.cpp +++ b/Tactical/DynamicDialogue.cpp @@ -166,7 +166,7 @@ INT8 SoldierRelation( SOLDIERTYPE* pSoldierA, SOLDIERTYPE* pSoldierB ) { if ( pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 2 ) bOpinion -= 2 * gGameExternalOptions.sMoraleModRefinement; - else if ( pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 0 ) + else if ( (pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 0) && (pProfile->bRefinement != gMercProfiles[pSoldierB->ubProfile].bRefinement) ) bOpinion -= gGameExternalOptions.sMoraleModRefinement; else bOpinion += gGameExternalOptions.sMoraleModRefinement;