Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bcompat issue with cs_s/get_user_backpackammo() by not relying on m_rgpPlayerItems to get ammo index

Browse Source
This commit is contained in:
Arkshine 2016-02-25 22:17:25 +01:00
parent 62a7fe0be5
commit da2abb9c3b
4 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cstrike/cstrike/CstrikeItemsInfos.cpp
View File

@ -15,7 +15,7 @@
#include "CstrikeHacks.h" #include "CstrikeHacks.h"
CsItemInfo ItemsManager; CsItemInfo ItemsManager;
char WeaponNameList[MAX_WEAPONS][64]; ItemInfo WeaponsList[MAX_WEAPONS];
#define PSTATE_ALIASES_TYPE 0 #define PSTATE_ALIASES_TYPE 0
#define PSTATE_ALIASES_ALIAS 1 #define PSTATE_ALIASES_ALIAS 1
@ -202,7 +202,7 @@ bool CsItemInfo::GetAliasInfosFromName(const char *name, AliasInfo *info)
for (size_t id = 0; id < ARRAYSIZE(WeaponNameList); ++id) for (size_t id = 0; id < ARRAYSIZE(WeaponNameList); ++id)
{ {
const char *weapon = WeaponNameList[id]; const char *weapon = WeaponsList[id].name.chars();
if (weapon[prefix_weapon_length] == '_' && !strncmp(weapon, prefix_weapon, prefix_weapon_length)) if (weapon[prefix_weapon_length] == '_' && !strncmp(weapon, prefix_weapon, prefix_weapon_length))
{ {

33
modules/cstrike/cstrike/CstrikeItemsInfos.h
View File

@ -20,6 +20,37 @@
#include <amtl/am-string.h> #include <amtl/am-string.h>
#include <sm_stringhashmap.h> #include <sm_stringhashmap.h>
struct ItemInfo
{
ItemInfo() : name("Empty"), ammoIndex1(-1), maxAmmo1(0), ammoIndex2(-1), maxAmmo2(0), slot(0), position(0), id(0), flags(0)
{}
ItemInfo &operator = (ItemInfo &other)
{
name = other.name;
ammoIndex1 = other.ammoIndex1;
maxAmmo1 = other.maxAmmo1;
ammoIndex2 = other.ammoIndex2;
maxAmmo2 = other.maxAmmo2;
slot = other.slot;
position = other.position;
id = other.id;
flags = other.flags;
return *this;
}
ke::AString name;
int ammoIndex1;
int maxAmmo1;
int ammoIndex2;
int maxAmmo2;
int slot;
int position;
int id;
int flags;
};
struct AliasInfo struct AliasInfo
{ {
AliasInfo() AliasInfo()
@ -102,7 +133,7 @@ class CsItemInfo : public ITextListener_SMC
int m_EquipmentsPrice[static_cast<size_t>(Equipments::Count)]; int m_EquipmentsPrice[static_cast<size_t>(Equipments::Count)];
}; };
extern char WeaponNameList[MAX_WEAPONS][64]; extern ItemInfo WeaponsList[MAX_WEAPONS];
extern CsItemInfo ItemsManager; extern CsItemInfo ItemsManager;
#endif // _CSTRIKE_WEAPONS_INFOS_H_ #endif // _CSTRIKE_WEAPONS_INFOS_H_

65
modules/cstrike/cstrike/CstrikeNatives.cpp
View File

@ -731,81 +731,46 @@ static cell AMX_NATIVE_CALL cs_set_user_defusekit(AMX *amx, cell *params)
// native cs_get_user_bpammo(index, weapon); // native cs_get_user_bpammo(index, weapon);
static cell AMX_NATIVE_CALL cs_get_user_backpackammo(AMX *amx, cell *params) static cell AMX_NATIVE_CALL cs_get_user_backpackammo(AMX *amx, cell *params)
{ {
GET_OFFSET("CBasePlayer" , m_rgpPlayerItems ); GET_OFFSET("CBasePlayer", m_rgAmmo);
GET_OFFSET("CBasePlayer" , m_rgAmmo );
GET_OFFSET("CBasePlayerItem" , m_pNext );
GET_OFFSET("CBasePlayerItem" , m_iId );
GET_OFFSET("CBasePlayerWeapon", m_iPrimaryAmmoType);
int index = params[1]; int index = params[1];
int weaponId = params[2]; int weaponId = params[2];
CHECK_PLAYER(index); CHECK_PLAYER(index);
edict_t *pPlayer = MF_GetPlayerEdict(index);
if (weaponId < CSW_P228 || weaponId > CSW_P90 || weaponId == CSW_KNIFE) int ammoIndex;
if (weaponId <= CSW_NONE || weaponId >= MAX_WEAPONS || (ammoIndex = WeaponsList[weaponId].ammoIndex1) < 0)
{ {
MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id %d", params[2]); MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id %d", weaponId);
return 0; return 0;
} }
for (size_t i = 0; i < MAX_WEAPON_SLOTS; ++i) return get_pdata<int>(MF_GetPlayerEdict(index), m_rgAmmo, ammoIndex);
{
uintptr_t *pItem = get_pdata<uintptr_t*>(pPlayer, m_rgpPlayerItems, i);
while (pItem)
{
if (weaponId == get_pdata<int>(pItem, m_iId))
{
return get_pdata<int>(pPlayer, m_rgAmmo, get_pdata<int>(pItem, m_iPrimaryAmmoType));
}
pItem = get_pdata<uintptr_t*>(pItem, m_pNext);
}
}
return 0;
} }
// native cs_set_user_bpammo(index, weapon, amount); // native cs_set_user_bpammo(index, weapon, amount);
static cell AMX_NATIVE_CALL cs_set_user_backpackammo(AMX *amx, cell *params) static cell AMX_NATIVE_CALL cs_set_user_backpackammo(AMX *amx, cell *params)
{ {
GET_OFFSET("CBasePlayer" , m_rgpPlayerItems ); GET_OFFSET("CBasePlayer", m_rgAmmo);
GET_OFFSET("CBasePlayer" , m_rgAmmo );
GET_OFFSET("CBasePlayerItem" , m_pNext );
GET_OFFSET("CBasePlayerItem" , m_iId );
GET_OFFSET("CBasePlayerWeapon", m_iPrimaryAmmoType);
int index = params[1]; int index = params[1];
int weaponId = params[2]; int weaponId = params[2];
int amount = params[3]; int amount = params[3];
CHECK_PLAYER(index); CHECK_PLAYER(index);
edict_t *pPlayer = MF_GetPlayerEdict(index);
if (weaponId < CSW_P228 || weaponId > CSW_P90 || weaponId == CSW_KNIFE) int ammoIndex;
if (weaponId <= CSW_NONE || weaponId >= MAX_WEAPONS || (ammoIndex = WeaponsList[weaponId].ammoIndex1) < 0)
{ {
MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id %d", params[2]); MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id %d", weaponId);
return 0; return 0;
} }
for (size_t i = 0; i < MAX_WEAPON_SLOTS; ++i) set_pdata<int>(MF_GetPlayerEdict(index), m_rgAmmo, amount, ammoIndex);
{
uintptr_t *pItem = get_pdata<uintptr_t*>(pPlayer, m_rgpPlayerItems, i);
while (pItem) return 1;
{
if (weaponId == get_pdata<int>(pItem, m_iId))
{
set_pdata<int>(pPlayer, m_rgAmmo, amount, get_pdata<int>(pItem, m_iPrimaryAmmoType));
return 1;
}
pItem = get_pdata<uintptr_t*>(pItem, m_pNext);
}
}
return 0;
} }
// native cs_get_user_nvg(index); // native cs_get_user_nvg(index);
@ -1903,7 +1868,7 @@ static cell AMX_NATIVE_CALL cs_get_translated_item_alias(AMX* amx, cell* params)
default: default:
{ {
// weapon_* retrieved from WeaponList messages at map change. // weapon_* retrieved from WeaponList messages at map change.
name = WeaponNameList[info.itemid]; name = WeaponsList[info.itemid].name.chars();
break; break;
} }
} }

42
modules/cstrike/cstrike/CstrikeUserMessages.cpp
View File

@ -21,8 +21,8 @@
bool ShouldBlock; bool ShouldBlock;
bool ShouldBlockHLTV; bool ShouldBlockHLTV;
bool ShouldDisableHooks; bool ShouldDisableHooks;
bool RetrieveWeaponName; bool RetrieveWeaponList;
ke::AString CurrentWeaponName; ItemInfo CurrentWeaponList;
int ArgPosition; int ArgPosition;
int MessageIdArmorType; int MessageIdArmorType;
@ -132,7 +132,19 @@ void OnMessageBegin(int msg_dest, int msg_type, const float *pOrigin, edict_t *p
{ {
if (msg_type == MessageIdWeaponList) if (msg_type == MessageIdWeaponList)
{ {
RetrieveWeaponName = true; // MESSAGE_BEGIN(MSG_INIT, gmsgWeaponList);
// WRITE_STRING(pszName);
// WRITE_BYTE(CBasePlayer::GetAmmoIndex(II.pszAmmo1));
// WRITE_BYTE(II.iMaxAmmo1);
// WRITE_BYTE(CBasePlayer::GetAmmoIndex(II.pszAmmo2));
// WRITE_BYTE(II.iMaxAmmo2);
// WRITE_BYTE(II.iSlot);
// WRITE_BYTE(II.iPosition);
// WRITE_BYTE(II.iId);
// WRITE_BYTE(II.iFlags);
// MESSAGE_END();
//
RetrieveWeaponList = true;
} }
} }
} }
@ -152,9 +164,19 @@ void OnWriteByte(int value)
RETURN_META(MRES_SUPERCEDE); RETURN_META(MRES_SUPERCEDE);
} }
if (RetrieveWeaponName && ++ArgPosition == 7 && value >= 0 && value < MAX_WEAPONS) if (RetrieveWeaponList)
{ {
strncopy(WeaponNameList[value], CurrentWeaponName.chars(), sizeof(WeaponNameList[value])); switch (++ArgPosition)
{
case 1: CurrentWeaponList.ammoIndex1 = value;
case 2: CurrentWeaponList.maxAmmo1 = value;
case 3: CurrentWeaponList.ammoIndex2 = value;
case 4: CurrentWeaponList.maxAmmo2 = value;
case 5: CurrentWeaponList.slot = value;
case 6: CurrentWeaponList.position = value;
case 7: CurrentWeaponList.id = value;
case 8: CurrentWeaponList.flags = value;
}
} }
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
@ -167,9 +189,9 @@ void OnWriteString(const char *value)
RETURN_META(MRES_SUPERCEDE); RETURN_META(MRES_SUPERCEDE);
} }
if (RetrieveWeaponName) if (RetrieveWeaponList)
{ {
CurrentWeaponName = value; CurrentWeaponList.name = value;
} }
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
@ -190,10 +212,12 @@ void OnMessageEnd(void)
RETURN_META(MRES_SUPERCEDE); RETURN_META(MRES_SUPERCEDE);
} }
if (RetrieveWeaponName) if (RetrieveWeaponList)
{ {
RetrieveWeaponName = false; RetrieveWeaponList = false;
ArgPosition = 0; ArgPosition = 0;
WeaponsList[CurrentWeaponList.id] = CurrentWeaponList;
} }
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);