Skip to content

Update spechud.sp - MP5 reserve ammo #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SirPlease merged 2 commits into from
Nov 3, 2026
Merged

Update spechud.sp - MP5 reserve ammo #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dace4ff
Update spechud.sp - MP5 reserve ammo
theletterjwithadot Oct 29, 2026
99317da
Read reserve ammo from the weapon's ammo type instead
SirPlease Nov 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified addons/sourcemod/plugins/optional/spechud.smx
View file
Open in desktop
Binary file not shown.
61 changes: 13 additions & 48 deletions addons/sourcemod/scripting/spechud.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <lerpmonitor>
#include <witch_and_tankifier>

#define PLUGIN_VERSION "3.9.1"
#define PLUGIN_VERSION "3.9.2"

public Plugin myinfo =
{
Expand Down Expand Up @@ -643,7 +643,7 @@ void GetWeaponInfo(int client, char[] info, int length)
default:
{
GetLongWeaponName(primaryWepId, buffer, sizeof(buffer));
FormatEx(info, length, "%s %i/%i", buffer, GetWeaponClipAmmo(primaryWep), GetWeaponExtraAmmo(client, primaryWepId));
FormatEx(info, length, "%s %i/%i", buffer, GetWeaponClipAmmo(primaryWep), GetWeaponExtraAmmo(client, primaryWep));
}
}

Expand Down Expand Up @@ -674,7 +674,7 @@ void GetWeaponInfo(int client, char[] info, int length)
else
{
GetLongWeaponName(primaryWepId, buffer, sizeof(buffer));
Format(info, length, "%s | %s %i", info, buffer, GetWeaponClipAmmo(primaryWep) + GetWeaponExtraAmmo(client, primaryWepId));
Format(info, length, "%s | %s %i", info, buffer, GetWeaponClipAmmo(primaryWep) + GetWeaponExtraAmmo(client, primaryWep));
}
}
}
Expand Down Expand Up @@ -1226,53 +1226,18 @@ void FillGameInfo(Panel hSpecHud)
/**
* Stocks
**/
/**
* Datamap m_iAmmo
* offset to add - gun(s) - control cvar
*
* +12: M4A1, AK74, Desert Rifle, also SG552 - ammo_assaultrifle_max
* +20: both SMGs, also the MP5 - ammo_smg_max
* +28: both Pump Shotguns - ammo_shotgun_max
* +32: both autoshotguns - ammo_autoshotgun_max
* +36: Hunting Rifle - ammo_huntingrifle_max
* +40: Military Sniper, AWP, Scout - ammo_sniperrifle_max
* +68: Grenade Launcher - ammo_grenadelauncher_max
*/
/* Reads the reserve slot through the weapon's own ammo type, so every gun
* (MP5, M60, and any added later) resolves without a hand-kept table. */
stock int GetWeaponExtraAmmo(int client, int weapon)
{
if (weapon <= 0)
return -1;

#define ASSAULT_RIFLE_OFFSET_IAMMO 12
#define SMG_OFFSET_IAMMO 20
#define PUMPSHOTGUN_OFFSET_IAMMO 28
#define AUTO_SHOTGUN_OFFSET_IAMMO 32
#define HUNTING_RIFLE_OFFSET_IAMMO 36
#define MILITARY_SNIPER_OFFSET_IAMMO 40
#define GRENADE_LAUNCHER_OFFSET_IAMMO 68
int ammoType = GetEntProp(weapon, Prop_Send, "m_iPrimaryAmmoType");
if (ammoType < 0)
return -1;

stock int GetWeaponExtraAmmo(int client, int wepid)
{
static int ammoOffset;
if (!ammoOffset) ammoOffset = FindSendPropInfo("CCSPlayer", "m_iAmmo");

int offset;
switch (wepid)
{
case WEPID_RIFLE, WEPID_RIFLE_AK47, WEPID_RIFLE_DESERT, WEPID_RIFLE_SG552:
offset = ASSAULT_RIFLE_OFFSET_IAMMO;
case WEPID_SMG, WEPID_SMG_SILENCED:
offset = SMG_OFFSET_IAMMO;
case WEPID_PUMPSHOTGUN, WEPID_SHOTGUN_CHROME:
offset = PUMPSHOTGUN_OFFSET_IAMMO;
case WEPID_AUTOSHOTGUN, WEPID_SHOTGUN_SPAS:
offset = AUTO_SHOTGUN_OFFSET_IAMMO;
case WEPID_HUNTING_RIFLE:
offset = HUNTING_RIFLE_OFFSET_IAMMO;
case WEPID_SNIPER_MILITARY, WEPID_SNIPER_AWP, WEPID_SNIPER_SCOUT:
offset = MILITARY_SNIPER_OFFSET_IAMMO;
case WEPID_GRENADE_LAUNCHER:
offset = GRENADE_LAUNCHER_OFFSET_IAMMO;
default:
return -1;
}
return GetEntData(client, ammoOffset + offset);
return GetEntProp(client, Prop_Send, "m_iAmmo", _, ammoType);
}

stock int GetWeaponClipAmmo(int weapon)
Expand Down
Loading