diff --git a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp index 6bbe529a..66ee5886 100644 --- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp +++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp @@ -752,7 +752,7 @@ void ScorePanel::FillGrid() } bool bNextRowIsGap = false; - m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#EXTRA")); + m_HeaderLabels[COLUMN_EXTRA].setText(""); if ( isNsMode ) { if ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) { m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLWEAP")); @@ -762,7 +762,8 @@ void ScorePanel::FillGrid() } } else { - m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLLEVEL")); + if ( gHUD.GetHUDTeam() != TEAM_IND && gHUD.GetHUDTeam() != TEAM_SPECT ) + m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLLEVEL")); } for(int row=0; row < NUM_ROWS; row++) @@ -1289,9 +1290,7 @@ void ScorePanel::FillGrid() } } else { - if ( gHUD.GetHUDTeam() != TEAM_IND && gHUD.GetHUDTeam() != TEAM_SPECT ) { - sprintf(sz, "%d", theExtraPlayerInfo->extra); - } + sprintf(sz, "%d", theExtraPlayerInfo->extra); } } break; diff --git a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h index 7ed61304..1b40e176 100644 --- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h +++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h @@ -20,11 +20,11 @@ #define COLUMN_RANK_ICON 1 #define COLUMN_NAME 2 #define COLUMN_CLASS 3 -#define COLUMN_EXTRA 4 -#define COLUMN_SCORE 5 -#define COLUMN_KILLS 6 -#define COLUMN_DEATHS 7 -#define COLUMN_LATENCY 8 +#define COLUMN_SCORE 4 +#define COLUMN_KILLS 5 +#define COLUMN_DEATHS 6 +#define COLUMN_LATENCY 7 +#define COLUMN_EXTRA 8 #define COLUMN_VOICE 9 #define COLUMN_BLANK 10 #define NUM_COLUMNS 11 diff --git a/releases/3.2.0/source/engine/eiface.h b/releases/3.2.0/source/engine/eiface.h index d3a54e17..4e103a66 100644 --- a/releases/3.2.0/source/engine/eiface.h +++ b/releases/3.2.0/source/engine/eiface.h @@ -260,6 +260,7 @@ typedef struct enginefuncs_s qboolean (*pfnVoice_SetClientListening)(int iReceiver, int iSender, qboolean bListen); const char* (*pfnGetPlayerAuthId) ( edict_t *e ); + void (*pfnQueryClientCvarValue2)( const edict_t *player, const char *cvarName, int requestID ); } enginefuncs_t; // ONLY ADD NEW FUNCTIONS TO THE END OF THIS STRUCT. INTERFACE VERSION IS FROZEN AT 138 @@ -480,6 +481,8 @@ typedef struct void (*pfnOnFreeEntPrivateData)(edict_t *pEnt); void (*pfnGameShutdown)(void); int (*pfnShouldCollide)( edict_t *pentTouched, edict_t *pentOther ); + void (*pfnCvarValue)( const edict_t *pEnt, const char *value ); + void (*pfnCvarValue2)( const edict_t *pEnt, int requestID, const char *cvarName, const char *value ); } NEW_DLL_FUNCTIONS; typedef int (*NEW_DLL_FUNCTIONS_FN)( NEW_DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion );