diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h index 7ae73176..1052d7b6 100644 --- a/reaction/cgame/cg_local.h +++ b/reaction/cgame/cg_local.h @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.61 2002/03/30 23:20:10 jbravo +// Added damage in scoreboard. +// // Revision 1.60 2002/03/30 21:51:42 jbravo // Removed all those ifdefs for zcam. // @@ -405,6 +408,7 @@ typedef struct { int client; int score; int deaths; // NiceAss: Added deaths + int damage; // JBravo: Added damage int ping; int time; int scoreFlags; diff --git a/reaction/cgame/cg_scoreboard.c b/reaction/cgame/cg_scoreboard.c index 9490f599..259fd8eb 100644 --- a/reaction/cgame/cg_scoreboard.c +++ b/reaction/cgame/cg_scoreboard.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.19 2002/03/30 23:20:10 jbravo +// Added damage in scoreboard. +// // Revision 1.18 2002/03/30 02:54:24 jbravo // MOre spec tweaks and a scoreboard fix // @@ -153,7 +156,7 @@ static void CG_DrawTeamplayClientScore( int y, score_t *score, float *Fill, floa DrawStrip(y, SB_FONTSIZEH, qtrue, qfalse, qfalse, Fill, Boarder); DrawLeftStripText(y, SB_FONTSIZEH, ci->name, 20, Color); - Com_sprintf(Tmp, 128, "%4i %4i %5i %6i", score->time, score->ping, score->score, 0); + Com_sprintf(Tmp, 128, "%4i %4i %5i %6i", score->time, score->ping, score->score, score->damage); DrawRightStripText(y, SB_FONTSIZEH, Tmp, 100, Color); } diff --git a/reaction/cgame/cg_servercmds.c b/reaction/cgame/cg_servercmds.c index ee8425d3..9b53f98e 100644 --- a/reaction/cgame/cg_servercmds.c +++ b/reaction/cgame/cg_servercmds.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.25 2002/03/30 23:20:10 jbravo +// Added damage in scoreboard. +// // Revision 1.24 2002/03/26 10:32:52 jbravo // Bye bye LCA lag // @@ -116,9 +119,11 @@ static void CG_ParseScores( void ) { cg.scores[i].accuracy = atoi(CG_Argv(i * 14 + 10)); // Added deaths, replaced the place of impressiveCount cg.scores[i].deaths = atoi(CG_Argv(i * 14 + 11)); + // JBravo: Added damage, replaced the place of excellentCount + cg.scores[i].damage = atoi(CG_Argv(i * 14 + 12)); //Elder: these should be zero //cg.scores[i].impressiveCount = atoi(CG_Argv(i * 14 + 11)); - cg.scores[i].excellentCount = atoi(CG_Argv(i * 14 + 12)); + //cg.scores[i].excellentCount = atoi(CG_Argv(i * 14 + 12)); cg.scores[i].guantletCount = atoi(CG_Argv(i * 14 + 13)); cg.scores[i].defendCount = atoi(CG_Argv(i * 14 + 14)); cg.scores[i].assistCount = atoi(CG_Argv(i * 14 + 15)); diff --git a/reaction/game/g_cmds.c b/reaction/game/g_cmds.c index 66fafd5d..257b47f1 100644 --- a/reaction/game/g_cmds.c +++ b/reaction/game/g_cmds.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.85 2002/03/30 23:20:10 jbravo +// Added damage in scoreboard. +// // Revision 1.84 2002/03/30 21:51:42 jbravo // Removed all those ifdefs for zcam. // @@ -214,7 +217,7 @@ void DeathmatchScoreboardMessage( gentity_t *ent ) { cl->ps.persistant[PERS_SCORE], ping, (level.time - cl->pers.enterTime)/60000, scoreFlags, g_entities[level.sortedClients[i]].s.powerups, accuracy, cl->ps.persistant[PERS_KILLED], // NiceAss: Added for TP scoreboard - 0, + cl->ps.persistant[PERS_DAMAGE_DELT], // JBravo: Added for TP scoreboard 0, 0, 0,