From: TimePath Date: Sat, 6 Aug 2016 06:59:04 +0000 (+1000) Subject: Merge branch 'master' into TimePath/scoreboard_elo X-Git-Tag: xonotic-v0.8.2~748^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f133bdb70d13143f2ce4b9de097744371c1f92a;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into TimePath/scoreboard_elo # Conflicts: # .gitlab-ci.yml # qcsrc/common/gamemodes/gamemode/nexball/nexball.qc # qcsrc/server/mutators/mutator/gamemode_freezetag.qc # qcsrc/server/mutators/mutator/gamemode_keyhunt.qc # qcsrc/server/scores_rules.qc --- 4f133bdb70d13143f2ce4b9de097744371c1f92a diff --cc qcsrc/client/hud/panel/infomessages.qc index 855f1a79a,1839263a4..640bc404a --- a/qcsrc/client/hud/panel/infomessages.qc +++ b/qcsrc/client/hud/panel/infomessages.qc @@@ -93,16 -114,16 +114,16 @@@ void HUD_InfoMessages( { entity sk; sk = playerslots[player_localnum]; - if(sk.(scores[ps_primary]) >= 666) + if(sk.(scores(ps_primary)) >= 666) s = _("^1Match has already begun"); - else if(sk.(scores[ps_primary]) > 0) + else if(sk.(scores(ps_primary)) > 0) s = _("^1You have no more lives left"); else - s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey("jump", "+jump")); + s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey(_("jump"), "+jump")); } else - s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey("jump", "+jump")); - drawInfoMessage(s); + s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey(_("jump"), "+jump")); + InfoMessage(s); } if (time < STAT(GAMESTARTTIME)) diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc index 0f45e93e5,b65b558fd..b50013ff7 --- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc +++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc @@@ -70,7 -70,9 +70,7 @@@ float OtherTeam(float t) //works only } const float ST_NEXBALL_GOALS = 1; - void nb_ScoreRules(float teams) -const float SP_NEXBALL_GOALS = 4; -const float SP_NEXBALL_FAULTS = 5; + void nb_ScoreRules(int teams) { ScoreRules_basics(teams, 0, 0, true); ScoreInfo_SetLabel_TeamScore( ST_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); diff --cc qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc index b35d84883,d3c52e04b..14ee4eceb --- a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc @@@ -2249,9 -2229,14 +2227,14 @@@ spawnfunc(onslaught_generator void ons_ScoreRules() { CheckAllowedTeams(NULL); - ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, 0, true); + int teams = 0; + if(c1 >= 0) teams |= BIT(0); + if(c2 >= 0) teams |= BIT(1); + if(c3 >= 0) teams |= BIT(2); + if(c4 >= 0) teams |= BIT(3); + ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, 0, true); ScoreInfo_SetLabel_TeamScore (ST_ONS_CAPS, "destroyed", SFL_SORT_PRIO_PRIMARY); - ScoreInfo_SetLabel_PlayerScore(SP_ONS_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); + ScoreInfo_SetLabel_PlayerScore(SP_ONS_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); ScoreInfo_SetLabel_PlayerScore(SP_ONS_TAKES, "takes", 0); ScoreRules_basics_end(); } diff --cc qcsrc/server/mutators/mutator/gamemode_freezetag.qc index b20269c42,935479890..c64118cd6 --- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc @@@ -61,7 -61,8 +61,7 @@@ int autocvar_g_freezetag_teams int autocvar_g_freezetag_teams_override; float autocvar_g_freezetag_warmup; - void freezetag_ScoreRules(float teams) -const float SP_FREEZETAG_REVIVALS = 4; + void freezetag_ScoreRules(int teams) { ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); // SFL_SORT_PRIO_PRIMARY ScoreInfo_SetLabel_PlayerScore(SP_FREEZETAG_REVIVALS, "revivals", 0); diff --cc qcsrc/server/mutators/mutator/gamemode_keyhunt.qc index bb28b5ef6,64b0397aa..236db8aa8 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc @@@ -138,7 -138,13 +138,7 @@@ float kh_interferemsg_time, kh_interfer float kh_key_dropped, kh_key_carried; const float ST_KH_CAPS = 1; - void kh_ScoreRules(float teams) -const float SP_KH_CAPS = 4; -const float SP_KH_PUSHES = 5; -const float SP_KH_DESTROYS = 6; -const float SP_KH_PICKUPS = 7; -const float SP_KH_KCKILLS = 8; -const float SP_KH_LOSSES = 9; + void kh_ScoreRules(int teams) { ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); ScoreInfo_SetLabel_TeamScore( ST_KH_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); diff --cc qcsrc/server/scores_rules.qc index cb9c2e3ce,b93c114c0..d3aceac50 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@@ -3,17 -3,30 +3,30 @@@ #include "cl_client.qh" #include "scores.qh" + int ScoreRules_teams; + void CheckAllowedTeams (entity for_whom); + int NumTeams(int teams) + { + return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3)); + } + + int AvailableTeams() + { + return NumTeams(ScoreRules_teams); + // NOTE: this method is unreliable, as forced teams set the c* globals to weird values + //return boolean(c1 >= 0) + boolean(c2 >= 0) + boolean(c3 >= 0) + boolean(c4 >= 0); + } + -// NOTE: SP_ constants may not be >= MAX_SCORE; ST_constants may not be >= MAX_TEAMSCORE +// NOTE: ST_constants may not be >= MAX_TEAMSCORE // scores that should be in all modes: - float ScoreRules_teams; - void ScoreRules_basics(float teams, float sprio, float stprio, float score_enabled) + void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled) { - float i; - for(i = 0; i < MAX_SCORE; ++i) - ScoreInfo_SetLabel_PlayerScore(i, "", 0); - for(i = 0; i < MAX_TEAMSCORE; ++i) + FOREACH(Scores, true, { + ScoreInfo_SetLabel_PlayerScore(it, "", 0); + }); + for(int i = 0; i < MAX_TEAMSCORE; ++i) ScoreInfo_SetLabel_TeamScore(i, "", 0); ScoreRules_teams = teams;