o Fixed a bug where scoreboard showed 'info' column from readyroom.

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@515 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2006-06-01 20:24:32 +00:00
parent a9531c064b
commit 4f1c29d6ce
3 changed files with 12 additions and 10 deletions

View file

@ -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;

View file

@ -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

View file

@ -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 );