X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores.qc;h=1b20101d990d5b7a650b7a04d24e7490a5c63c31;hb=7d4d4e54a5b0fdcce80d396fd9ab8b327ae1aa73;hp=8f9da8b061d581bf609d34c3cf4c9ae84f877ede;hpb=77f03e6ce033bef39ac19e0e7cb6e606ffcb26db;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 8f9da8b06..1b20101d9 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -1,5 +1,10 @@ #include "scores.qh" +#include "command/common.qh" +#include "mutators/all.qh" +#include "../common/playerstats.qh" +#include "../common/teams.qh" + .entity scorekeeper; entity teamscorekeepers[16]; string scores_label[MAX_SCORE]; @@ -18,29 +23,29 @@ vector ScoreField_Compare(entity t1, entity t2, .float field, float fieldflags, return previous; 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; if(fieldflags & SFL_ZERO_IS_WORST) { - if(t1.field == 0) + if (t1.(field) == 0) { previous.x = -1; return previous; } - else if(t2.field == 0) + else if (t2.(field) == 0) { 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; } @@ -49,12 +54,14 @@ vector ScoreField_Compare(entity t1, entity t2, .float field, float fieldflags, * teamscore entities */ -float TeamScore_SendEntity(entity to, float sendflags) +bool TeamScore_SendEntity(entity this, entity to, float sendflags) { float i, p, longflags; - WriteByte(MSG_ENTITY, ENT_CLIENT_TEAMSCORES); - WriteByte(MSG_ENTITY, self.team - 1); + WriteHeader(MSG_ENTITY, ENT_CLIENT_TEAMSCORES); + int t = this.team - 1; + assert(t, eprint(this)); + WriteByte(MSG_ENTITY, t); longflags = 0; for(i = 0, p = 1; i < MAX_TEAMSCORE; ++i, p *= 2) @@ -82,9 +89,8 @@ float TeamScore_SendEntity(entity to, float sendflags) void TeamScore_Spawn(float t, string name) { - entity ts; - ts = spawn(); - ts.classname = "csqc_score_team"; + entity ts = new(csqc_score_team); + make_pure(ts); ts.netname = name; // not used yet, FIXME ts.team = t; Net_LinkEntity(ts, false, 0, TeamScore_SendEntity); @@ -180,10 +186,10 @@ void ScoreInfo_SetLabel_TeamScore(float i, string label, float scoreflags) } } -float ScoreInfo_SendEntity(entity to, float sf) +bool ScoreInfo_SendEntity(entity this, entity to, int sf) { float i; - WriteByte(MSG_ENTITY, ENT_CLIENT_SCORES_INFO); + WriteHeader(MSG_ENTITY, ENT_CLIENT_SCORES_INFO); WriteInt24_t(MSG_ENTITY, MapInfo_LoadedGametype); for(i = 0; i < MAX_SCORE; ++i) { @@ -206,8 +212,8 @@ void ScoreInfo_Init(float teams) } else { - scores_initialized = spawn(); - scores_initialized.classname = "ent_client_scoreinfo"; + scores_initialized = new(ent_client_scoreinfo); + make_pure(scores_initialized); Net_LinkEntity(scores_initialized, false, 0, ScoreInfo_SendEntity); } if(teams >= 1) @@ -224,12 +230,12 @@ void ScoreInfo_Init(float teams) * per-player score entities */ -float PlayerScore_SendEntity(entity to, float sendflags) +bool PlayerScore_SendEntity(entity this, entity to, float sendflags) { float i, p, longflags; - WriteByte(MSG_ENTITY, ENT_CLIENT_SCORES); - WriteByte(MSG_ENTITY, num_for_edict(self.owner)); + WriteHeader(MSG_ENTITY, ENT_CLIENT_SCORES); + WriteByte(MSG_ENTITY, etof(self.owner)); longflags = 0; for(i = 0, p = 1; i < MAX_SCORE; ++i, p *= 2) @@ -311,10 +317,10 @@ void Score_ClearAll() void PlayerScore_Attach(entity player) { - entity sk; if(player.scorekeeper) error("player already has a scorekeeper"); - sk = spawn(); + entity sk = new(scorekeeper); + make_pure(sk); sk.owner = player; Net_LinkEntity(sk, false, 0, PlayerScore_SendEntity); player.scorekeeper = sk; @@ -330,14 +336,15 @@ void PlayerScore_Detach(entity player) float PlayerScore_Add(entity player, float scorefield, float score) { - entity s; + bool mutator_returnvalue = MUTATOR_CALLHOOK(AddPlayerScore, scorefield, score); + score = ret_float; if(gameover) - if(!(g_lms && scorefield == SP_LMS_RANK)) // allow writing to this field in intermission as it is needed for newly joining players + if(!mutator_returnvalue) score = 0; if(!scores_initialized) return 0; // FIXME remove this when everything uses this system - s = player.scorekeeper; + entity s = player.scorekeeper; if(!s) { if(gameover) @@ -376,7 +383,7 @@ float PlayerScore_Compare(entity t1, entity t2, float strict) } if (result.x == 0 && strict) - result.x = num_for_edict(t1.owner) - num_for_edict(t2.owner); + result.x = etof(t1.owner) - etof(t2.owner); return result.x; } @@ -402,7 +409,7 @@ void WinningConditionHelper() s = GetGametype(); s = strcat(s, ":", autocvar_g_xonoticversion); s = strcat(s, ":P", ftos(cvar_purechanges_count)); - s = strcat(s, ":S", ftos(nJoinAllowed(world))); + s = strcat(s, ":S", ftos(nJoinAllowed(self, world))); s = strcat(s, ":F", ftos(serverflags)); s = strcat(s, ":M", modname); s = strcat(s, "::", GetPlayerScoreString(world, (fullstatus ? 1 : 2))); @@ -524,22 +531,24 @@ void WinningConditionHelper() FOR_EACH_CLIENT(p) { + string s = ""; if(fullstatus) { s = GetPlayerScoreString(p, 1); - if(IS_REAL_CLIENT(p)) - s = strcat(s, ":human"); - else - s = strcat(s, ":bot"); - if(!IS_PLAYER(p) && p.caplayer != 1 && !g_lms) + s = strcat(s, IS_REAL_CLIENT(p) ? ":human" : ":bot"); + ret_string = string_null; + if(!IS_PLAYER(p) && !MUTATOR_CALLHOOK(GetPlayerStatus, p, s)) s = strcat(s, ":spectator"); + if (ret_string) s = strcat(s, ret_string); } else { - if(IS_PLAYER(p) || p.caplayer == 1 || g_lms) + ret_string = string_null; + if (IS_PLAYER(p) || MUTATOR_CALLHOOK(GetPlayerStatus, p, s)) s = GetPlayerScoreString(p, 2); else s = "-666"; + if (ret_string) s = strcat(s, ret_string); } if(p.clientstatus) @@ -699,7 +708,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) { @@ -739,7 +748,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; @@ -919,7 +928,7 @@ void PlayerScore_PlayerStats(entity p) PS_GR_P_ADDVAL(s.owner, strcat(PLAYERSTATS_SCOREBOARD, scores_label[i]), s.(scores[i])); } -void PlayerScore_TeamStats(void) +void PlayerScore_TeamStats() { entity sk; float t, i;