1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: missed some instance of the logic error for merc refinement that was fixed in r8679

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2019-07-05 09:17:35 +00:00
parent 706c6378c2
commit a6d7c95abb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -55,8 +55,8 @@
#endif #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 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 // SAVE_GAME_VERSION is defined in header, change it there
Laptop/merccompare.cpp
+1 -1
View File
@@ -618,7 +618,7 @@ BOOLEAN DisplayMercData( UINT8 usProfileA, UINT8 usProfileB )
{ {
if ( pProfileA->bRefinement * pProfileB->bRefinement == 2 ) if ( pProfileA->bRefinement * pProfileB->bRefinement == 2 )
val = -2 * gGameExternalOptions.sMoraleModRefinement; 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; val = -gGameExternalOptions.sMoraleModRefinement;
else else
val = gGameExternalOptions.sMoraleModRefinement; val = gGameExternalOptions.sMoraleModRefinement;