X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores.qc;h=57f5e95f8fd6878951ac9d42e5ce79c7ba1dcbd2;hb=4caa2397ea1a778382ac278985185ac55f7f7d6f;hp=3a8b830d74c04e82063566368b0c949bc7f52878;hpb=85119d4a165562bcd7206c151255b8e680000367;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 3a8b830d7..57f5e95f8 100644
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,3 +1,11 @@
+#include "scores.qh"
+#include "_all.qh"
+
+#include "command/common.qh"
+#include "mutators/mutators_include.qh"
+#include "../common/playerstats.qh"
+#include "../common/teams.qh"
+
 .entity scorekeeper;
 entity teamscorekeepers[16];
 string scores_label[MAX_SCORE];
@@ -14,31 +22,31 @@ vector ScoreField_Compare(entity t1, entity t2, .float field, float fieldflags,
 {
 	if(!strict && !(fieldflags & SFL_SORT_PRIO_MASK)) // column does not sort
 		return previous;
-	if((fieldflags & SFL_SORT_PRIO_MASK) < previous_y)
+	if((fieldflags & SFL_SORT_PRIO_MASK) < previous.y)
 		return previous;
-	if(t1.field == t2.field)
+	if (t1.(field) == t2.(field))
 		return previous;
 
-	previous_y = fieldflags & SFL_SORT_PRIO_MASK;
+	previous.y = fieldflags & SFL_SORT_PRIO_MASK;
 
 	if(fieldflags & SFL_ZERO_IS_WORST)
 	{
-		if(t1.field == 0)
+		if (t1.(field) == 0)
 		{
-			previous_x = -1;
+			previous.x = -1;
 			return previous;
 		}
-		else if(t2.field == 0)
+		else if (t2.(field) == 0)
 		{
-			previous_x = +1;
+			previous.x = +1;
 			return previous;
 		}
 	}
 
-	if(fieldflags & SFL_LOWER_IS_BETTER)
-		previous_x = (t2.field - t1.field);
+	if (fieldflags & SFL_LOWER_IS_BETTER)
+		previous.x = (t2.(field) - t1.(field));
 	else
-		previous_x = (t1.field - t2.field);
+		previous.x = (t1.(field) - t2.(field));
 
 	return previous;
 }
@@ -75,7 +83,7 @@ float TeamScore_SendEntity(entity to, float sendflags)
 				WriteChar(MSG_ENTITY, self.(teamscores[i]));
 		}
 
-	return TRUE;
+	return true;
 }
 
 void TeamScore_Spawn(float t, string name)
@@ -85,10 +93,10 @@ void TeamScore_Spawn(float t, string name)
 	ts.classname = "csqc_score_team";
 	ts.netname = name; // not used yet, FIXME
 	ts.team = t;
-	Net_LinkEntity(ts, FALSE, 0, TeamScore_SendEntity);
+	Net_LinkEntity(ts, false, 0, TeamScore_SendEntity);
 	teamscorekeepers[t - 1] = ts;
 	++teamscores_entities_count;
-	PlayerStats_AddTeam(t);
+	PlayerStats_GameReport_AddTeam(t);
 }
 
 float TeamScore_AddToTeam(float t, float scorefield, float score)
@@ -136,10 +144,10 @@ float TeamScore_Compare(entity t1, entity t2, float strict)
 		result = ScoreField_Compare(t1, t2, f, teamscores_flags[i], result, strict);
 	}
 
-	if (result_x == 0 && strict)
-		result_x = t1.team - t2.team;
+	if (result.x == 0 && strict)
+		result.x = t1.team - t2.team;
 
-	return result_x;
+	return result.x;
 }
 
 /*
@@ -157,8 +165,8 @@ void ScoreInfo_SetLabel_PlayerScore(float i, string label, float scoreflags)
 	}
 	if(label != "")
 	{
-		PlayerStats_AddEvent(strcat(PLAYERSTATS_TOTAL, label));
-		PlayerStats_AddEvent(strcat(PLAYERSTATS_SCOREBOARD, label));
+		PlayerStats_GameReport_AddEvent(strcat(PLAYERSTATS_TOTAL, label));
+		PlayerStats_GameReport_AddEvent(strcat(PLAYERSTATS_SCOREBOARD, label));
 	}
 }
 
@@ -173,12 +181,12 @@ void ScoreInfo_SetLabel_TeamScore(float i, string label, float scoreflags)
 	}
 	if(label != "")
 	{
-		PlayerStats_AddEvent(strcat(PLAYERSTATS_TOTAL, label));
-		PlayerStats_AddEvent(strcat(PLAYERSTATS_SCOREBOARD, label));
+		PlayerStats_GameReport_AddEvent(strcat(PLAYERSTATS_TOTAL, label));
+		PlayerStats_GameReport_AddEvent(strcat(PLAYERSTATS_SCOREBOARD, label));
 	}
 }
 
-float ScoreInfo_SendEntity(entity to, float sf)
+float ScoreInfo_SendEntity(entity to, int sf)
 {
 	float i;
 	WriteByte(MSG_ENTITY, ENT_CLIENT_SCORES_INFO);
@@ -193,7 +201,7 @@ float ScoreInfo_SendEntity(entity to, float sf)
 		WriteString(MSG_ENTITY, teamscores_label[i]);
 		WriteByte(MSG_ENTITY, teamscores_flags[i]);
 	}
-	return TRUE;
+	return true;
 }
 
 void ScoreInfo_Init(float teams)
@@ -206,7 +214,7 @@ void ScoreInfo_Init(float teams)
 	{
 		scores_initialized = spawn();
 		scores_initialized.classname = "ent_client_scoreinfo";
-		Net_LinkEntity(scores_initialized, FALSE, 0, ScoreInfo_SendEntity);
+		Net_LinkEntity(scores_initialized, false, 0, ScoreInfo_SendEntity);
 	}
 	if(teams >= 1)
 		TeamScore_Spawn(NUM_TEAM_1, "Red");
@@ -250,7 +258,7 @@ float PlayerScore_SendEntity(entity to, float sendflags)
 				WriteChar(MSG_ENTITY, self.(scores[i]));
 		}
 
-	return TRUE;
+	return true;
 }
 
 float PlayerScore_Clear(entity player)
@@ -263,9 +271,6 @@ float PlayerScore_Clear(entity player)
 
 	if(MUTATOR_CALLHOOK(ForbidPlayerScore_Clear)) return 0;
 
-	if(g_cts) return 0; // in CTS, you don't lose score by observing
-	if(g_race && g_race_qualifying) return 0; // in qualifying, you don't lose score by observing
-
 	sk = player.scorekeeper;
 	for(i = 0; i < MAX_SCORE; ++i)
 	{
@@ -317,7 +322,7 @@ void PlayerScore_Attach(entity player)
 		error("player already has a scorekeeper");
 	sk = spawn();
 	sk.owner = player;
-	Net_LinkEntity(sk, FALSE, 0, PlayerScore_SendEntity);
+	Net_LinkEntity(sk, false, 0, PlayerScore_SendEntity);
 	player.scorekeeper = sk;
 }
 
@@ -350,7 +355,7 @@ float PlayerScore_Add(entity player, float scorefield, float score)
 		if(scores_label[scorefield] != "")
 			s.SendFlags |= pow(2, scorefield);
 	if(!warmup_stage)
-		PlayerStats_Event(s.owner, strcat(PLAYERSTATS_TOTAL, scores_label[scorefield]), score);
+		PS_GR_P_ADDVAL(s.owner, strcat(PLAYERSTATS_TOTAL, scores_label[scorefield]), score);
 	return (s.(scores[scorefield]) += score);
 }
 
@@ -376,10 +381,10 @@ float PlayerScore_Compare(entity t1, entity t2, float strict)
 		result = ScoreField_Compare(t1, t2, f, scores_flags[i], result, strict);
 	}
 
-	if (result_x == 0 && strict)
-		result_x = num_for_edict(t1.owner) - num_for_edict(t2.owner);
+	if (result.x == 0 && strict)
+		result.x = num_for_edict(t1.owner) - num_for_edict(t2.owner);
 
-	return result_x;
+	return result.x;
 }
 
 void WinningConditionHelper()
@@ -700,7 +705,7 @@ entity PlayerScore_Sort(.float field, float teams, float strict, float nospectat
 	plist = world;
 
 	FOR_EACH_CLIENT(p)
-		p.field = 0;
+		p.(field) = 0;
 
 	FOR_EACH_CLIENT(p) if(p.scorekeeper)
 	{
@@ -740,7 +745,7 @@ entity PlayerScore_Sort(.float field, float teams, float strict, float nospectat
 		if(!plast || PlayerTeamScore_Compare(plast, pbest, teams, 0))
 			j = i;
 
-		pbest.field = j;
+		pbest.(field) = j;
 
 		if (!pfirst)
 			pfirst = pbest;
@@ -776,8 +781,8 @@ float TeamScore_GetCompareValue(float t)
 	return s;
 }
 
-#define NAMEWIDTH 22
-#define SCORESWIDTH 58
+const float NAMEWIDTH = 22;
+const float SCORESWIDTH = 58;
 // TODO put this somewhere in common?
 string Score_NicePrint_ItemColor(float vflags)
 {
@@ -836,7 +841,7 @@ void Score_NicePrint_Player(entity to, entity p, float w)
 	sk = p.scorekeeper;
 
 	s = strcat(s, p.netname);
-	for(;;)
+	for (;;)
 	{
 		i = strlennocol(s) - NAMEWIDTH;
 		if(i > 0)
@@ -917,7 +922,7 @@ void PlayerScore_PlayerStats(entity p)
 	for(i = 0; i < MAX_SCORE; ++i)
 		if(s.(scores[i]) != 0)
 			if(scores_label[i] != "")
-				PlayerStats_Event(s.owner, strcat(PLAYERSTATS_SCOREBOARD, scores_label[i]), s.(scores[i]));
+				PS_GR_P_ADDVAL(s.owner, strcat(PLAYERSTATS_SCOREBOARD, scores_label[i]), s.(scores[i]));
 }
 
 void PlayerScore_TeamStats(void)
@@ -933,6 +938,6 @@ void PlayerScore_TeamStats(void)
 			if(sk.(teamscores[i]) != 0)
 				if(teamscores_label[i] != "")
 					// the +1 is important here!
-					PlayerStats_TeamScore(t+1, strcat(PLAYERSTATS_SCOREBOARD, teamscores_label[i]), sk.(teamscores[i]));
+					PS_GR_T_ADDVAL(t+1, strcat(PLAYERSTATS_SCOREBOARD, teamscores_label[i]), sk.(teamscores[i]));
 	}
 }