X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fnexball%2Fnexball.qc;h=1636965e0b79ab70e12d086587a7e20a84eb2443;hb=ee7a78f942624de2ab30112a798e3f663cf9cc2f;hp=cc24cfde6449d86b2dbfe13fd7dae679740f4fe4;hpb=1add7fc6b9e512dcfcfd3180505046449ac782cd;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc index cc24cfde6..1636965e0 100644 --- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc +++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc @@ -1,6 +1,18 @@ #include "nexball.qh" #ifdef IMPLEMENTATION +#ifdef CSQC +int autocvar_cl_eventchase_nexball = 1; + +REGISTER_MUTATOR(cl_nb, true); + +MUTATOR_HOOKFUNCTION(cl_nb, WantEventchase) +{ + if(autocvar_cl_eventchase_nexball && gametype == MAPINFO_TYPE_NEXBALL && !(WepSet_GetFromStat() & WEPSET(NEXBALL))) + return true; + return false; +} +#endif #ifdef SVQC .float metertime = _STAT(NB_METERSTART); @@ -40,9 +52,9 @@ float autocvar_g_balance_nexball_secondary_lifetime; float autocvar_g_balance_nexball_secondary_refire; float autocvar_g_balance_nexball_secondary_speed; -void basketball_touch(); -void football_touch(); -void ResetBall(); +void basketball_touch(entity this, entity toucher); +void football_touch(entity this, entity toucher); +void ResetBall(entity this); const int NBM_NONE = 0; const int NBM_FOOTBALL = 2; const int NBM_BASKETBALL = 4; @@ -51,7 +63,7 @@ float nexball_mode; float OtherTeam(float t) //works only if there are two teams on the map! { entity e; - e = find(world, classname, "nexball_team"); + e = find(NULL, classname, "nexball_team"); if(e.team == t) e = find(e, classname, "nexball_team"); return e.team; @@ -60,7 +72,7 @@ float OtherTeam(float t) //works only if there are two teams on the map! const float ST_NEXBALL_GOALS = 1; const float SP_NEXBALL_GOALS = 4; const float SP_NEXBALL_FAULTS = 5; -void nb_ScoreRules(float teams) +void nb_ScoreRules(int teams) { ScoreRules_basics(teams, 0, 0, true); ScoreInfo_SetLabel_TeamScore( ST_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); @@ -75,7 +87,7 @@ void LogNB(string mode, entity actor) if(!autocvar_sv_eventlog) return; s = strcat(":nexball:", mode); - if(actor != world) + if(actor != NULL) s = strcat(s, ":", ftos(actor.playerid)); GameLogEcho(s); } @@ -84,11 +96,11 @@ void ball_restart(entity this) { if(this.owner) DropBall(this, this.owner.origin, '0 0 0'); - ResetBall(); + ResetBall(this); } -void nexball_setstatus() -{SELFPARAM(); +void nexball_setstatus(entity this) +{ this.items &= ~IT_KEY1; if(this.ballcarried) { @@ -96,7 +108,8 @@ void nexball_setstatus() { bprint("The ", Team_ColoredFullName(this.team), " held the ball for too long.\n"); DropBall(this.ballcarried, this.ballcarried.owner.origin, '0 0 0'); - WITHSELF(this.ballcarried, ResetBall()); + entity e = this.ballcarried; + ResetBall(e); } else this.items |= IT_KEY1; @@ -111,7 +124,7 @@ void relocate_nexball(entity this) vector o; o = this.origin; if(!move_out_of_solid(this)) - objerror("could not get out of solid at all!"); + objerror(this, "could not get out of solid at all!"); LOG_INFO("^1NOTE: this map needs FIXING. ", this.classname, " at ", vtos(o - '0 0 1')); LOG_INFO(" needs to be moved out of solid, e.g. by '", ftos(this.origin.x - o.x)); LOG_INFO(" ", ftos(this.origin.y - o.y)); @@ -120,8 +133,8 @@ void relocate_nexball(entity this) } } -void DropOwner() -{SELFPARAM(); +void DropOwner(entity this) +{ entity ownr; ownr = this.owner; DropBall(this, ownr.origin, ownr.velocity); @@ -137,7 +150,7 @@ void GiveBall(entity plyr, entity ball) if(ownr) { ownr.effects &= ~autocvar_g_nexball_basketball_effects_default; - ownr.ballcarried = world; + ownr.ballcarried = NULL; if(ownr.metertime) { ownr.metertime = 0; @@ -175,7 +188,7 @@ void GiveBall(entity plyr, entity ball) if(autocvar_g_nexball_basketball_delay_hold) { - ball.think = DropOwner; + setthink(ball, DropOwner); ball.nextthink = time + autocvar_g_nexball_basketball_delay_hold; } @@ -183,9 +196,9 @@ void GiveBall(entity plyr, entity ball) plyr.(weaponentity).m_switchweapon = PS(plyr).m_weapon; plyr.weapons = WEPSET(NEXBALL); Weapon w = WEP_NEXBALL; - WITHSELF(plyr, w.wr_resetplayer(w)); + w.wr_resetplayer(w, plyr); PS(plyr).m_switchweapon = WEP_NEXBALL; - WITHSELF(plyr, W_SwitchWeapon(plyr, WEP_NEXBALL)); + W_SwitchWeapon(plyr, WEP_NEXBALL); } void DropBall(entity ball, vector org, vector vel) @@ -194,7 +207,7 @@ void DropBall(entity ball, vector org, vector vel) ball.effects &= ~EF_NOSHADOW; ball.owner.effects &= ~autocvar_g_nexball_basketball_effects_default; - setattachment(ball, world, ""); + setattachment(ball, NULL, ""); setorigin(ball, org); ball.movetype = MOVETYPE_BOUNCE; UNSET_ONGROUND(ball); @@ -202,7 +215,7 @@ void DropBall(entity ball, vector org, vector vel) ball.velocity = vel; ball.nb_droptime = time; settouch(ball, basketball_touch); - ball.think = ResetBall; + setthink(ball, ResetBall); ball.nextthink = min(time + autocvar_g_nexball_delay_idle, ball.teamtime); if(ball.owner.metertime) @@ -213,15 +226,15 @@ void DropBall(entity ball, vector org, vector vel) } WaypointSprite_Kill(ball.owner.waypointsprite_attachedforcarrier); - WaypointSprite_Spawn(WP_NbBall, 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER); // no health bar please + WaypointSprite_Spawn(WP_NbBall, 0, 0, ball, '0 0 64', NULL, ball.team, ball, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER); // no health bar please WaypointSprite_UpdateRule(ball.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT); - ball.owner.ballcarried = world; - ball.owner = world; + ball.owner.ballcarried = NULL; + ball.owner = NULL; } -void InitBall() -{SELFPARAM(); +void InitBall(entity this) +{ if(gameover) return; UNSET_ONGROUND(this); this.movetype = MOVETYPE_BOUNCE; @@ -230,18 +243,18 @@ void InitBall() else if(this.classname == "nexball_football") settouch(this, football_touch); this.cnt = 0; - this.think = ResetBall; + setthink(this, ResetBall); this.nextthink = time + autocvar_g_nexball_delay_idle + 3; this.teamtime = 0; - this.pusher = world; + this.pusher = NULL; this.team = false; _sound(this, CH_TRIGGER, this.noise1, VOL_BASE, ATTEN_NORM); WaypointSprite_Ping(this.waypointsprite_attachedforcarrier); - LogNB("init", world); + LogNB("init", NULL); } -void ResetBall() -{SELFPARAM(); +void ResetBall(entity this) +{ if(this.cnt < 2) // step 1 { if(time == this.teamtime) @@ -251,7 +264,7 @@ void ResetBall() this.movetype = MOVETYPE_NOCLIP; this.velocity = '0 0 0'; // just in case? if(!this.cnt) - LogNB("resetidle", world); + LogNB("resetidle", NULL); this.cnt = 2; this.nextthink = time; } @@ -265,105 +278,105 @@ void ResetBall() else // step 4 { // dprint("Step 4: time: ", ftos(time), "\n"); - if(vlen(this.origin - this.spawnorigin) > 10) // should not happen anymore + if(vdist(this.origin - this.spawnorigin, >, 10)) // should not happen anymore LOG_TRACE("The ball moved too far away from its spawn origin.\nOffset: ", vtos(this.origin - this.spawnorigin), " Velocity: ", vtos(this.velocity), "\n"); this.velocity = '0 0 0'; setorigin(this, this.spawnorigin); // make sure it's positioned correctly anyway this.movetype = MOVETYPE_NONE; - this.think = InitBall; + setthink(this, InitBall); this.nextthink = max(time, game_starttime) + autocvar_g_nexball_delay_start; } } -void football_touch() -{SELFPARAM(); - if(other.solid == SOLID_BSP) +void football_touch(entity this, entity toucher) +{ + if(toucher.solid == SOLID_BSP) { - if(time > self.lastground + 0.1) + if(time > this.lastground + 0.1) { - _sound(self, CH_TRIGGER, self.noise, VOL_BASE, ATTEN_NORM); - self.lastground = time; + _sound(this, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM); + this.lastground = time; } - if(vlen(self.velocity) && !self.cnt) - self.nextthink = time + autocvar_g_nexball_delay_idle; + if(this.velocity && !this.cnt) + this.nextthink = time + autocvar_g_nexball_delay_idle; return; } - if (!IS_PLAYER(other)) + if (!IS_PLAYER(toucher)) return; - if(other.health < 1) + if(toucher.health < 1) return; - if(!self.cnt) - self.nextthink = time + autocvar_g_nexball_delay_idle; + if(!this.cnt) + this.nextthink = time + autocvar_g_nexball_delay_idle; - self.pusher = other; - self.team = other.team; + this.pusher = toucher; + this.team = toucher.team; if(autocvar_g_nexball_football_physics == -1) // MrBougo try 1, before decompiling Rev's original { - if(vlen(other.velocity)) - self.velocity = other.velocity * 1.5 + '0 0 1' * autocvar_g_nexball_football_boost_up; + if(toucher.velocity) + this.velocity = toucher.velocity * 1.5 + '0 0 1' * autocvar_g_nexball_football_boost_up; } else if(autocvar_g_nexball_football_physics == 1) // MrBougo's modded Rev style: partially independant of the height of the aiming point { - makevectors(other.v_angle); - self.velocity = other.velocity + v_forward * autocvar_g_nexball_football_boost_forward + '0 0 1' * autocvar_g_nexball_football_boost_up; + makevectors(toucher.v_angle); + this.velocity = toucher.velocity + v_forward * autocvar_g_nexball_football_boost_forward + '0 0 1' * autocvar_g_nexball_football_boost_up; } else if(autocvar_g_nexball_football_physics == 2) // 2nd mod try: totally independant. Really playable! { - makevectors(other.v_angle.y * '0 1 0'); - self.velocity = other.velocity + v_forward * autocvar_g_nexball_football_boost_forward + v_up * autocvar_g_nexball_football_boost_up; + makevectors(toucher.v_angle.y * '0 1 0'); + this.velocity = toucher.velocity + v_forward * autocvar_g_nexball_football_boost_forward + v_up * autocvar_g_nexball_football_boost_up; } else // Revenant's original style (from the original mod's disassembly, acknowledged by Revenant) { - makevectors(other.v_angle); - self.velocity = other.velocity + v_forward * autocvar_g_nexball_football_boost_forward + v_up * autocvar_g_nexball_football_boost_up; + makevectors(toucher.v_angle); + this.velocity = toucher.velocity + v_forward * autocvar_g_nexball_football_boost_forward + v_up * autocvar_g_nexball_football_boost_up; } - self.avelocity = -250 * v_forward; // maybe there is a way to make it look better? + this.avelocity = -250 * v_forward; // maybe there is a way to make it look better? } -void basketball_touch() -{SELFPARAM(); - if(other.ballcarried) +void basketball_touch(entity this, entity toucher) +{ + if(toucher.ballcarried) { - football_touch(); + football_touch(this, toucher); return; } - if(!self.cnt && IS_PLAYER(other) && !STAT(FROZEN, other) && !IS_DEAD(other) && (other != self.nb_dropper || time > self.nb_droptime + autocvar_g_nexball_delay_collect)) + if(!this.cnt && IS_PLAYER(toucher) && !STAT(FROZEN, toucher) && !IS_DEAD(toucher) && (toucher != this.nb_dropper || time > this.nb_droptime + autocvar_g_nexball_delay_collect)) { - if(other.health <= 0) + if(toucher.health <= 0) return; - LogNB("caught", other); - GiveBall(other, self); + LogNB("caught", toucher); + GiveBall(toucher, this); } - else if(other.solid == SOLID_BSP) + else if(toucher.solid == SOLID_BSP) { - _sound(self, CH_TRIGGER, self.noise, VOL_BASE, ATTEN_NORM); - if(vlen(self.velocity) && !self.cnt) - self.nextthink = min(time + autocvar_g_nexball_delay_idle, self.teamtime); + _sound(this, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM); + if(this.velocity && !this.cnt) + this.nextthink = min(time + autocvar_g_nexball_delay_idle, this.teamtime); } } -void GoalTouch() -{SELFPARAM(); +void GoalTouch(entity this, entity toucher) +{ entity ball; float isclient, pscore, otherteam; string pname; if(gameover) return; - if((self.spawnflags & GOAL_TOUCHPLAYER) && other.ballcarried) - ball = other.ballcarried; + if((this.spawnflags & GOAL_TOUCHPLAYER) && toucher.ballcarried) + ball = toucher.ballcarried; else - ball = other; + ball = toucher; if(ball.classname != "nexball_basketball") if(ball.classname != "nexball_football") return; - if((!ball.pusher && self.team != GOAL_OUT) || ball.cnt) + if((!ball.pusher && this.team != GOAL_OUT) || ball.cnt) return; - EXACTTRIGGER_TOUCH; + EXACTTRIGGER_TOUCH(this, toucher); - if(nb_teams == 2) + if(NumTeams(nb_teams) == 2) otherteam = OtherTeam(ball.team); else otherteam = 0; @@ -373,25 +386,25 @@ void GoalTouch() else pname = "Someone (?)"; - if(ball.team == self.team) //owngoal (regular goals) + if(ball.team == this.team) //owngoal (regular goals) { LogNB("owngoal", ball.pusher); bprint("Boo! ", pname, "^7 scored a goal against their own team!\n"); pscore = -1; } - else if(self.team == GOAL_FAULT) + else if(this.team == GOAL_FAULT) { LogNB("fault", ball.pusher); - if(nb_teams == 2) + if(NumTeams(nb_teams) == 2) bprint(Team_ColoredFullName(otherteam), " gets a point due to ", pname, "^7's silliness.\n"); else bprint(Team_ColoredFullName(ball.team), " loses a point due to ", pname, "^7's silliness.\n"); pscore = -1; } - else if(self.team == GOAL_OUT) + else if(this.team == GOAL_OUT) { LogNB("out", ball.pusher); - if((self.spawnflags & GOAL_TOUCHPLAYER) && ball.owner) + if((this.spawnflags & GOAL_TOUCHPLAYER) && ball.owner) bprint(pname, "^7 went out of bounds.\n"); else bprint("The ball was returned.\n"); @@ -399,16 +412,16 @@ void GoalTouch() } else //score { - LogNB(strcat("goal:", ftos(self.team)), ball.pusher); + LogNB(strcat("goal:", ftos(this.team)), ball.pusher); bprint("Goaaaaal! ", pname, "^7 scored a point for the ", Team_ColoredFullName(ball.team), ".\n"); pscore = 1; } - _sound(ball, CH_TRIGGER, self.noise, VOL_BASE, ATTEN_NONE); + _sound(ball, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NONE); if(ball.team && pscore) { - if(nb_teams == 2 && pscore < 0) + if(NumTeams(nb_teams) == 2 && pscore < 0) TeamScore_AddToTeam(otherteam, ST_NEXBALL_GOALS, -pscore); else TeamScore_AddToTeam(ball.team, ST_NEXBALL_GOALS, pscore); @@ -427,10 +440,10 @@ void GoalTouch() WaypointSprite_Ping(ball.waypointsprite_attachedforcarrier); ball.cnt = 1; - ball.think = ResetBall; + setthink(ball, ResetBall); if(ball.classname == "nexball_basketball") settouch(ball, football_touch); // better than func_null: football control until the ball gets reset - ball.nextthink = time + autocvar_g_nexball_delay_goal * (self.team != GOAL_OUT); + ball.nextthink = time + autocvar_g_nexball_delay_goal * (this.team != GOAL_OUT); } //=======================// @@ -453,14 +466,14 @@ void nb_spawnteam(string teamname, float teamcolor) e.netname = teamname; e.cnt = teamcolor; e.team = e.cnt + 1; - nb_teams += 1; + //nb_teams += 1; } void nb_spawnteams() { bool t_red = false, t_blue = false, t_yellow = false, t_pink = false; entity e; - for(e = world; (e = find(e, classname, "nexball_goal"));) + for(e = NULL; (e = find(e, classname, "nexball_goal"));) { switch(e.team) { @@ -468,6 +481,7 @@ void nb_spawnteams() if(!t_red) { nb_spawnteam("Red", e.team-1) ; + nb_teams |= BIT(0); t_red = true; } break; @@ -476,6 +490,7 @@ void nb_spawnteams() { nb_spawnteam("Blue", e.team-1) ; t_blue = true; + nb_teams |= BIT(1); } break; case NUM_TEAM_3: @@ -483,6 +498,7 @@ void nb_spawnteams() { nb_spawnteam("Yellow", e.team-1); t_yellow = true; + nb_teams |= BIT(2); } break; case NUM_TEAM_4: @@ -490,6 +506,7 @@ void nb_spawnteams() { nb_spawnteam("Pink", e.team-1) ; t_pink = true; + nb_teams |= BIT(3); } break; } @@ -498,7 +515,7 @@ void nb_spawnteams() void nb_delayedinit(entity this) { - if(find(world, classname, "nexball_team") == world) + if(find(NULL, classname, "nexball_team") == NULL) nb_spawnteams(); nb_ScoreRules(nb_teams); } @@ -556,7 +573,7 @@ void SpawnBall(entity this) WaypointSprite_AttachCarrier(WP_NbBall, this, RADARICON_FLAGCARRIER); // the ball's team is not set yet, no rule update needed this.reset = ball_restart; - this.think = InitBall; + setthink(this, InitBall); this.nextthink = game_starttime + autocvar_g_nexball_delay_start; } @@ -596,11 +613,10 @@ spawnfunc(nexball_football) SpawnBall(this); } -float nb_Goal_Customize() -{SELFPARAM(); - entity e, wp_owner; - e = WaypointSprite_getviewentity(other); - wp_owner = self.owner; +bool nb_Goal_Customize(entity this, entity client) +{ + entity e = WaypointSprite_getviewentity(client); + entity wp_owner = this.owner; if(SAME_TEAM(e, wp_owner)) { return false; } return true; @@ -616,7 +632,7 @@ void SpawnGoal(entity this) { entity wp = WaypointSprite_SpawnFixed(WP_NbGoal, (this.absmin + this.absmax) * 0.5, this, sprite, RADARICON_NONE); wp.colormod = ((this.team) ? Team_ColorRGB(this.team) : '1 0.5 0'); - this.sprite.customizeentityforclient = nb_Goal_Customize; + setcefc(this.sprite, nb_Goal_Customize); } this.classname = "nexball_goal"; @@ -702,8 +718,8 @@ spawnfunc(ball_bound) //=======================// -void W_Nexball_Think() -{SELFPARAM(); +void W_Nexball_Think(entity this) +{ //dprint("W_Nexball_Think\n"); //vector new_dir = steerlib_arrive(this.enemy.origin, 2500); vector new_dir = normalize(this.enemy.origin + '0 0 50' - this.origin); @@ -717,50 +733,50 @@ void W_Nexball_Think() this.nextthink = time; } -void W_Nexball_Touch() -{SELFPARAM(); +void W_Nexball_Touch(entity this, entity toucher) +{ entity ball, attacker; - attacker = self.owner; - //self.think = func_null; - //self.enemy = world; + attacker = this.owner; + //this.think = func_null; + //this.enemy = NULL; - PROJECTILE_TOUCH; - if(attacker.team != other.team || autocvar_g_nexball_basketball_teamsteal) - if((ball = other.ballcarried) && !STAT(FROZEN, other) && !IS_DEAD(other) && (IS_PLAYER(attacker))) + PROJECTILE_TOUCH(this, toucher); + if(attacker.team != toucher.team || autocvar_g_nexball_basketball_teamsteal) + if((ball = toucher.ballcarried) && !STAT(FROZEN, toucher) && !IS_DEAD(toucher) && (IS_PLAYER(attacker))) { - other.velocity = other.velocity + normalize(self.velocity) * other.damageforcescale * autocvar_g_balance_nexball_secondary_force; - UNSET_ONGROUND(other); + toucher.velocity = toucher.velocity + normalize(this.velocity) * toucher.damageforcescale * autocvar_g_balance_nexball_secondary_force; + UNSET_ONGROUND(toucher); if(!attacker.ballcarried) { LogNB("stole", attacker); - _sound(other, CH_TRIGGER, ball.noise2, VOL_BASE, ATTEN_NORM); + _sound(toucher, CH_TRIGGER, ball.noise2, VOL_BASE, ATTEN_NORM); - if(SAME_TEAM(attacker, other) && time > attacker.teamkill_complain) + if(SAME_TEAM(attacker, toucher) && time > attacker.teamkill_complain) { attacker.teamkill_complain = time + 5; attacker.teamkill_soundtime = time + 0.4; - attacker.teamkill_soundsource = other; + attacker.teamkill_soundsource = toucher; } - GiveBall(attacker, other.ballcarried); + GiveBall(attacker, toucher.ballcarried); } } - remove(self); + remove(this); } -void W_Nexball_Attack(float t) -{SELFPARAM(); +void W_Nexball_Attack(entity actor, float t) +{ entity ball; float mul, mi, ma; - if(!(ball = self.ballcarried)) + if(!(ball = actor.ballcarried)) return; - W_SetupShot(self, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0); - tracebox(w_shotorg, BALL_MINS, BALL_MAXS, w_shotorg, MOVE_WORLDONLY, world); + W_SetupShot(actor, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0); + tracebox(w_shotorg, BALL_MINS, BALL_MAXS, w_shotorg, MOVE_WORLDONLY, NULL); if(trace_startsolid) { - if(self.metertime) - self.metertime = 0; // Shot failed, hide the power meter + if(actor.metertime) + actor.metertime = 0; // Shot failed, hide the power meter return; } @@ -778,7 +794,7 @@ void W_Nexball_Attack(float t) mul = mi + (ma - mi) * mul; // range from the minimal power to the maximal power } - DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, false)); + DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(actor, actor.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, false)); //TODO: use the speed_up cvar too ?? @@ -786,14 +802,14 @@ void W_Nexball_Attack(float t) vector trigger_push_calculatevelocity(vector org, entity tgt, float ht); -void W_Nexball_Attack2() -{SELFPARAM(); - if(self.ballcarried.enemy) +void W_Nexball_Attack2(entity actor) +{ + if(actor.ballcarried.enemy) { - entity _ball = self.ballcarried; - W_SetupShot(self, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0); + entity _ball = actor.ballcarried; + W_SetupShot(actor, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0); DropBall(_ball, w_shotorg, trigger_push_calculatevelocity(_ball.origin, _ball.enemy, 32)); - _ball.think = W_Nexball_Think; + setthink(_ball, W_Nexball_Think); _ball.nextthink = time; return; } @@ -801,10 +817,10 @@ void W_Nexball_Attack2() if(!autocvar_g_nexball_tackling) return; - W_SetupShot(self, false, 2, SND_NB_SHOOT2, CH_WEAPON_A, 0); + W_SetupShot(actor, false, 2, SND_NB_SHOOT2, CH_WEAPON_A, 0); entity missile = new(ballstealer); - missile.owner = self; + missile.owner = actor; missile.movetype = MOVETYPE_FLY; PROJECTILE_MAKETRIGGER(missile); @@ -816,7 +832,7 @@ void W_Nexball_Attack2() W_SetupProjVelocity_Basic(missile, autocvar_g_balance_nexball_secondary_speed, 0); missile.angles = vectoangles(missile.velocity); settouch(missile, W_Nexball_Touch); - missile.think = SUB_Remove_self; + setthink(missile, SUB_Remove); missile.nextthink = time + autocvar_g_balance_nexball_secondary_lifetime; //FIXME: use a distance instead? missile.effects = EF_BRIGHTFIELD | EF_LOWPRECISION; @@ -825,28 +841,28 @@ void W_Nexball_Attack2() CSQCProjectile(missile, true, PROJECTILE_ELECTRO, true); } -float ball_customize() -{SELFPARAM(); - if(!self.owner) +bool ball_customize(entity this, entity client) +{ + if(!this.owner) { - self.effects &= ~EF_FLAME; - self.scale = 1; - self.customizeentityforclient = func_null; + this.effects &= ~EF_FLAME; + this.scale = 1; + setcefc(this, func_null); return true; } - if(other == self.owner) + if(client == this.owner) { - self.scale = autocvar_g_nexball_viewmodel_scale; - if(self.enemy) - self.effects |= EF_FLAME; + this.scale = autocvar_g_nexball_viewmodel_scale; + if(this.enemy) + this.effects |= EF_FLAME; else - self.effects &= ~EF_FLAME; + this.effects &= ~EF_FLAME; } else { - self.effects &= ~EF_FLAME; - self.scale = 1; + this.effects &= ~EF_FLAME; + this.scale = 1; } return true; @@ -854,38 +870,37 @@ float ball_customize() METHOD(BallStealer, wr_think, void(BallStealer thiswep, entity actor, .entity weaponentity, int fire)) { - SELFPARAM(); TC(BallStealer, thiswep); if(fire & 1) if(weapon_prepareattack(thiswep, actor, weaponentity, false, autocvar_g_balance_nexball_primary_refire)) if(autocvar_g_nexball_basketball_meter) { - if(self.ballcarried && !self.metertime) - self.metertime = time; + if(actor.ballcarried && !actor.metertime) + actor.metertime = time; else weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready); } else { - W_Nexball_Attack(-1); + W_Nexball_Attack(actor, -1); weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready); } if(fire & 2) if(weapon_prepareattack(thiswep, actor, weaponentity, true, autocvar_g_balance_nexball_secondary_refire)) { - W_Nexball_Attack2(); + W_Nexball_Attack2(actor); weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, autocvar_g_balance_nexball_secondary_animtime, w_ready); } - if(!(fire & 1) && self.metertime && self.ballcarried) + if(!(fire & 1) && actor.metertime && actor.ballcarried) { - W_Nexball_Attack(time - self.metertime); + W_Nexball_Attack(actor, time - actor.metertime); // DropBall or stealing will set metertime back to 0 weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready); } } -METHOD(BallStealer, wr_setup, void(BallStealer this)) +METHOD(BallStealer, wr_setup, void(BallStealer this, entity actor)) { TC(BallStealer, this); //weapon_setup(WEP_PORTO.m_id); @@ -910,63 +925,69 @@ void nb_DropBall(entity player) } MUTATOR_HOOKFUNCTION(nb, ClientDisconnect) -{SELFPARAM(); - nb_DropBall(self); - return false; +{ + entity player = M_ARGV(0, entity); + + nb_DropBall(player); } MUTATOR_HOOKFUNCTION(nb, PlayerDies) { + entity frag_target = M_ARGV(2, entity); + nb_DropBall(frag_target); - return false; } MUTATOR_HOOKFUNCTION(nb, MakePlayerObserver) -{SELFPARAM(); - nb_DropBall(self); +{ + entity player = M_ARGV(0, entity); + + nb_DropBall(player); return false; } MUTATOR_HOOKFUNCTION(nb, PlayerPreThink) -{SELFPARAM(); - makevectors(self.v_angle); +{ + entity player = M_ARGV(0, entity); + + makevectors(player.v_angle); if(nexball_mode & NBM_BASKETBALL) { - if(self.ballcarried) + if(player.ballcarried) { // 'view ball' - self.ballcarried.velocity = self.velocity; - self.ballcarried.customizeentityforclient = ball_customize; + player.ballcarried.velocity = player.velocity; + setcefc(player.ballcarried, ball_customize); - vector org = self.origin + self.view_ofs + + vector org = player.origin + player.view_ofs + v_forward * autocvar_g_nexball_viewmodel_offset.x + v_right * autocvar_g_nexball_viewmodel_offset.y + v_up * autocvar_g_nexball_viewmodel_offset.z; - setorigin(self.ballcarried, org); + setorigin(player.ballcarried, org); // 'safe passing' if(autocvar_g_nexball_safepass_maxdist) { - if(self.ballcarried.wait < time && self.ballcarried.enemy) + if(player.ballcarried.wait < time && player.ballcarried.enemy) { - //centerprint(self, sprintf("Lost lock on %s", self.ballcarried.enemy.netname)); - self.ballcarried.enemy = world; + //centerprint(player, sprintf("Lost lock on %s", player.ballcarried.enemy.netname)); + player.ballcarried.enemy = NULL; } - //tracebox(self.origin + self.view_ofs, '-2 -2 -2', '2 2 2', self.origin + self.view_ofs + v_forward * autocvar_g_nexball_safepass_maxdist); - crosshair_trace(self); + //tracebox(player.origin + player.view_ofs, '-2 -2 -2', '2 2 2', player.origin + player.view_ofs + v_forward * autocvar_g_nexball_safepass_maxdist); + crosshair_trace(player); if( trace_ent && IS_CLIENT(trace_ent) && !IS_DEAD(trace_ent) && - trace_ent.team == self.team && - vlen(trace_ent.origin - self.origin) <= autocvar_g_nexball_safepass_maxdist ) + trace_ent.team == player.team && + vdist(trace_ent.origin - player.origin, <=, autocvar_g_nexball_safepass_maxdist) ) { - //if(self.ballcarried.enemy != trace_ent) - // centerprint(self, sprintf("Locked to %s", trace_ent.netname)); - self.ballcarried.enemy = trace_ent; - self.ballcarried.wait = time + autocvar_g_nexball_safepass_holdtime; + //if(player.ballcarried.enemy != trace_ent) + // centerprint(player, sprintf("Locked to %s", trace_ent.netname)); + player.ballcarried.enemy = trace_ent; + player.ballcarried.wait = time + autocvar_g_nexball_safepass_holdtime; } @@ -975,42 +996,43 @@ MUTATOR_HOOKFUNCTION(nb, PlayerPreThink) else { .entity weaponentity = weaponentities[0]; // TODO - if(self.(weaponentity).weapons) + if(player.(weaponentity).weapons) { - self.weapons = self.(weaponentity).weapons; + player.weapons = player.(weaponentity).weapons; Weapon w = WEP_NEXBALL; - w.wr_resetplayer(w); - PS(self).m_switchweapon = self.(weaponentity).m_switchweapon; - W_SwitchWeapon(self, PS(self).m_switchweapon); + w.wr_resetplayer(w, player); + PS(player).m_switchweapon = player.(weaponentity).m_switchweapon; + W_SwitchWeapon(player, PS(player).m_switchweapon); - self.(weaponentity).weapons = '0 0 0'; + player.(weaponentity).weapons = '0 0 0'; } } } - nexball_setstatus(); - - return false; + nexball_setstatus(player); } MUTATOR_HOOKFUNCTION(nb, SpectateCopy) { - SELFPARAM(); - this.metertime = other.metertime; + entity spectatee = M_ARGV(0, entity); + entity client = M_ARGV(1, entity); + + client.metertime = spectatee.metertime; } MUTATOR_HOOKFUNCTION(nb, PlayerSpawn) { - SELFPARAM(); - this.metertime = 0; + entity player = M_ARGV(0, entity); + + player.metertime = 0; .entity weaponentity = weaponentities[0]; - this.(weaponentity).weapons = '0 0 0'; + player.(weaponentity).weapons = '0 0 0'; if (nexball_mode & NBM_BASKETBALL) - this.weapons |= WEPSET(NEXBALL); + player.weapons |= WEPSET(NEXBALL); else - this.weapons = '0 0 0'; + player.weapons = '0 0 0'; return false; } @@ -1019,48 +1041,68 @@ MUTATOR_HOOKFUNCTION(nb, PlayerSpawn) .float stat_sv_maxspeed; MUTATOR_HOOKFUNCTION(nb, PlayerPhysics) -{SELFPARAM(); - if(self.ballcarried) +{ + entity player = M_ARGV(0, entity); + + if(player.ballcarried) { - self.stat_sv_airspeedlimit_nonqw *= autocvar_g_nexball_basketball_carrier_highspeed; - self.stat_sv_maxspeed *= autocvar_g_nexball_basketball_carrier_highspeed; + player.stat_sv_airspeedlimit_nonqw *= autocvar_g_nexball_basketball_carrier_highspeed; + player.stat_sv_maxspeed *= autocvar_g_nexball_basketball_carrier_highspeed; } - return false; } MUTATOR_HOOKFUNCTION(nb, ForbidThrowCurrentWeapon) -{SELFPARAM(); - return PS(self).m_weapon == WEP_NEXBALL; +{ + entity player = M_ARGV(0, entity); + + return PS(player).m_weapon == WEP_NEXBALL; } MUTATOR_HOOKFUNCTION(nb, ForbidDropCurrentWeapon) -{SELFPARAM(); - return PS(self).m_weapon == WEP_MORTAR; // TODO: what is this for? +{ + entity player = M_ARGV(0, entity); + + return PS(player).m_weapon == WEP_MORTAR; // TODO: what is this for? } MUTATOR_HOOKFUNCTION(nb, FilterItem) -{SELFPARAM(); - if(self.classname == "droppedweapon") - if(self.weapon == WEP_NEXBALL.m_id) +{ + entity item = M_ARGV(0, entity); + + if(item.classname == "droppedweapon") + if(item.weapon == WEP_NEXBALL.m_id) return true; return false; } +MUTATOR_HOOKFUNCTION(nb, ItemTouch) +{ + entity item = M_ARGV(0, entity); + entity toucher = M_ARGV(1, entity); + + if(item.weapon && toucher.ballcarried) + return MUT_ITEMTOUCH_RETURN; // no new weapons for you, mister! + + return MUT_ITEMTOUCH_CONTINUE; +} + MUTATOR_HOOKFUNCTION(nb, GetTeamCount) { - ret_string = "nexball_team"; + M_ARGV(1, string) = "nexball_team"; return true; } MUTATOR_HOOKFUNCTION(nb, WantWeapon) { - ret_float = 0; // weapon is set a few lines later, apparently + M_ARGV(1, float) = 0; // weapon is set a few lines later, apparently return true; } MUTATOR_HOOKFUNCTION(nb, DropSpecialItems) { + entity frag_target = M_ARGV(0, entity); + if(frag_target.ballcarried) DropBall(frag_target.ballcarried, frag_target.origin, frag_target.velocity); @@ -1069,8 +1111,7 @@ MUTATOR_HOOKFUNCTION(nb, DropSpecialItems) MUTATOR_HOOKFUNCTION(nb, SendWaypoint) { - wp_sendflags &= ~0x80; - return false; + M_ARGV(2, int) &= ~0x80; } REGISTER_MUTATOR(nb, g_nexball) @@ -1091,7 +1132,7 @@ REGISTER_MUTATOR(nb, g_nexball) */ radar_showennemies = autocvar_g_nexball_radar_showallplayers; - InitializeEntity(world, nb_delayedinit, INITPRIO_GAMETYPE); + InitializeEntity(NULL, nb_delayedinit, INITPRIO_GAMETYPE); WEP_NEXBALL.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; ActivateTeamplay();