Cleanup duplicated code, and a big wtf?

offsActiveWeapon was never declared, guess we never found out because the functions where unused. WeaponsGetActiveWeaponSlot is still unused, leaving in might be usefull somewhen in the future.
This commit is contained in:
zaCade 2019-09-28 13:19:56 +02:00
parent 78993cbc70
commit bb37965670
5 changed files with 21 additions and 40 deletions

View File

@ -160,12 +160,11 @@ public void KnockbackOnTakeDamageAlivePost(int victim, int attacker, int inflict
GetClientAbsOrigin(victim, clientloc); GetClientAbsOrigin(victim, clientloc);
char weaponname[64]; char weaponname[64];
int active_weapon = -42;
if (inflictor == attacker) if (inflictor == attacker)
{ {
active_weapon = ToolsGetClientActiveWeapon(attacker); int activeweapon = WeaponsGetActiveWeaponIndex(attacker);
if (active_weapon > 0) if (activeweapon > 0)
GetEdictClassname(active_weapon, weaponname, sizeof(weaponname)); GetEdictClassname(activeweapon, weaponname, sizeof(weaponname));
} }
else else
GetEdictClassname(inflictor, weaponname, sizeof(weaponname)); GetEdictClassname(inflictor, weaponname, sizeof(weaponname));

View File

@ -33,7 +33,6 @@ new g_iToolsLMV;
new g_iToolsHasNightVision; new g_iToolsHasNightVision;
new g_iToolsNightVisionOn; new g_iToolsNightVisionOn;
new g_iToolsFOV; new g_iToolsFOV;
new g_iActiveWeapon;
new g_iToolsLastHitGroup; new g_iToolsLastHitGroup;
/** /**
@ -92,13 +91,6 @@ ToolsFindOffsets()
LogEvent(false, LogType_Fatal, LOG_CORE_EVENTS, LogModule_Tools, "Offsets", "Offset \"CBasePlayer::m_iFOV\" was not found."); LogEvent(false, LogType_Fatal, LOG_CORE_EVENTS, LogModule_Tools, "Offsets", "Offset \"CBasePlayer::m_iFOV\" was not found.");
} }
// If offset "m_hActiveWeapon" can't be found, then stop the plugin.
g_iActiveWeapon = FindSendPropInfo("CBaseCombatCharacter", "m_hActiveWeapon");
if (g_iActiveWeapon == -1)
{
LogEvent(false, LogType_Fatal, LOG_CORE_EVENTS, LogModule_Tools, "Offsets", "Offset \"CBaseCombatCharacter::m_hActiveWeapon\" was not found.");
}
Handle hGameConf = LoadGameConfigFile("zombiereloaded"); Handle hGameConf = LoadGameConfigFile("zombiereloaded");
if (hGameConf != INVALID_HANDLE) if (hGameConf != INVALID_HANDLE)
{ {

View File

@ -251,16 +251,6 @@ stock ToolsGetEntityColor(entity, color[4])
color[i] = GetEntData(entity, offset + i, 1); color[i] = GetEntData(entity, offset + i, 1);
} }
/**
* Get client's m_hActiveWeapon.
*
* @param client The client index.
*/
stock int ToolsGetClientActiveWeapon(int client)
{
return GetEntDataEnt2(client, g_iActiveWeapon);
}
/** /**
* Get client's m_LastHitGroup. * Get client's m_LastHitGroup.
* *

View File

@ -76,6 +76,11 @@ enum WeaponsData
*/ */
new g_iToolsActiveWeapon; new g_iToolsActiveWeapon;
/**
* Variable to store buyzone offset value.
*/
new g_iToolsInBuyZone;
/** /**
* Weapon slots. * Weapon slots.
*/ */
@ -749,35 +754,35 @@ stock WeaponsGetClientWeapons(client, weapons[WeaponsSlot])
} }
/** /**
* Returns weapon index of the client's deployed weapon. * Returns weapon index of the client's active weapon.
* *
* @param client The client index. * @param client The client index.
* @return The weapon index of the deployed weapon. * @return The weapon index of the active weapon.
* -1 if no weapon is deployed. * -1 if no weapon is active.
*/ */
stock WeaponsGetDeployedWeaponIndex(client) stock WeaponsGetActiveWeaponIndex(client)
{ {
// Return the client's active weapon. // Return the client's active weapon.
return GetEntDataEnt2(client, offsActiveWeapon); return GetEntDataEnt2(client, g_iToolsActiveWeapon);
} }
/** /**
* Returns slot of client's deployed weapon. * Returns slot of client's active weapon.
* *
* @param client The client index. * @param client The client index.
* @return The slot number of deployed weapon. * @return The slot number of active weapon.
*/ */
stock WeaponsSlot:WeaponsGetDeployedWeaponSlot(client) stock WeaponsSlot:WeaponsGetActiveWeaponSlot(client)
{ {
// Get all client's weapon indexes. // Get all client's weapon indexes.
new weapons[WeaponsSlot]; new weapons[WeaponsSlot];
WeaponsGetClientWeapons(client, weapons); WeaponsGetClientWeapons(client, weapons);
// Get client's deployed weapon. // Get client's active weapon.
new deployedweapon = WeaponsGetDeployedWeaponIndex(client); new activeweapon = WeaponsGetActiveWeaponIndex(client);
// If client has no deployed weapon, then stop. // If client has no active weapon, then stop.
if (deployedweapon == -1) if (activeweapon == -1)
{ {
return Type_Invalid; return Type_Invalid;
} }
@ -785,7 +790,7 @@ stock WeaponsSlot:WeaponsGetDeployedWeaponSlot(client)
// x = weapon slot. // x = weapon slot.
for (new x = 0; x < WEAPONS_SLOTS_MAX; x++) for (new x = 0; x < WEAPONS_SLOTS_MAX; x++)
{ {
if (weapons[x] == deployedweapon) if (weapons[x] == activeweapon)
{ {
return WeaponsSlot:x; return WeaponsSlot:x;
} }

View File

@ -39,11 +39,6 @@
*/ */
#define ZMARKET_REBUY_WEAPONS_SLOTS_MAX 1 #define ZMARKET_REBUY_WEAPONS_SLOTS_MAX 1
/**
* Variable to store buyzone offset value.
*/
new g_iToolsInBuyZone;
/** /**
* Array to store the client's current weapon type within menu. * Array to store the client's current weapon type within menu.
*/ */