X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_domination.qc;h=89e6fe485d8efba5489b687e4d38e5888946cade;hb=2a355a6602f5697afc155e1a28cab59f2b24132f;hp=50f512991723b0b7e45d40d1686914eb4ed39c10;hpb=49af10f3413b96e52055359d42288dbf5ec6972b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_domination.qc b/qcsrc/server/mutators/gamemode_domination.qc index 50f512991..89e6fe485 100644 --- a/qcsrc/server/mutators/gamemode_domination.qc +++ b/qcsrc/server/mutators/gamemode_domination.qc @@ -34,7 +34,7 @@ void dompoint_captured () self.model = head.mdl; self.modelindex = head.dmg; self.skin = head.skin; - + float points, wait_time; if (autocvar_g_domination_point_amt) points = autocvar_g_domination_point_amt; @@ -75,7 +75,7 @@ void dompoint_captured () SUB_UseTargets (); self.delay = old_delay; self.team = old_team; - + switch(self.team) { case NUM_TEAM_1: msg = "dom-red"; break; @@ -85,7 +85,7 @@ void dompoint_captured () } WaypointSprite_UpdateSprites(self.sprite, msg, "", ""); - + total_pps = 0, pps_red = 0, pps_blue = 0, pps_yellow = 0, pps_pink = 0; for(head = world; (head = find(head, classname, "dom_controlpoint")) != world; ) { @@ -182,7 +182,7 @@ void dompointthink() void dompointtouch() { entity head; - if not(IS_PLAYER(other)) + if (!IS_PLAYER(other)) return; if (other.health < 1) return; @@ -467,7 +467,7 @@ void dom_DelayedInit() // Do this check with a delay so we can wait for teams to print("No ""dom_team"" entities found on this map, creating them anyway.\n"); dom_spawnteams(); } - + ScoreRules_dom(); } @@ -479,13 +479,13 @@ void dom_Initialize() precache_model("models/domination/dom_pink.md3"); precache_model("models/domination/dom_unclaimed.md3"); precache_sound("domination/claim.wav"); - + addstat(STAT_DOM_TOTAL_PPS, AS_FLOAT, dom_total_pps); addstat(STAT_DOM_PPS_RED, AS_FLOAT, dom_pps_red); addstat(STAT_DOM_PPS_BLUE, AS_FLOAT, dom_pps_blue); if(c3 >= 0) addstat(STAT_DOM_PPS_YELLOW, AS_FLOAT, dom_pps_yellow); if(c4 >= 0) addstat(STAT_DOM_PPS_PINK, AS_FLOAT, dom_pps_pink); - + InitializeEntity(world, dom_DelayedInit, INITPRIO_GAMETYPE); } @@ -494,7 +494,7 @@ MUTATOR_DEFINITION(gamemode_domination) { MUTATOR_HOOK(ClientConnect, dom_ClientConnect, CBC_ORDER_ANY); MUTATOR_HOOK(HavocBot_ChooseRule, dom_BotRoles, CBC_ORDER_ANY); - + MUTATOR_ONADD { if(time > 1) // game loads at time 1