diff --git a/dlls/coldice/chaingun.cpp b/dlls/coldice/chaingun.cpp index 32447294..02bae70c 100644 --- a/dlls/coldice/chaingun.cpp +++ b/dlls/coldice/chaingun.cpp @@ -96,8 +96,8 @@ int CChaingun::GetItemInfo(ItemInfo *p) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = CHAINGUN_MAX_CLIP; - p->iSlot = 2; - p->iPosition = 5; + p->iSlot = 4; + p->iPosition = 0; p->iFlags = 0; p->iId = m_iId = WEAPON_CHAINGUN; p->iWeight = CHAINGUN_WEIGHT; diff --git a/dlls/coldice/cluster_grenade.cpp b/dlls/coldice/cluster_grenade.cpp index 83cca989..a424378e 100644 --- a/dlls/coldice/cluster_grenade.cpp +++ b/dlls/coldice/cluster_grenade.cpp @@ -88,7 +88,7 @@ int CClusterGrenade::GetItemInfo(ItemInfo *p) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 4; + p->iSlot = 7; p->iPosition = 0; p->iId = m_iId = WEAPON_CLUSTERGRENADE; p->iWeight = CLUSTERGRENADE_WEIGHT; diff --git a/dlls/coldice/double_uzi.cpp b/dlls/coldice/double_uzi.cpp index b6c4f906..620c357e 100644 --- a/dlls/coldice/double_uzi.cpp +++ b/dlls/coldice/double_uzi.cpp @@ -93,7 +93,7 @@ int CDoubleUzi::GetItemInfo(ItemInfo *p) p->iMaxAmmo2 = -1; p->iMaxClip = DOUBLEUZI_MAX_CLIP; p->iSlot = 2; - p->iPosition = 4; + p->iPosition = 1; p->iFlags = 0; p->iId = m_iId = WEAPON_DOUBLEUZI; p->iWeight = DOUBLEUZI_WEIGHT; diff --git a/dlls/coldice/grenadel.cpp b/dlls/coldice/grenadel.cpp index 4ce56fc8..6b3157ce 100644 --- a/dlls/coldice/grenadel.cpp +++ b/dlls/coldice/grenadel.cpp @@ -127,7 +127,7 @@ int CGrenadelauncher::GetItemInfo(ItemInfo *p) p->pszAmmo2 = "timed"; p->iMaxAmmo2 = TIMED_MAX_CARRY; p->iMaxClip = GRENADEL_MAX_CLIP; - p->iSlot = 3; + p->iSlot = 6; p->iPosition = 0; p->iId = m_iId = WEAPON_GRENADEL; p->iFlags = 0; diff --git a/dlls/coldice/m16.cpp b/dlls/coldice/m16.cpp index 485232f5..dede9b3b 100644 --- a/dlls/coldice/m16.cpp +++ b/dlls/coldice/m16.cpp @@ -99,7 +99,7 @@ int CM16::GetItemInfo(ItemInfo *p) p->iMaxAmmo2 = -1; p->iMaxClip = M16_MAX_CLIP; p->iSlot = 2; - p->iPosition = 2; + p->iPosition = 0; p->iFlags = 0; p->iId = m_iId = WEAPON_M16; p->iWeight = M16_WEIGHT; diff --git a/dlls/coldice/mac_10.cpp b/dlls/coldice/mac_10.cpp index f0318ba9..1bb777ae 100644 --- a/dlls/coldice/mac_10.cpp +++ b/dlls/coldice/mac_10.cpp @@ -93,7 +93,7 @@ int CMac::GetItemInfo(ItemInfo *p) p->iMaxAmmo2 = -1; p->iMaxClip = MAC10_MAX_CLIP; p->iSlot = 2; - p->iPosition = 3; + p->iPosition = 2; p->iFlags = 0; p->iId = m_iId = WEAPON_MAC10; p->iWeight = MAC10_WEIGHT; diff --git a/dlls/coldice/nukelauncher.cpp b/dlls/coldice/nukelauncher.cpp index 97747bba..71a7219c 100644 --- a/dlls/coldice/nukelauncher.cpp +++ b/dlls/coldice/nukelauncher.cpp @@ -386,8 +386,8 @@ int CNuke::GetItemInfo(ItemInfo *p) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = NUKE_MAX_CLIP; - p->iSlot = 3; - p->iPosition = 4; + p->iSlot = 6; + p->iPosition = 2; p->iId = m_iId = WEAPON_NUKE; p->iFlags = 0; p->iWeight = NUKE_WEIGHT; diff --git a/dlls/coldice/pulse_rifle.cpp b/dlls/coldice/pulse_rifle.cpp index ea629ad2..3d6d9573 100644 --- a/dlls/coldice/pulse_rifle.cpp +++ b/dlls/coldice/pulse_rifle.cpp @@ -263,8 +263,8 @@ int CPulseRifle::GetItemInfo(ItemInfo *p) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 3; - p->iPosition = 3; + p->iSlot = 4; + p->iPosition = 1; p->iId = m_iId = WEAPON_PULSERIFLE; p->iFlags = 0; p->iWeight = PULSERIFLE_WEIGHT; diff --git a/dlls/coldice/rifle.cpp b/dlls/coldice/rifle.cpp index b629739d..f188eaed 100644 --- a/dlls/coldice/rifle.cpp +++ b/dlls/coldice/rifle.cpp @@ -106,8 +106,8 @@ int CRifle::GetItemInfo(ItemInfo *p) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = RIFLE_MAX_CLIP; - p->iSlot = 2; - p->iPosition = 7; + p->iSlot = 5; + p->iPosition = 0; p->iId = WEAPON_RIFLE; p->iFlags = 0; p->iWeight = RIFLE_WEIGHT; diff --git a/dlls/coldice/sshotgun.cpp b/dlls/coldice/sshotgun.cpp index b4d2c66b..31913b92 100644 --- a/dlls/coldice/sshotgun.cpp +++ b/dlls/coldice/sshotgun.cpp @@ -101,8 +101,8 @@ int CSshotgun::GetItemInfo(ItemInfo *p) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = SSHOTGUN_MAX_CLIP; - p->iSlot = 2; - p->iPosition = 0; + p->iSlot = 3; + p->iPosition = 1; p->iFlags = 0; p->iId = m_iId = WEAPON_SSHOTGUN; p->iWeight = SSHOTGUN_WEIGHT; diff --git a/dlls/coldice/tnt.cpp b/dlls/coldice/tnt.cpp index 9fad93fa..7f536e70 100644 --- a/dlls/coldice/tnt.cpp +++ b/dlls/coldice/tnt.cpp @@ -78,8 +78,8 @@ int CKamikaze::GetItemInfo(ItemInfo *p) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 4; - p->iPosition = 2; + p->iSlot = 8; + p->iPosition = 1; p->iId = m_iId = WEAPON_TNT; p->iWeight = TNT_WEIGHT; p->iFlags = 0; diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp index 979b7a66..c9440f82 100644 --- a/dlls/crossbow.cpp +++ b/dlls/crossbow.cpp @@ -252,8 +252,8 @@ int CCrossbow::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = BOLTGUN_MAX_CLIP; - p->iSlot = 2; - p->iPosition = 2; + p->iSlot = 4; + p->iPosition = 1; p->iId = WEAPON_BOLTGUN; p->iFlags = 0; p->iWeight = BOLTGUN_WEIGHT; diff --git a/dlls/egon.cpp b/dlls/egon.cpp index 58accf00..b90293db 100644 --- a/dlls/egon.cpp +++ b/dlls/egon.cpp @@ -120,7 +120,7 @@ int CEgon::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 3; + p->iSlot = 4; p->iPosition = 2; p->iId = m_iId = WEAPON_RAILGUN; p->iFlags = 0; diff --git a/dlls/handgrenade.cpp b/dlls/handgrenade.cpp index 063b2886..aeb98eb3 100644 --- a/dlls/handgrenade.cpp +++ b/dlls/handgrenade.cpp @@ -66,8 +66,8 @@ int CHandGrenade::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 4; - p->iPosition = 0; + p->iSlot = 7; + p->iPosition = 2; p->iId = m_iId = WEAPON_HANDGRENADE; p->iWeight = HANDGRENADE_WEIGHT; p->iFlags = ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE; diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp index 4739635a..fbc69ade 100644 --- a/dlls/rpg.cpp +++ b/dlls/rpg.cpp @@ -361,7 +361,7 @@ int CRpg::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = "heli-rockets"; p->iMaxAmmo2 = HELIROCKET_MAX_CARRY; p->iMaxClip = ROCKETL_MAX_CLIP; - p->iSlot = 3; + p->iSlot = 6; p->iPosition = 1; p->iId = m_iId = WEAPON_ROCKETL; p->iFlags = 0; diff --git a/dlls/satchel.cpp b/dlls/satchel.cpp index 48ec5b9a..41862a5c 100644 --- a/dlls/satchel.cpp +++ b/dlls/satchel.cpp @@ -244,8 +244,8 @@ int CSatchel::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 4; - p->iPosition = 1; + p->iSlot = 7; + p->iPosition = 3; p->iFlags = ITEM_FLAG_SELECTONEMPTY | ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE; p->iId = m_iId = WEAPON_SATCHEL; p->iWeight = SATCHEL_WEIGHT; diff --git a/dlls/shotgun.cpp b/dlls/shotgun.cpp index 3dd30526..4bd5e04a 100644 --- a/dlls/shotgun.cpp +++ b/dlls/shotgun.cpp @@ -96,8 +96,8 @@ int CShotgun::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = ASHOTGUN_MAX_CLIP; - p->iSlot = 2; - p->iPosition = 1; + p->iSlot = 3; + p->iPosition = 0; p->iFlags = 0; p->iId = m_iId = WEAPON_ASHOTGUN; p->iWeight = ASHOTGUN_WEIGHT; diff --git a/dlls/squeakgrenade.cpp b/dlls/squeakgrenade.cpp index 113c456c..064b08d7 100644 --- a/dlls/squeakgrenade.cpp +++ b/dlls/squeakgrenade.cpp @@ -457,8 +457,8 @@ int CSqueak::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 4; - p->iPosition = 1; + p->iSlot = 8; + p->iPosition = 0; p->iId = m_iId = WEAPON_CHUMTOAD; p->iWeight = CHUMTOAD_WEIGHT; p->iFlags = ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE; diff --git a/dlls/tripmine.cpp b/dlls/tripmine.cpp index e2e2f315..a825f0b5 100644 --- a/dlls/tripmine.cpp +++ b/dlls/tripmine.cpp @@ -386,8 +386,8 @@ int CTripmine::GetItemInfo( ItemInfo *p ) p->pszAmmo2 = NULL; p->iMaxAmmo2 = -1; p->iMaxClip = WEAPON_NOCLIP; - p->iSlot = 4; - p->iPosition = 3; + p->iSlot = 7; + p->iPosition = 1; p->iId = m_iId = WEAPON_TRIPMINE; p->iWeight = TRIPMINE_WEIGHT; p->iFlags = ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE;