mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-01-26 06:34:23 +00:00
Merge branch 'warnings' into sohl1.2
This commit is contained in:
commit
6f1979e045
@ -232,7 +232,7 @@ public:
|
|||||||
void InitHUDData( void );
|
void InitHUDData( void );
|
||||||
int VidInit( void );
|
int VidInit( void );
|
||||||
int Draw( float flTime );
|
int Draw( float flTime );
|
||||||
int DrawPlayers( int xoffset, float listslot, int nameoffset = 0, char *team = NULL ); // returns the ypos where it finishes drawing
|
int DrawPlayers( int xoffset, float listslot, int nameoffset = 0, const char *team = NULL ); // returns the ypos where it finishes drawing
|
||||||
void UserCmd_ShowScores( void );
|
void UserCmd_ShowScores( void );
|
||||||
void UserCmd_HideScores( void );
|
void UserCmd_HideScores( void );
|
||||||
int MsgFunc_ScoreInfo( const char *pszName, int iSize, void *pbuf );
|
int MsgFunc_ScoreInfo( const char *pszName, int iSize, void *pbuf );
|
||||||
|
@ -1368,7 +1368,7 @@ void IN_JoyMove ( float frametime, usercmd_t *cmd )
|
|||||||
// y=ax^b; where a = 300 and b = 1.3
|
// y=ax^b; where a = 300 and b = 1.3
|
||||||
// also x values are in increments of 800 (so this is factored out)
|
// also x values are in increments of 800 (so this is factored out)
|
||||||
// then bounds check result to level out excessively high spin rates
|
// then bounds check result to level out excessively high spin rates
|
||||||
fTemp = 300.0 * pow(abs(fAxisValue) / 800.0, 1.3);
|
fTemp = 300.0 * pow(fabs(fAxisValue) / 800.0, 1.3);
|
||||||
if (fTemp > 14000.0)
|
if (fTemp > 14000.0)
|
||||||
fTemp = 14000.0;
|
fTemp = 14000.0;
|
||||||
// restore direction information
|
// restore direction information
|
||||||
|
@ -337,7 +337,7 @@ int CHudScoreboard::Draw( float fTime )
|
|||||||
extern float *GetClientColor( int client );
|
extern float *GetClientColor( int client );
|
||||||
|
|
||||||
// returns the ypos where it finishes drawing
|
// returns the ypos where it finishes drawing
|
||||||
int CHudScoreboard::DrawPlayers( int xpos_rel, float list_slot, int nameoffset, char *team )
|
int CHudScoreboard::DrawPlayers( int xpos_rel, float list_slot, int nameoffset, const char *team )
|
||||||
{
|
{
|
||||||
int can_show_packetloss = 0;
|
int can_show_packetloss = 0;
|
||||||
int FAR_RIGHT;
|
int FAR_RIGHT;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user