From 25c6c2a470695fbf36bf28c5126c1d7781819ea5 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin <sepulkarium45@yahoo.com> Date: Sun, 4 Apr 2021 06:46:18 +0500 Subject: [PATCH] Fix ammo meter. --- cl_dll/ammo.cpp | 12 ++++++------ dlls/player.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cl_dll/ammo.cpp b/cl_dll/ammo.cpp index 031fbfd5..26acc12c 100644 --- a/cl_dll/ammo.cpp +++ b/cl_dll/ammo.cpp @@ -645,14 +645,14 @@ int CHudAmmo::MsgFunc_WeaponList( const char *pszName, int iSize, void *pbuf ) strcpy( Weapon.szName, READ_STRING() ); Weapon.iAmmoType = (int)READ_CHAR(); - Weapon.iMax1 = READ_BYTE(); - if( Weapon.iMax1 == 255 ) - Weapon.iMax1 = -1; + Weapon.iMax1 = READ_SHORT(); + // if( Weapon.iMax1 == 255 ) + // Weapon.iMax1 = -1; Weapon.iAmmo2Type = READ_CHAR(); - Weapon.iMax2 = READ_BYTE(); - if( Weapon.iMax2 == 255 ) - Weapon.iMax2 = -1; + Weapon.iMax2 = READ_SHORT(); + // if( Weapon.iMax2 == 255 ) + // Weapon.iMax2 = -1; Weapon.iSlot = READ_CHAR(); Weapon.iSlotPos = READ_CHAR(); diff --git a/dlls/player.cpp b/dlls/player.cpp index 3b70f2c2..fe46c32b 100644 --- a/dlls/player.cpp +++ b/dlls/player.cpp @@ -3954,9 +3954,9 @@ void CBasePlayer::UpdateClientData( void ) MESSAGE_BEGIN( MSG_ONE, gmsgWeaponList, NULL, pev ); WRITE_STRING( pszName ); // string weapon name WRITE_BYTE( GetAmmoIndex( II.pszAmmo1 ) ); // byte Ammo Type - WRITE_BYTE( II.iMaxAmmo1 ); // byte Max Ammo 1 + WRITE_SHORT( II.iMaxAmmo1 ); // byte Max Ammo 1 WRITE_BYTE( GetAmmoIndex( II.pszAmmo2 ) ); // byte Ammo2 Type - WRITE_BYTE( II.iMaxAmmo2 ); // byte Max Ammo 2 + WRITE_SHORT( II.iMaxAmmo2 ); // byte Max Ammo 2 WRITE_BYTE( II.iSlot ); // byte bucket WRITE_BYTE( II.iPosition ); // byte bucket pos WRITE_BYTE( II.iId ); // byte id (bit index into pev->weapons)