YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-03-13 05:51:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix ammo list.

Browse Source
This commit is contained in:
Night Owl 2017-01-06 03:31:51 +05:00
parent ecf322b729
commit 4180937ae5
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cl_dll/ammo.cpp
View File

@ -415,7 +415,7 @@ void WeaponsResource::SelectSlot( int iSlot, int fAdvance, int iDirection )
if( gHUD.m_Menu.m_fMenuDisplayed && ( fAdvance == FALSE ) && ( iDirection == 1 ) ) if( gHUD.m_Menu.m_fMenuDisplayed && ( fAdvance == FALSE ) && ( iDirection == 1 ) )
{ {
// menu is overriding slot use commands // menu is overriding slot use commands
gHUD.m_Menu.SelectMenuItem( iSlot + 1 ); // slots are one off the key numbers gHUD.m_Menu.SelectMenuItem( iSlot );
return; return;
} }
@ -552,7 +552,7 @@ int CHudAmmo::MsgFunc_CurWeapon( const char *pszName, int iSize, void *pbuf )
int iState = READ_BYTE(); int iState = READ_BYTE();
int iId = READ_BYTE(); int iId = READ_BYTE();
int iClip = READ_CHAR(); int iClip = READ_BYTE();
// detect if we're also on target // detect if we're also on target
if( iState > 1 ) if( iState > 1 )
@ -643,52 +643,52 @@ void CHudAmmo::SlotInput( int iSlot )
void CHudAmmo::UserCmd_Slot1( void ) void CHudAmmo::UserCmd_Slot1( void )
{ {
SlotInput( 0 ); SlotInput( 1 );
} }
void CHudAmmo::UserCmd_Slot2( void ) void CHudAmmo::UserCmd_Slot2( void )
{ {
SlotInput( 1 ); SlotInput( 2 );
} }
void CHudAmmo::UserCmd_Slot3( void ) void CHudAmmo::UserCmd_Slot3( void )
{ {
SlotInput( 2 ); SlotInput( 3 );
} }
void CHudAmmo::UserCmd_Slot4( void ) void CHudAmmo::UserCmd_Slot4( void )
{ {
SlotInput( 3 ); SlotInput( 4 );
} }
void CHudAmmo::UserCmd_Slot5( void ) void CHudAmmo::UserCmd_Slot5( void )
{ {
SlotInput( 4 ); SlotInput( 5 );
} }
void CHudAmmo::UserCmd_Slot6( void ) void CHudAmmo::UserCmd_Slot6( void )
{ {
SlotInput( 5 ); SlotInput( 6 );
} }
void CHudAmmo::UserCmd_Slot7( void ) void CHudAmmo::UserCmd_Slot7( void )
{ {
SlotInput( 6 ); SlotInput( 7 );
} }
void CHudAmmo::UserCmd_Slot8( void ) void CHudAmmo::UserCmd_Slot8( void )
{ {
SlotInput( 7 ); SlotInput( 8 );
} }
void CHudAmmo::UserCmd_Slot9( void ) void CHudAmmo::UserCmd_Slot9( void )
{ {
SlotInput( 8 ); SlotInput( 9 );
} }
void CHudAmmo::UserCmd_Slot10( void ) void CHudAmmo::UserCmd_Slot10( void )
{ {
SlotInput( 9 ); SlotInput( 10 );
} }
void CHudAmmo::UserCmd_Close( void ) void CHudAmmo::UserCmd_Close( void )
@ -723,7 +723,7 @@ void CHudAmmo::UserCmd_NextWeapon( void )
for( int loop = 0; loop <= 1; loop++ ) for( int loop = 0; loop <= 1; loop++ )
{ {
for( ; slot < MAX_WEAPON_SLOTS; slot++ ) for( ; slot < MAX_WEAPON_SLOTS + 1; slot++ )
{ {
for( ; pos < MAX_WEAPON_POSITIONS; pos++ ) for( ; pos < MAX_WEAPON_POSITIONS; pos++ )
{ {
@ -988,7 +988,7 @@ int CHudAmmo::DrawWList( float flTime )
x = 10; x = 10;
// Draw all of the buckets // Draw all of the buckets
for( i = 0; i < MAX_WEAPON_SLOTS; i++ ) for( i = 1; i < MAX_WEAPON_SLOTS + 1; i++ )
{ {
y = giBucketHeight + 10; y = giBucketHeight + 10;

2
cl_dll/statusbar.cpp
View File

@ -117,7 +117,7 @@ int CHudStatusBar::Draw( float fTime )
// Draw the status bar lines // Draw the status bar lines
for( int i = 0; i < MAX_STATUSBAR_LINES; i++ ) for( int i = 0; i < MAX_STATUSBAR_LINES; i++ )
{ {
int TextHeight = 0, TextWidth = 0; int TextHeight = 0, TotalTextWidth = 0;
//Ugly way to get //Ugly way to get
if( m_iTeamMate[i] ) if( m_iTeamMate[i] )