From f9701168404669922a4d53eab0da919be158435c Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 6 Nov 2012 00:55:33 +0000 Subject: [PATCH] Fix: disguising as a soldier did not always work because of string comparisons git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5671 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 5664f29ee..0ee872468 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -9326,8 +9326,11 @@ BOOLEAN ApplyClothes( SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj) // we now have to determine wether we are currently wearing civilian or military clothes for ( int i = UNIFORM_ENEMY_ADMIN; i <= UNIFORM_ENEMY_ELITE; ++i ) { - if ( pSoldier->VestPal == gUniformColors[ i ].vest && pSoldier->PantsPal == gUniformColors[ i ].pants ) + if ( COMPARE_PALETTEREP_ID(pSoldier->VestPal, gUniformColors[ i ].vest) && COMPARE_PALETTEREP_ID(pSoldier->PantsPal, gUniformColors[ i ].pants) ) + { pSoldier->bSoldierFlagMask |= SOLDIER_COVERT_SOLDIER; + break; + } } // if not dressed as a soldier, we must be dressed as a civilian