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

-fixed negative ammo prices

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-08-14 03:04:43 +00:00
parent 150d999dc1
commit b105138b2e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.435" }; INT16 zVersionLabel[256] = { L"Release v1.13.438" };
#endif #endif
Tactical/ShopKeeper Interface.cpp
+3 -3
View File
@@ -556,7 +556,7 @@ void SetSkiFaceRegionHelpText( INVENTORY_IN_SLOT *pInv, MOUSE_REGION* pRegion,
void RestoreTacticalBackGround(); void RestoreTacticalBackGround();
void DisplayPlayersOfferArea(); void DisplayPlayersOfferArea();
UINT32 CalcShopKeeperItemPrice( BOOLEAN fDealerSelling, BOOLEAN fUnitPriceOnly, UINT16 usItemID, FLOAT dModifier, OBJECTTYPE *pItemObject ); UINT32 CalcShopKeeperItemPrice( BOOLEAN fDealerSelling, BOOLEAN fUnitPriceOnly, UINT16 usItemID, FLOAT dModifier, OBJECTTYPE *pItemObject );
FLOAT ItemConditionModifier(UINT16 usItemIndex, INT8 bStatus); FLOAT ItemConditionModifier(UINT16 usItemIndex, INT16 bStatus);
BOOLEAN RemoveItemFromPlayersOfferArea( INT8 bSlotIdInOtherLocation ); BOOLEAN RemoveItemFromPlayersOfferArea( INT8 bSlotIdInOtherLocation );
//Evaluate: //Evaluate:
@@ -3142,7 +3142,7 @@ UINT32 CalcShopKeeperItemPrice( BOOLEAN fDealerSelling, BOOLEAN fUnitPriceOnly,
{ {
// for bullets, ItemConditionModifier will convert the #ShotsLeft into a percentage // for bullets, ItemConditionModifier will convert the #ShotsLeft into a percentage
uiUnitPrice += (UINT32)( CalcValueOfItemToDealer( gbSelectedArmsDealerID, usItemID, fDealerSelling ) * uiUnitPrice += (UINT32)( CalcValueOfItemToDealer( gbSelectedArmsDealerID, usItemID, fDealerSelling ) *
(pItemObject->ubShotsLeft[ubCnt] / Magazine[ Item[ usItemID ].ubClassIndex ].ubMagSize) * ItemConditionModifier(usItemID, pItemObject->ubShotsLeft[ubCnt]) *
dModifier ); dModifier );
if ( fUnitPriceOnly ) if ( fUnitPriceOnly )
@@ -3255,7 +3255,7 @@ UINT32 CalcShopKeeperItemPrice( BOOLEAN fDealerSelling, BOOLEAN fUnitPriceOnly,
} }
FLOAT ItemConditionModifier(UINT16 usItemIndex, INT8 bStatus) FLOAT ItemConditionModifier(UINT16 usItemIndex, INT16 bStatus)
{ {
FLOAT dConditionModifier = 1.0f; FLOAT dConditionModifier = 1.0f;