1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gun selection at shopkeepers is pre-sorted by weapon type (by DepressivesBrot)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-01-14 22:41:48 +00:00
parent 7163e98b6e
commit 87809f222f
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/ArmsDealerInvInit.cpp
+16 -1
View File
@@ -1353,6 +1353,21 @@ int CompareItemsForSorting( UINT16 usItem1Index, UINT16 usItem2Index, UINT16 ubI
return( 1 );
}
if ( Item[usItem1Index].usItemClass == IC_GUN && Item[usItem2Index].usItemClass == IC_GUN )
{
UINT8 ubItem1WeaponType = Weapon[Item[usItem1Index].ubClassIndex].ubWeaponType;
UINT8 ubItem2WeaponType = Weapon[Item[usItem2Index].ubClassIndex].ubWeaponType;
if ( ubItem1WeaponType < ubItem2WeaponType )
{
return (-1);
}
else if ( ubItem1WeaponType > ubItem2WeaponType )
{
return (1);
}
}
// the same category
//if ( Item[ usItem1Index ].usItemClass == IC_AMMO && Item[ usItem2Index ].usItemClass == IC_AMMO )
//{
@@ -1467,7 +1482,7 @@ UINT8 GetDealerItemCategoryNumber( UINT16 usItemIndex )
if ( usItemIndex < gMAXITEMS_READ && IsWeapon( usItemIndex ) )
{
ubWeaponClass = 0;// Madd: commented out so we can sort guns by name instead ... Weapon[ usItemIndex ].ubWeaponClass;
ubWeaponClass = Weapon[usItemIndex].ubWeaponClass;
}
else
{