From 9dc17723fc3e57ddc98023a3d0ee72899ae31c62 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Fri, 28 Jul 2006 19:38:57 +0000 Subject: [PATCH] -fixed steath.col -> stealth.col typo in Animation Control.cpp -changed when equipment bonuses are applied to better handle dropping / throwing items git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@377 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 4 ++-- Tactical/Animation Control.cpp | 2 +- Tactical/Interface Panels.cpp | 2 ++ Tactical/Items.cpp | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 9e2b3d7c9..ed248c735 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.368" }; + INT16 zVersionLabel[256] = { L"Release v1.13.377" }; #endif -INT8 czVersionNumber[16] = { "Build 06.07.22" }; +INT8 czVersionNumber[16] = { "Build 06.07.28" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp index 49ed02e35..d2cbc9507 100644 --- a/Tactical/Animation Control.cpp +++ b/Tactical/Animation Control.cpp @@ -3212,7 +3212,7 @@ INT8 GetBodyTypePaletteSubstitutionCode( SOLDIERTYPE *pSoldier, UINT8 ubBodyType // Check for cammo... if ( GetWornStealth(pSoldier) >= 50 ) { - strcpy( zColFilename, "ANIMS\\steath.col" ); + strcpy( zColFilename, "ANIMS\\stealth.col" ); return( 1 ); } else if ( ( pSoldier->bCamo + pSoldier->wornCamo ) >= 50 ) diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 5c19ce59e..095ee18c7 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -2033,6 +2033,8 @@ void RenderSMPanel( BOOLEAN *pfDirty ) FindFontRightCoordinates(SM_WEIGHT_X, SM_WEIGHT_Y ,SM_PERCENT_WIDTH ,SM_PERCENT_HEIGHT ,sString, BLOCKFONT2, &usX, &usY); mprintf( usX, usY , sString ); + ApplyEquipmentBonuses(gpSMCurrentMerc); + // Display cammo value! swprintf( sString, L"%3d", max(0, min( (gpSMCurrentMerc->bCamo + gpSMCurrentMerc->wornCamo),100 )) ); FindFontRightCoordinates(SM_CAMMO_X, SM_CAMMO_Y ,SM_PERCENT_WIDTH ,SM_PERCENT_HEIGHT ,sString, BLOCKFONT2, &usX, &usY); diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 8198fe0dd..43e8c7476 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -3711,8 +3711,6 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj ) UpdateRobotControllerGivenController( pSoldier ); } - ApplyEquipmentBonuses(pSoldier); - return( TRUE ); }