From a6d7c95abba80f41299f6ddad7f943e821bfc533 Mon Sep 17 00:00:00 2001
From: silversurfer <silversurfer@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 5 Jul 2019 09:17:35 +0000
Subject: [PATCH] Fix: missed some instance of the logic error for merc
 refinement that was fixed in r8679

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp        | 4 ++--
 Laptop/merccompare.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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;