diff --git a/reaction/cgame/cg_consolecmds.c b/reaction/cgame/cg_consolecmds.c
index 6cbd9a16..41538b0e 100644
--- a/reaction/cgame/cg_consolecmds.c
+++ b/reaction/cgame/cg_consolecmds.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.29 2002/02/28 05:41:54 blaze
+// weapons stats on client side
+//
// Revision 1.28 2002/02/10 08:17:08 niceass
// many changes to scoreboard (deaths/second mode)
//
@@ -258,6 +261,44 @@ static void CG_ScoresUp_f( void ) {
}
}
+/*
+=================================
+CG_WeaponStatsUp_f
+Turns on the players weapon stats
+=================================
+*/
+static void CG_WeaponStatsUp_f(void)
+{
+ if ( cg.wstatsRequestTime + 2000 < cg.time ) {
+ // the stats are more than two seconds out of data,
+ // so request new ones
+ cg.wstatsRequestTime = cg.time;
+ trap_SendClientCommand( "wstats" );
+ }
+
+ if (!cg.showWStats)
+ {
+ cg.wstatsStartTime = cg.time;
+ cg.showWStats = qtrue;
+ }
+}
+
+
+/*
+=================================
+CG_WeaponStatsDown_f
+Turns off the players weapon stats
+=================================
+*/
+static void CG_WeaponStatsDown_f(void)
+{
+ if (cg.showWStats)
+ {
+ cg.showWStats = qfalse;
+ }
+}
+
+
#ifdef MISSIONPACK
extern menuDef_t *menuScoreboard;
void Menu_Reset(); // FIXME: add to right include file
@@ -695,6 +736,9 @@ static consoleCommand_t commands[] = {
{ "-scores", CG_ScoresUp_f },
/* { "+zoom", CG_ZoomDown_f }, // hawkins not needed in Reaction
{ "-zoom", CG_ZoomUp_f },*/
+ //Blaze: Weapon stats
+ { "+wstats", CG_WeaponStatsUp_f },
+ { "-wstats", CG_WeaponStatsDown_f },
{ "sizeup", CG_SizeUp_f },
{ "sizedown", CG_SizeDown_f },
{ "weapnext", CG_NextWeapon_f },
diff --git a/reaction/cgame/cg_draw.c b/reaction/cgame/cg_draw.c
index e6a75fac..253a592c 100644
--- a/reaction/cgame/cg_draw.c
+++ b/reaction/cgame/cg_draw.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.22 2002/02/28 05:41:54 blaze
+// weapons stats on client side
+//
// Revision 1.21 2002/02/25 19:41:53 jbravo
// Fixed the use ESC and join menu to join teams when dead players are
// spectating in TP mode.
@@ -2826,6 +2829,7 @@ static void CG_Draw2D( void ) {
if ( !cg.scoreBoardShowing) {
CG_DrawCenterString();
}
+ if ( cg.showWStats ) CG_DrawWeaponStats();
}
diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index 7d2cf25e..b8983327 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.49 2002/02/28 05:41:54 blaze
+// weapons stats on client side
+//
// Revision 1.48 2002/02/10 08:17:08 niceass
// many changes to scoreboard (deaths/second mode)
//
@@ -385,6 +388,8 @@ typedef struct {
int team;
} score_t;
+//Blaze: WeaponStats Struct
+
// each client has an associated clientInfo_t
// that contains media references necessary to present the
// client model and other color coded effects
@@ -659,6 +664,11 @@ typedef struct {
qboolean scoreBoardShowing;
int scoreFadeTime;
int scoreTPMode;
+ //Blaze: weapon stats stuff
+ qboolean showWStats;
+ int wstatsStartTime;
+ int wstatsRequestTime;
+ //end weapon stats stuff
char killerName[MAX_NAME_LENGTH];
char spectatorList[MAX_STRING_CHARS]; // list of names
int spectatorLen; // length of list
@@ -786,6 +796,8 @@ typedef struct {
// JBravo: adding scoreStartTime for NiceAss
int scoreStartTime;
+ int records[REC_NUM_RECORDS]; // Blaze: for our statistics tracking
+
} cg_t;
diff --git a/reaction/cgame/cg_scoreboard.c b/reaction/cgame/cg_scoreboard.c
index 5cb782ac..e5b416ef 100644
--- a/reaction/cgame/cg_scoreboard.c
+++ b/reaction/cgame/cg_scoreboard.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.7 2002/02/28 05:41:54 blaze
+// weapons stats on client side
+//
// Revision 1.6 2002/02/10 08:17:08 niceass
// many changes to scoreboard (deaths/second mode)
//
@@ -715,3 +718,425 @@ void CG_DrawOldTourneyScoreboard( void ) {
}
+//Blaze: Added the weapons stats "scoreboard" to this file because it's a scoreboard in a way.
+/*
+==============================
+CG_DrawWeaponStats
+
+ Draws the stats of the player
+==============================
+*/
+#define WS_LEFTSIDE 20
+#define WS_TOP 250
+#define WS_WIDTH 640 - WS_LEFTSIDE * 10
+#define WS_LINE_WIDTH 1
+#define WS_PADDING (WS_LINE_WIDTH+2)
+
+
+void CG_DrawWeaponStats(void)
+{
+ int i, red, blue, spec, score, deaths, offset;
+ float color[4], Alpha, Alpha2;
+
+ clientInfo_t *ci;
+ int y;
+ int size, players;
+ char String[80];
+
+ if (cg.time > cg.wstatsStartTime+300) {
+ Alpha = (cos((cg.time-cg.wstatsStartTime) / 400.0f) + 1.0f) * 0.25f + 0.5f;
+ Alpha2 = (cos((cg.time-cg.wstatsStartTime) / 400.0f) + 1.0f) * 0.5f;
+ }
+ else {
+ Alpha = (float)(cg.time-cg.wstatsStartTime)/(float)300;
+ if (Alpha > 1.0f) Alpha = 1.0f;
+ }
+ //make room for 8 weapon stats
+ size = (8*20)+SB_PADDING;
+ score = cg.snap->ps.persistant[PERS_SCORE];
+ deaths = cg.snap->ps.persistant[PERS_KILLED];
+ // Score bar - Red:
+ MAKERGBA(color, 1.0f, 0.5f, 0.5f, 0.7f * Alpha);
+ CG_FillRect(WS_LEFTSIDE, WS_TOP,
+ WS_WIDTH, SMALLCHAR_HEIGHT+(WS_PADDING*2), color);
+
+ //Box for scores, etc
+ MAKERGBA(color, 0.55f, 0.55f, 0.55f, 0.7f * Alpha);
+ CG_FillRect(WS_LEFTSIDE, WS_TOP+SMALLCHAR_HEIGHT+(SB_PADDING*2),
+ WS_WIDTH, SMALLCHAR_HEIGHT+(WS_PADDING*2), color);
+
+ //Box for weapon stuff
+ MAKERGBA(color, 0.6f, 0.5f, 0.5f, 0.5f * Alpha);
+ CG_FillRect(WS_LEFTSIDE, WS_TOP + (SMALLCHAR_HEIGHT+(WS_PADDING*2))*2,
+ WS_WIDTH, size, color);
+ //box for weapon stuff
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 0.8f);
+ CG_DrawCleanRect( WS_LEFTSIDE, WS_TOP,
+ WS_WIDTH, (SMALLCHAR_HEIGHT+WS_PADDING*2)*2+size, WS_LINE_WIDTH, color );
+
+ //box for score stuff
+ CG_DrawCleanRect( WS_LEFTSIDE, WS_TOP + SMALLCHAR_HEIGHT+(WS_PADDING*2),
+ WS_WIDTH, (SMALLCHAR_HEIGHT+WS_PADDING*2), WS_LINE_WIDTH, color );
+
+ //Red box for Weapon stats
+ MAKERGBA(color, 1.0f, 0.5f, 0.5f, 0.7f * Alpha);
+ CG_FillRect(WS_LEFTSIDE, WS_TOP+(SMALLCHAR_HEIGHT + (WS_PADDING*2))*2,
+ WS_WIDTH, SMALLCHAR_HEIGHT, color);
+ //White box for the weapon names, etc
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 0.8f);
+ CG_DrawCleanRect( WS_LEFTSIDE, WS_TOP -1 + (SMALLCHAR_HEIGHT + (WS_PADDING*2))*2,
+ WS_WIDTH, SMALLCHAR_HEIGHT+1, WS_LINE_WIDTH, color );
+
+
+ //Fill in the top bar
+ offset = 7;
+ MAKERGBA(color, 1.0f, 0.0f, 0.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6, WS_TOP + SB_PADDING,
+ "Score", color);
+
+ MAKERGBA(color, 0.0f, 1.0f, 0.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * 7, WS_TOP + SB_PADDING,
+ "Net", color);
+
+ MAKERGBA(color, 0.0f, 0.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * 7 * 2, WS_TOP + SB_PADDING,
+ "Kills", color);
+
+ MAKERGBA(color, 0.5f, 0.0f, 0.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * 7 * 3, WS_TOP + SB_PADDING,
+ "Deaths", color);
+
+ MAKERGBA(color, 0.0f, 0.5f, 0.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * 7 * 4, WS_TOP + SB_PADDING,
+ "Sui", color);
+
+ MAKERGBA(color, 0.0f, 0.0f, 0.5f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * 7 * 5, WS_TOP + SB_PADDING,
+ "TK's", color);
+
+ MAKERGBA(color, 0.0f, 0.0f, 0.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * 7 * 6, WS_TOP + SB_PADDING,
+ "Effency", color);
+
+ Com_sprintf(String, sizeof(String), "%4i",score);
+
+
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 3 + SMALLCHAR_HEIGHT,
+ String, color);
+ i=2;
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Weapon Stats", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Knife(slash)", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Knife(throw)", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "MK23", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "M3", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "MP5", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "M4", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "HC", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Akimbo", color);
+
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Grenade", color);
+
+
+ //Accuracy
+
+ i=2;
+ offset=15;
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Accuracy", color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_KNIFESLASHHITS]/(cg.records[REC_KNIFESLASHSHOTS] ? cg.records[REC_KNIFESLASHSHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_KNIFETHROWHITS]/(cg.records[REC_KNIFETHROWSHOTS] ? cg.records[REC_KNIFETHROWSHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_MK23HITS]/(cg.records[REC_MK23SHOTS] ? cg.records[REC_MK23SHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_M3HITS]/(cg.records[REC_M3SHOTS] ? cg.records[REC_M3SHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_MP5HITS]/(cg.records[REC_MP5SHOTS] ? cg.records[REC_MP5SHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_M4HITS]/(cg.records[REC_M4SHOTS] ? cg.records[REC_M4SHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_HANDCANNONHITS]/(cg.records[REC_HANDCANNONSHOTS] ? cg.records[REC_HANDCANNONSHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_AKIMBOHITS]/(cg.records[REC_AKIMBOSHOTS] ? cg.records[REC_AKIMBOSHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%.1f%%",100 * (float)cg.records[REC_GRENADEHITS]/(cg.records[REC_GRENADESHOTS] ? cg.records[REC_GRENADESHOTS] : 1));
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+
+ //Hits
+ i=2;
+ offset=24;
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Hitts", color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFESLASHHITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFETHROWHITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MK23HITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M3HITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MP5HITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M4HITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_HANDCANNONHITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_AKIMBOHITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_GRENADEHITS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ //Shots
+ i=2;
+ offset = 30;
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Shots", color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFESLASHSHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFETHROWSHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MK23SHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M3SHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MP5SHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M4SHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_HANDCANNONSHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_AKIMBOSHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_GRENADESHOTS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ //Kills
+ i=2;
+ offset = 37;
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Kills", color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFESLASHKILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFETHROWKILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MK23KILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M3KILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MP5KILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M4KILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_HANDCANNONKILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_AKIMBOKILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_GRENADEKILLS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ //Deaths
+ i=2;
+ offset = 45;
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ "Deaths", color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFESLASHDEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_KNIFETHROWDEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MK23DEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M3DEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_MP5DEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_M4DEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_HANDCANNONDEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_AKIMBODEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+ Com_sprintf(String, sizeof(String), "%d",cg.records[REC_GRENADEDEATHS]);
+ MAKERGBA(color, 1.0f, 1.0f, 1.0f, 1.0f);
+ CG_DrawSmallStringColor(WS_LEFTSIDE + 6 + SMALLCHAR_WIDTH * offset, WS_TOP + SB_PADDING * 4 + SMALLCHAR_HEIGHT * i++,
+ String, color);
+
+
+ if ( cg.wstatsRequestTime + 3000 < cg.time ) {
+ // the scores are more than two seconds out of data,
+ // so request new ones
+ cg.wstatsRequestTime = cg.time;
+ trap_SendClientCommand( "wstats" );
+ }
+
+ return;
+}
diff --git a/reaction/cgame/cg_servercmds.c b/reaction/cgame/cg_servercmds.c
index 175f8905..5230502f 100644
--- a/reaction/cgame/cg_servercmds.c
+++ b/reaction/cgame/cg_servercmds.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.18 2002/02/28 05:41:54 blaze
+// weapons stats on client side
+//
// Revision 1.17 2002/02/11 00:30:02 niceass
// LCA fix
//
@@ -117,6 +120,75 @@ static void CG_ParseScores( void ) {
#endif
}
+/*
+=================
+CG_ParseWeaponStats
+
+=================
+*/
+static void CG_ParseWeaponStats( void ) {
+ int i;
+
+ i=1;
+ //Blaze: oi, damn fugly code
+ cg.records[REC_KNIFETHROWSHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_KNIFETHROWHITS] = atoi( CG_Argv(i++));
+ cg.records[REC_KNIFESLASHSHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_KNIFESLASHHITS] = atoi( CG_Argv(i++));
+ cg.records[REC_MK23SHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_MK23HITS] = atoi( CG_Argv(i++));
+ cg.records[REC_M3SHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_M3HITS] = atoi( CG_Argv(i++));
+ cg.records[REC_MP5SHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_MP5HITS] = atoi( CG_Argv(i++));
+ cg.records[REC_M4SHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_M4HITS] = atoi( CG_Argv(i++));
+ cg.records[REC_SSG3000SHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_SSG3000HITS] = atoi( CG_Argv(i++));
+ cg.records[REC_HANDCANNONSHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_HANDCANNONHITS] = atoi( CG_Argv(i++));
+ cg.records[REC_AKIMBOSHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_AKIMBOHITS] = atoi( CG_Argv(i++));
+ cg.records[REC_GRENADESHOTS] = atoi( CG_Argv(i++));
+ cg.records[REC_GRENADEHITS] = atoi( CG_Argv(i++));
+ cg.records[REC_KICKHITS] = atoi( CG_Argv(i++));
+
+}
+/*
+=================
+CG_ParseWeaponStats2
+I send 2 server config strings, I was not
+sure if there was a max length, so may aswell avoid it
+=================
+*/
+static void CG_ParseWeaponStats2( void ) {
+ int i;
+
+ i=1;
+ //Blaze: oi, damn fugly code
+ cg.records[REC_KNIFETHROWDEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_KNIFETHROWKILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_KNIFESLASHDEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_KNIFESLASHKILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_MK23DEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_MK23KILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_M3DEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_M3KILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_MP5DEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_MP5KILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_M4DEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_M4KILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_SSG3000DEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_SSG3000KILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_HANDCANNONDEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_HANDCANNONKILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_AKIMBODEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_AKIMBOKILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_GRENADEDEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_GRENADEKILLS] = atoi( CG_Argv(i++));
+ cg.records[REC_KICKDEATHS] = atoi( CG_Argv(i++));
+ cg.records[REC_KICKKILLS] = atoi( CG_Argv(i++));
+}
/*
=================
@@ -1060,6 +1132,16 @@ static void CG_ServerCommand( void ) {
return;
}
+ if ( !strcmp( cmd, "wstats" ) ) {
+ CG_ParseWeaponStats();
+ return;
+ }
+
+ if ( !strcmp( cmd, "wstats2" ) ) {
+ CG_ParseWeaponStats2();
+ return;
+ }
+
if ( !strcmp( cmd, "tinfo" ) ) {
CG_ParseTeamInfo();
return;
diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg
index 56b85844..6e03d98a 100644
--- a/reaction/cgame/cgame.plg
+++ b/reaction/cgame/cgame.plg
@@ -6,13 +6,14 @@
--------------------Configuration: cgame - Win32 Debug--------------------
Command Lines
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2BC.tmp" with contents
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPE3.tmp" with contents
[
/nologo /G5 /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR"Debug/" /Fp"Debug/cgame.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /c
-"c:\reaction\cgame\cg_main.c"
+"C:\Development\reaction\cgame\cg_scoreboard.c"
+"C:\Development\reaction\cgame\cg_servercmds.c"
]
-Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2BC.tmp"
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2BD.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPE3.tmp"
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPE4.tmp" with contents
[
/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:yes /pdb:"Debug/cgamex86.pdb" /map:"Debug/cgamex86.map" /debug /machine:I386 /def:".\cgame.def" /out:"../Debug/cgamex86.dll" /implib:"Debug/cgamex86.lib"
.\Debug\bg_misc.obj
@@ -41,21 +42,27 @@ Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2BD.tmp" with con
.\Debug\q_shared.obj
.\Debug\ui_shared.obj
]
-Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2BD.tmp"
+Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPE4.tmp"
Output Window
Compiling...
-cg_main.c
+cg_scoreboard.c
+C:\Development\reaction\cgame\cg_scoreboard.c(238) : warning C4101: 'iconx' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(238) : warning C4101: 'headx' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(236) : warning C4101: 'headAngles' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(735) : warning C4101: 'spec' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(740) : warning C4101: 'players' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(735) : warning C4101: 'red' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(739) : warning C4101: 'y' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(738) : warning C4101: 'ci' : unreferenced local variable
+C:\Development\reaction\cgame\cg_scoreboard.c(735) : warning C4101: 'blue' : unreferenced local variable
+cg_servercmds.c
Linking...
-LINK : LNK6004: ../Debug/cgamex86.dll not found or not built by the last incremental link; performing full link
Creating library Debug/cgamex86.lib and object Debug/cgamex86.exp
-cg_weapons.obj : error LNK2001: unresolved external symbol _G_PositionWeaponOnTag
-../Debug/cgamex86.dll : fatal error LNK1120: 1 unresolved externals
-Error executing link.exe.
Results
-cgamex86.dll - 2 error(s), 0 warning(s)
+cgamex86.dll - 0 error(s), 9 warning(s)