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

-removed some hard coded item indexes from ArmsDealerInvInit.cpp & items.cpp

Browse Source 
-fixed canteen merging w/ctrl+click


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-06-26 17:55:11 +00:00
parent 8579bc4a24
commit 3b38f5dac5
3 changed files with 25 additions and 22 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.304" }; INT16 zVersionLabel[256] = { L"Release v1.13.305" };
#endif #endif
Tactical/ArmsDealerInvInit.cpp
+13 -13
View File
@@ -900,21 +900,21 @@ UINT8 GetCurrentSuitabilityForItem( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEA
} }
// the following staple items are always deemed highly suitable regardless of player's progress: // the following staple items are always deemed highly suitable regardless of player's progress:
switch (usItemIndex) //switch (usItemIndex)
{ //{
case FIRSTAIDKIT: // case FIRSTAIDKIT:
case MEDICKIT: // case MEDICKIT:
case TOOLKIT: // case TOOLKIT:
case LOCKSMITHKIT: // case LOCKSMITHKIT:
case CANTEEN:
case CROWBAR:
case JAR:
case JAR_ELIXIR:
case JAR_CREATURE_BLOOD:
// case CANTEEN:
// case CROWBAR:
// case JAR:
// case JAR_ELIXIR:
// case JAR_CREATURE_BLOOD:
if ( Item[usItemIndex].medical || Item[usItemIndex].canteen || Item[usItemIndex].medicalkit || Item[usItemIndex].locksmithkit || Item[usItemIndex].toolkit || Item[usItemIndex].crowbar || Item[usItemIndex].jar )
return(ITEM_SUITABILITY_ALWAYS); return(ITEM_SUITABILITY_ALWAYS);
} //}
// If it's not BobbyRay, Tony, or Devin // If it's not BobbyRay, Tony, or Devin
Tactical/Items.cpp
+11 -8
View File
@@ -2396,7 +2396,7 @@ void CleanUpStack( OBJECTTYPE * pObj, OBJECTTYPE * pCursorObj )
INT8 bLoop, bLoop2; INT8 bLoop, bLoop2;
INT8 bMaxPoints, bPointsToMove; INT8 bMaxPoints, bPointsToMove;
if ( !(Item[ pObj->usItem ].usItemClass & IC_AMMO || Item[ pObj->usItem ].usItemClass & IC_KIT || Item[ pObj->usItem ].usItemClass & IC_MEDKIT ) ) if ( !(Item[ pObj->usItem ].usItemClass & IC_AMMO || Item[ pObj->usItem ].usItemClass & IC_KIT || Item[ pObj->usItem ].usItemClass & IC_MEDKIT || Item[pObj->usItem].canteen ) )
{ {
return; return;
} }
@@ -5423,13 +5423,16 @@ BOOLEAN DamageItemOnGround( OBJECTTYPE * pObject, INT16 sGridNo, INT8 bLevel, IN
INT8 IsMedicalKitItem( OBJECTTYPE *pObject ) INT8 IsMedicalKitItem( OBJECTTYPE *pObject )
{ {
// check item id against current medical kits // check item id against current medical kits
switch( pObject->usItem ) if ( Item[pObject->usItem].medicalkit )
{ return 1;
case( MEDICKIT ):
// medical bag, return 1 //switch( pObject->usItem )
return ( 1 ); //{
break; // case( MEDICKIT ):
} // // medical bag, return 1
// return ( 1 );
// break;
//}
return( 0 ); return( 0 );
} }