mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
-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
This commit is contained in:
+2
-2
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
//RELEASE BUILD VERSION
|
//RELEASE BUILD VERSION
|
||||||
INT16 zVersionLabel[256] = { L"Release v1.13.368" };
|
INT16 zVersionLabel[256] = { L"Release v1.13.377" };
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
INT8 czVersionNumber[16] = { "Build 06.07.22" };
|
INT8 czVersionNumber[16] = { "Build 06.07.28" };
|
||||||
INT16 zTrackingNumber[16] = { L"Z" };
|
INT16 zTrackingNumber[16] = { L"Z" };
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3212,7 +3212,7 @@ INT8 GetBodyTypePaletteSubstitutionCode( SOLDIERTYPE *pSoldier, UINT8 ubBodyType
|
|||||||
// Check for cammo...
|
// Check for cammo...
|
||||||
if ( GetWornStealth(pSoldier) >= 50 )
|
if ( GetWornStealth(pSoldier) >= 50 )
|
||||||
{
|
{
|
||||||
strcpy( zColFilename, "ANIMS\\steath.col" );
|
strcpy( zColFilename, "ANIMS\\stealth.col" );
|
||||||
return( 1 );
|
return( 1 );
|
||||||
}
|
}
|
||||||
else if ( ( pSoldier->bCamo + pSoldier->wornCamo ) >= 50 )
|
else if ( ( pSoldier->bCamo + pSoldier->wornCamo ) >= 50 )
|
||||||
|
|||||||
@@ -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);
|
FindFontRightCoordinates(SM_WEIGHT_X, SM_WEIGHT_Y ,SM_PERCENT_WIDTH ,SM_PERCENT_HEIGHT ,sString, BLOCKFONT2, &usX, &usY);
|
||||||
mprintf( usX, usY , sString );
|
mprintf( usX, usY , sString );
|
||||||
|
|
||||||
|
ApplyEquipmentBonuses(gpSMCurrentMerc);
|
||||||
|
|
||||||
// Display cammo value!
|
// Display cammo value!
|
||||||
swprintf( sString, L"%3d", max(0, min( (gpSMCurrentMerc->bCamo + gpSMCurrentMerc->wornCamo),100 )) );
|
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);
|
FindFontRightCoordinates(SM_CAMMO_X, SM_CAMMO_Y ,SM_PERCENT_WIDTH ,SM_PERCENT_HEIGHT ,sString, BLOCKFONT2, &usX, &usY);
|
||||||
|
|||||||
@@ -3711,8 +3711,6 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj )
|
|||||||
UpdateRobotControllerGivenController( pSoldier );
|
UpdateRobotControllerGivenController( pSoldier );
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplyEquipmentBonuses(pSoldier);
|
|
||||||
|
|
||||||
return( TRUE );
|
return( TRUE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user