From 89666fa78c29f25bdc7a43b9825db17c128b96d4 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 16 Mar 2013 21:47:26 +0000 Subject: [PATCH] Fix: applying a rag removed camo, but did not refresh face git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5925 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Panels.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index e0152f9d..52d8fc42 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -3354,11 +3354,10 @@ void SMInvClickCamoCallback( MOUSE_REGION * pRegion, INT32 iReason ) // This should fix the bug and crashes with missing faces if (gGameExternalOptions.fShowCamouflageFaces == TRUE ) { - if (SetCamoFace( gpSMCurrentMerc )) - { - DeleteSoldierFace( gpSMCurrentMerc );// remove face - gpSMCurrentMerc->iFaceIndex = InitSoldierFace( gpSMCurrentMerc );// create new face - } + // Flugente: refresh face regardless of result of SetCamoFace(), otherwise applying a rag will not clean the picture + SetCamoFace( gpSMCurrentMerc ); + DeleteSoldierFace( gpSMCurrentMerc );// remove face + gpSMCurrentMerc->iFaceIndex = InitSoldierFace( gpSMCurrentMerc );// create new face }