diff --git a/GameVersion.cpp b/GameVersion.cpp index 2fe38446..56fce5c9 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -55,8 +55,8 @@ #endif -CHAR8 czVersionNumber[16] = { "Build 19.06.29" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 19.07.05" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; -CHAR16 zRevisionNumber[16] = { L"Revision 8681" }; +CHAR16 zRevisionNumber[16] = { L"Revision 8682" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Laptop/merccompare.cpp b/Laptop/merccompare.cpp index ea1ed512..a710d8f1 100644 --- a/Laptop/merccompare.cpp +++ b/Laptop/merccompare.cpp @@ -618,7 +618,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;