Browse Source

Fix strange sprintf usage.

fix-cwd-path
Andrey Akhmichin 2 years ago
parent
commit
4ad82ee541
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
  1. 2
      cl_dll/ev_hldm.cpp
  2. 4
      cl_dll/hud_redraw.cpp
  3. 2
      cl_dll/hud_spectator.cpp
  4. 2
      cl_dll/scoreboard.cpp
  5. 4
      cl_dll/tri.cpp
  6. 17
      cl_dll/vgui_ScorePanel.cpp

2
cl_dll/ev_hldm.cpp

@ -247,7 +247,7 @@ char *EV_HLDM_DamageDecal( physent_t *pe )
} }
else if( pe->rendermode != kRenderNormal ) else if( pe->rendermode != kRenderNormal )
{ {
sprintf( decalname, "{bproof1" ); strcpy( decalname, "{bproof1" );
} }
else else
{ {

4
cl_dll/hud_redraw.cpp

@ -201,9 +201,7 @@ int CHud::Redraw( float flTime, int intermission )
if( m_hsprCursor == 0 ) if( m_hsprCursor == 0 )
{ {
char sz[256]; m_hsprCursor = SPR_Load( "sprites/cursor.spr" );
sprintf( sz, "sprites/cursor.spr" );
m_hsprCursor = SPR_Load( sz );
} }
SPR_Set( m_hsprCursor, 250, 250, 250 ); SPR_Set( m_hsprCursor, 250, 250, 250 );

2
cl_dll/hud_spectator.cpp

@ -448,7 +448,7 @@ int CHudSpectator::Draw( float flTime )
color = GetClientColor( i + 1 ); color = GetClientColor( i + 1 );
// draw the players name and health underneath // draw the players name and health underneath
sprintf( string, "%s", g_PlayerInfoList[i + 1].name ); strcpy( string, g_PlayerInfoList[i + 1].name );
lx = strlen( string ) * 3; // 3 is avg. character length :) lx = strlen( string ) * 3; // 3 is avg. character length :)

2
cl_dll/scoreboard.cpp

@ -453,7 +453,7 @@ int CHudScoreboard::DrawPlayers( int xpos_rel, float list_slot, int nameoffset,
if( g_PlayerInfoList[best_player].packetloss >= 63 ) if( g_PlayerInfoList[best_player].packetloss >= 63 )
{ {
UnpackRGB( r, g, b, RGB_REDISH ); UnpackRGB( r, g, b, RGB_REDISH );
sprintf( buf, " !!!!" ); strcpy( buf, " !!!!" );
} }
else else
{ {

4
cl_dll/tri.cpp

@ -50,9 +50,7 @@ void Draw_Triangles( void )
if( gHUD.m_hsprCursor == 0 ) if( gHUD.m_hsprCursor == 0 )
{ {
char sz[256]; gHUD.m_hsprCursor = SPR_Load( "sprites/cursor.spr" );
sprintf( sz, "sprites/cursor.spr" );
gHUD.m_hsprCursor = SPR_Load( sz );
} }
if( !gEngfuncs.pTriAPI->SpriteTexture( (struct model_s *)gEngfuncs.GetSpritePointer( gHUD.m_hsprCursor ), 0 ) ) if( !gEngfuncs.pTriAPI->SpriteTexture( (struct model_s *)gEngfuncs.GetSpritePointer( gHUD.m_hsprCursor ), 0 ) )

17
cl_dll/vgui_ScorePanel.cpp

@ -256,10 +256,7 @@ void ScorePanel::Update()
// Set the title // Set the title
if( gViewPort->m_szServerName[0] != '\0' ) if( gViewPort->m_szServerName[0] != '\0' )
{ {
char sz[MAX_SERVERNAME_LENGTH + 16]; m_TitleLabel.setText( gViewPort->m_szServerName );
sprintf( sz, "%s", gViewPort->m_szServerName );
m_TitleLabel.setText( sz );
} }
m_iRows = 0; m_iRows = 0;
@ -684,7 +681,7 @@ void ScorePanel::FillGrid()
} }
// Fill out with the correct data // Fill out with the correct data
strcpy(sz, ""); sz[0] = '\0';
if ( m_iIsATeam[row] ) if ( m_iIsATeam[row] )
{ {
char sz2[128]; char sz2[128];
@ -694,11 +691,11 @@ void ScorePanel::FillGrid()
case COLUMN_NAME: case COLUMN_NAME:
if ( m_iIsATeam[row] == TEAM_SPECTATORS ) if ( m_iIsATeam[row] == TEAM_SPECTATORS )
{ {
sprintf( sz2, "%s", CHudTextMessage::BufferedLocaliseTextString( "#Spectators" ) ); strcpy( sz2, CHudTextMessage::BufferedLocaliseTextString( "#Spectators" ) );
} }
else else
{ {
sprintf( sz2, "%s", gViewPort->GetTeamName(team_info->teamnumber) ); strcpy( sz2, gViewPort->GetTeamName(team_info->teamnumber) );
} }
strcpy(sz, sz2); strcpy(sz, sz2);
@ -790,7 +787,7 @@ void ScorePanel::FillGrid()
if (bNoClass) if (bNoClass)
sz[0] = '\0'; sz[0] = '\0';
else else
sprintf( sz, "%s", CHudTextMessage::BufferedLocaliseTextString( sLocalisedClasses[ g_PlayerExtraInfo[ m_iSortedRows[row] ].playerclass ] ) ); strcpy( sz, CHudTextMessage::BufferedLocaliseTextString( sLocalisedClasses[ g_PlayerExtraInfo[ m_iSortedRows[row] ].playerclass ] ) );
} }
else else
{ {
@ -909,14 +906,12 @@ void ScorePanel::mousePressed(MouseCode code, Panel* panel)
else else
{ {
char string1[1024]; char string1[1024];
char string2[1024];
// mute the player // mute the player
GetClientVoiceMgr()->SetPlayerBlockedState(iPlayer, true); GetClientVoiceMgr()->SetPlayerBlockedState(iPlayer, true);
sprintf( string1, CHudTextMessage::BufferedLocaliseTextString( "#Muted" ), pl_info->name ); sprintf( string1, CHudTextMessage::BufferedLocaliseTextString( "#Muted" ), pl_info->name );
sprintf( string2, "%s", CHudTextMessage::BufferedLocaliseTextString( "#No_longer_hear_that_player" ) ); sprintf( string, "%c** %s %s\n", HUD_PRINTTALK, string1, CHudTextMessage::BufferedLocaliseTextString( "#No_longer_hear_that_player" ) );
sprintf( string, "%c** %s %s\n", HUD_PRINTTALK, string1, string2 );
gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, strlen(string)+1, string ); gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, strlen(string)+1, string );
} }

Loading…
Cancel
Save