]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/mutators/mutator/gamemode_domination.qc
Remove unnecessary returns
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator / gamemode_domination.qc
index ea70cb61a79e9f805a88766cf038d6578a3f5060..5f17bf6a120a3c31ca41d950888cc385bf40560a 100644 (file)
@@ -96,66 +96,65 @@ void set_dom_state(entity e)
                e.dom_pps_pink = pps_pink;
 }
 
-void dompoint_captured ()
-{SELFPARAM();
-       entity head;
+void dompoint_captured(entity this)
+{
        float old_delay, old_team, real_team;
 
        // now that the delay has expired, switch to the latest team to lay claim to this point
-       head = self.owner;
+       entity head = this.owner;
 
-       real_team = self.cnt;
-       self.cnt = -1;
+       real_team = this.cnt;
+       this.cnt = -1;
 
-       dom_EventLog("taken", self.team, self.dmg_inflictor);
-       self.dmg_inflictor = world;
+       dom_EventLog("taken", this.team, this.dmg_inflictor);
+       this.dmg_inflictor = world;
 
-       self.goalentity = head;
-       self.model = head.mdl;
-       self.modelindex = head.dmg;
-       self.skin = head.skin;
+       this.goalentity = head;
+       this.model = head.mdl;
+       this.modelindex = head.dmg;
+       this.skin = head.skin;
 
        float points, wait_time;
        if (autocvar_g_domination_point_amt)
                points = autocvar_g_domination_point_amt;
        else
-               points = self.frags;
+               points = this.frags;
        if (autocvar_g_domination_point_rate)
                wait_time = autocvar_g_domination_point_rate;
        else
-               wait_time = self.wait;
+               wait_time = this.wait;
 
        if(domination_roundbased)
-               bprint(sprintf("^3%s^3%s\n", head.netname, self.message));
+               bprint(sprintf("^3%s^3%s\n", head.netname, this.message));
        else
-               Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_DOMINATION_CAPTURE_TIME, head.netname, self.message, points, wait_time);
+               Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_DOMINATION_CAPTURE_TIME, head.netname, this.message, points, wait_time);
 
-       if(self.enemy.playerid == self.enemy_playerid)
-               PlayerScore_Add(self.enemy, SP_DOM_TAKES, 1);
+       if(this.enemy.playerid == this.enemy_playerid)
+               PlayerScore_Add(this.enemy, SP_DOM_TAKES, 1);
        else
-               self.enemy = world;
+               this.enemy = world;
 
        if (head.noise != "")
-               if(self.enemy)
-                       _sound(self.enemy, CH_TRIGGER, head.noise, VOL_BASE, ATTEN_NORM);
+               if(this.enemy)
+                       _sound(this.enemy, CH_TRIGGER, head.noise, VOL_BASE, ATTEN_NORM);
                else
-                       _sound(self, CH_TRIGGER, head.noise, VOL_BASE, ATTEN_NORM);
+                       _sound(this, CH_TRIGGER, head.noise, VOL_BASE, ATTEN_NORM);
        if (head.noise1 != "")
                play2all(head.noise1);
 
-       self.delay = time + wait_time;
+       this.delay = time + wait_time;
 
        // do trigger work
-       old_delay = self.delay;
-       old_team = self.team;
-       self.team = real_team;
-       self.delay = 0;
-       SUB_UseTargets (self, self, NULL);
-       self.delay = old_delay;
-       self.team = old_team;
+       old_delay = this.delay;
+       old_team = this.team;
+       this.team = real_team;
+       this.delay = 0;
+       SUB_UseTargets (this, this, NULL);
+       this.delay = old_delay;
+       this.team = old_team;
 
        entity msg = WP_DomNeut;
-       switch(self.team)
+       switch(this.team)
        {
                case NUM_TEAM_1: msg = WP_DomRed; break;
                case NUM_TEAM_2: msg = WP_DomBlue; break;
@@ -163,7 +162,7 @@ void dompoint_captured ()
                case NUM_TEAM_4: msg = WP_DomPink; break;
        }
 
-       WaypointSprite_UpdateSprites(self.sprite, msg, WP_Null, WP_Null);
+       WaypointSprite_UpdateSprites(this.sprite, msg, WP_Null, WP_Null);
 
        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; )
@@ -186,74 +185,73 @@ void dompoint_captured ()
                total_pps += points/wait_time;
        ));
 
-       WaypointSprite_UpdateTeamRadar(self.sprite, RADARICON_DOMPOINT, colormapPaletteColor(self.goalentity.team - 1, 0));
-       WaypointSprite_Ping(self.sprite);
+       WaypointSprite_UpdateTeamRadar(this.sprite, RADARICON_DOMPOINT, colormapPaletteColor(this.goalentity.team - 1, 0));
+       WaypointSprite_Ping(this.sprite);
 
-       self.captime = time;
+       this.captime = time;
 
        FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(set_dom_state(it)));
 }
 
-void AnimateDomPoint()
-{SELFPARAM();
-       if(self.pain_finished > time)
+void AnimateDomPoint(entity this)
+{
+       if(this.pain_finished > time)
                return;
-       self.pain_finished = time + self.t_width;
-       if(self.nextthink > self.pain_finished)
-               self.nextthink = self.pain_finished;
+       this.pain_finished = time + this.t_width;
+       if(this.nextthink > this.pain_finished)
+               this.nextthink = this.pain_finished;
 
-       self.frame = self.frame + 1;
-       if(self.frame > self.t_length)
-               self.frame = 0;
+       this.frame = this.frame + 1;
+       if(this.frame > this.t_length)
+               this.frame = 0;
 }
 
 void dompointthink(entity this)
 {
        float fragamt;
 
-       self.nextthink = time + 0.1;
+       this.nextthink = time + 0.1;
 
-       //self.frame = self.frame + 1;
-       //if(self.frame > 119)
-       //      self.frame = 0;
-       AnimateDomPoint();
+       //this.frame = this.frame + 1;
+       //if(this.frame > 119)
+       //      this.frame = 0;
+       AnimateDomPoint(this);
 
        // give points
 
-       if (gameover || self.delay > time || time < game_starttime)     // game has ended, don't keep giving points
+       if (gameover || this.delay > time || time < game_starttime)     // game has ended, don't keep giving points
                return;
 
        if(autocvar_g_domination_point_rate)
-               self.delay = time + autocvar_g_domination_point_rate;
+               this.delay = time + autocvar_g_domination_point_rate;
        else
-               self.delay = time + self.wait;
+               this.delay = time + this.wait;
 
        // give credit to the team
        // NOTE: this defaults to 0
        if (!domination_roundbased)
-       if (self.goalentity.netname != "")
+       if (this.goalentity.netname != "")
        {
                if(autocvar_g_domination_point_amt)
                        fragamt = autocvar_g_domination_point_amt;
                else
-                       fragamt = self.frags;
-               TeamScore_AddToTeam(self.goalentity.team, ST_SCORE, fragamt);
-               TeamScore_AddToTeam(self.goalentity.team, ST_DOM_TICKS, fragamt);
+                       fragamt = this.frags;
+               TeamScore_AddToTeam(this.goalentity.team, ST_SCORE, fragamt);
+               TeamScore_AddToTeam(this.goalentity.team, ST_DOM_TICKS, fragamt);
 
                // give credit to the individual player, if he is still there
-               if (self.enemy.playerid == self.enemy_playerid)
+               if (this.enemy.playerid == this.enemy_playerid)
                {
-                       PlayerScore_Add(self.enemy, SP_SCORE, fragamt);
-                       PlayerScore_Add(self.enemy, SP_DOM_TICKS, fragamt);
+                       PlayerScore_Add(this.enemy, SP_SCORE, fragamt);
+                       PlayerScore_Add(this.enemy, SP_DOM_TICKS, fragamt);
                }
                else
-                       self.enemy = world;
+                       this.enemy = world;
        }
 }
 
 void dompointtouch(entity this)
 {
-       entity head;
        if (!IS_PLAYER(other))
                return;
        if (other.health < 1)
@@ -262,28 +260,28 @@ void dompointtouch(entity this)
        if(round_handler_IsActive() && !round_handler_IsRoundStarted())
                return;
 
-       if(time < self.captime + 0.3)
+       if(time < this.captime + 0.3)
                return;
 
        // only valid teams can claim it
-       head = find(world, classname, "dom_team");
+       entity head = find(world, classname, "dom_team");
        while (head && head.team != other.team)
                head = find(head, classname, "dom_team");
-       if (!head || head.netname == "" || head == self.goalentity)
+       if (!head || head.netname == "" || head == this.goalentity)
                return;
 
        // delay capture
 
-       self.team = self.goalentity.team; // this stores the PREVIOUS team!
+       this.team = this.goalentity.team; // this stores the PREVIOUS team!
 
-       self.cnt = other.team;
-       self.owner = head; // team to switch to after the delay
-       self.dmg_inflictor = other;
+       this.cnt = other.team;
+       this.owner = head; // team to switch to after the delay
+       this.dmg_inflictor = other;
 
-       // self.state = 1;
-       // self.delay = time + cvar("g_domination_point_capturetime");
-       //self.nextthink = time + cvar("g_domination_point_capturetime");
-       //self.think = dompoint_captured;
+       // this.state = 1;
+       // this.delay = time + cvar("g_domination_point_capturetime");
+       //this.nextthink = time + cvar("g_domination_point_capturetime");
+       //this.think = dompoint_captured;
 
        // go to neutral team in the mean time
        head = find(world, classname, "dom_team");
@@ -292,18 +290,18 @@ void dompointtouch(entity this)
        if(head == world)
                return;
 
-       WaypointSprite_UpdateSprites(self.sprite, WP_DomNeut, WP_Null, WP_Null);
-       WaypointSprite_UpdateTeamRadar(self.sprite, RADARICON_DOMPOINT, '0 1 1');
-       WaypointSprite_Ping(self.sprite);
+       WaypointSprite_UpdateSprites(this.sprite, WP_DomNeut, WP_Null, WP_Null);
+       WaypointSprite_UpdateTeamRadar(this.sprite, RADARICON_DOMPOINT, '0 1 1');
+       WaypointSprite_Ping(this.sprite);
 
-       self.goalentity = head;
-       self.model = head.mdl;
-       self.modelindex = head.dmg;
-       self.skin = head.skin;
+       this.goalentity = head;
+       this.model = head.mdl;
+       this.modelindex = head.dmg;
+       this.skin = head.skin;
 
-       self.enemy = other; // individual player scoring
-       self.enemy_playerid = other.playerid;
-       dompoint_captured();
+       this.enemy = other; // individual player scoring
+       this.enemy_playerid = other.playerid;
+       dompoint_captured(this);
 }
 
 void dom_controlpoint_setup(entity this)
@@ -317,48 +315,48 @@ void dom_controlpoint_setup(entity this)
                objerror("no spawnfunc_dom_team with netname \"\" found\n");
 
        // copy important properties from spawnfunc_dom_team entity
-       self.goalentity = head;
-       _setmodel(self, head.mdl); // precision already set
-       self.skin = head.skin;
+       this.goalentity = head;
+       _setmodel(this, head.mdl); // precision already set
+       this.skin = head.skin;
 
-       self.cnt = -1;
+       this.cnt = -1;
 
-       if(self.message == "")
-               self.message = " has captured a control point";
+       if(this.message == "")
+               this.message = " has captured a control point";
 
-       if(self.frags <= 0)
-               self.frags = 1;
-       if(self.wait <= 0)
-               self.wait = 5;
+       if(this.frags <= 0)
+               this.frags = 1;
+       if(this.wait <= 0)
+               this.wait = 5;
 
        float points, waittime;
        if (autocvar_g_domination_point_amt)
                points = autocvar_g_domination_point_amt;
        else
-               points = self.frags;
+               points = this.frags;
        if (autocvar_g_domination_point_rate)
                waittime = autocvar_g_domination_point_rate;
        else
-               waittime = self.wait;
+               waittime = this.wait;
 
        total_pps += points/waittime;
 
-       if(!self.t_width)
-               self.t_width = 0.02; // frame animation rate
-       if(!self.t_length)
-               self.t_length = 239; // maximum frame
-
-       setthink(self, dompointthink);
-       self.nextthink = time;
-       settouch(self, dompointtouch);
-       self.solid = SOLID_TRIGGER;
-       self.flags = FL_ITEM;
-       setsize(self, '-32 -32 -32', '32 32 32');
-       setorigin(self, self.origin + '0 0 20');
-       droptofloor(self);
-
-       waypoint_spawnforitem(self);
-       WaypointSprite_SpawnFixed(WP_DomNeut, self.origin + '0 0 32', self, sprite, RADARICON_DOMPOINT);
+       if(!this.t_width)
+               this.t_width = 0.02; // frame animation rate
+       if(!this.t_length)
+               this.t_length = 239; // maximum frame
+
+       setthink(this, dompointthink);
+       this.nextthink = time;
+       settouch(this, dompointtouch);
+       this.solid = SOLID_TRIGGER;
+       this.flags = FL_ITEM;
+       setsize(this, '-32 -32 -32', '32 32 32');
+       setorigin(this, this.origin + '0 0 20');
+       droptofloor(this);
+
+       waypoint_spawnforitem(this);
+       WaypointSprite_SpawnFixed(WP_DomNeut, this.origin + '0 0 32', this, sprite, RADARICON_DOMPOINT);
 }
 
 float total_controlpoints;
@@ -503,7 +501,7 @@ MUTATOR_HOOKFUNCTION(dom, reset_map_players)
                if(IS_REAL_CLIENT(it))
                        set_dom_state(it);
        ));
-       return 1;
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(dom, PlayerSpawn)
@@ -515,18 +513,20 @@ MUTATOR_HOOKFUNCTION(dom, PlayerSpawn)
                player.player_blocked = 1;
        else
                player.player_blocked = 0;
-       return false;
 }
 
 MUTATOR_HOOKFUNCTION(dom, ClientConnect)
-{SELFPARAM();
-       set_dom_state(self);
-       return false;
+{
+       entity player = M_ARGV(0, entity);
+
+       set_dom_state(player);
 }
 
 MUTATOR_HOOKFUNCTION(dom, HavocBot_ChooseRole)
-{SELFPARAM();
-       self.havocbot_role = havocbot_role_dom;
+{
+       entity bot = M_ARGV(0, entity);
+
+       bot.havocbot_role = havocbot_role_dom;
        return true;
 }