}
void ball_restart(void)
-{
+{SELFPARAM();
if(self.owner)
DropBall(self, self.owner.origin, '0 0 0');
ResetBall();
}
void nexball_setstatus(void)
-{
- entity oldself;
+{SELFPARAM();
self.items &= ~IT_KEY1;
if(self.ballcarried)
{
if(self.ballcarried.teamtime && (self.ballcarried.teamtime < time))
{
bprint("The ", Team_ColoredFullName(self.team), " held the ball for too long.\n");
- oldself = self;
- self = self.ballcarried;
+ setself(self.ballcarried);
DropBall(self, self.owner.origin, '0 0 0');
ResetBall();
- self = oldself;
+ setself(this);
}
else
self.items |= IT_KEY1;
}
void relocate_nexball(void)
-{
+{SELFPARAM();
tracebox(self.origin, BALL_MINS, BALL_MAXS, self.origin, true, self);
if(trace_startsolid)
{
o = self.origin;
if(!move_out_of_solid(self))
objerror("could not get out of solid at all!");
- print("^1NOTE: this map needs FIXING. ", self.classname, " at ", vtos(o - '0 0 1'));
- print(" needs to be moved out of solid, e.g. by '", ftos(self.origin.x - o.x));
- print(" ", ftos(self.origin.y - o.y));
- print(" ", ftos(self.origin.z - o.z), "'\n");
+ LOG_INFO("^1NOTE: this map needs FIXING. ", self.classname, " at ", vtos(o - '0 0 1'));
+ LOG_INFO(" needs to be moved out of solid, e.g. by '", ftos(self.origin.x - o.x));
+ LOG_INFO(" ", ftos(self.origin.y - o.y));
+ LOG_INFO(" ", ftos(self.origin.z - o.z), "'\n");
self.origin = o;
}
}
void DropOwner(void)
-{
+{SELFPARAM();
entity ownr;
ownr = self.owner;
DropBall(self, ownr.origin, ownr.velocity);
}
void GiveBall(entity plyr, entity ball)
-{
+{SELFPARAM();
entity ownr;
if((ownr = ball.owner))
ball.effects |= EF_NOSHADOW;
ball.scale = 1; // scale down.
- WaypointSprite_AttachCarrier("nb-ball", plyr, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR);
+ WaypointSprite_AttachCarrier(WP_NbBall, plyr, RADARICON_FLAGCARRIER);
WaypointSprite_UpdateRule(plyr.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT);
if(autocvar_g_nexball_basketball_delay_hold)
ball.nextthink = time + autocvar_g_nexball_basketball_delay_hold;
}
- ownr = self;
- self = plyr;
- self.weaponentity.weapons = self.weapons;
- self.weaponentity.switchweapon = self.weapon;
- self.weapons = WEPSET_PORTO;
- WEP_ACTION(WEP_PORTO, WR_RESETPLAYER);
- self.switchweapon = WEP_PORTO;
- W_SwitchWeapon(WEP_PORTO);
- self = ownr;
+ plyr.weaponentity.weapons = plyr.weapons;
+ plyr.weaponentity.switchweapon = plyr.weapon;
+ plyr.weapons = WEPSET_PORTO;
+ setself(plyr);
+ WEP_ACTION(WEP_PORTO.m_id, WR_RESETPLAYER);
+ plyr.switchweapon = WEP_PORTO.m_id;
+ W_SwitchWeapon(WEP_PORTO.m_id);
+ setself(this);
}
void DropBall(entity ball, vector org, vector vel)
}
WaypointSprite_Kill(ball.owner.waypointsprite_attachedforcarrier);
- WaypointSprite_Spawn("nb-ball", 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR); // no health bar please
+ WaypointSprite_Spawn(WP_NbBall, 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER); // no health bar please
WaypointSprite_UpdateRule(ball.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT);
ball.owner.ballcarried = world;
}
void InitBall(void)
-{
+{SELFPARAM();
if(gameover) return;
self.flags &= ~FL_ONGROUND;
self.movetype = MOVETYPE_BOUNCE;
}
void ResetBall(void)
-{
+{SELFPARAM();
if(self.cnt < 2) // step 1
{
if(time == self.teamtime)
{
// dprint("Step 4: time: ", ftos(time), "\n");
if(vlen(self.origin - self.spawnorigin) > 10) // should not happen anymore
- dprint("The ball moved too far away from its spawn origin.\nOffset: ",
+ LOG_TRACE("The ball moved too far away from its spawn origin.\nOffset: ",
vtos(self.origin - self.spawnorigin), " Velocity: ", vtos(self.velocity), "\n");
self.velocity = '0 0 0';
setorigin(self, self.spawnorigin); // make sure it's positioned correctly anyway
}
void football_touch(void)
-{
+{SELFPARAM();
if(other.solid == SOLID_BSP)
{
if(time > self.lastground + 0.1)
}
void basketball_touch(void)
-{
+{SELFPARAM();
if(other.ballcarried)
{
football_touch();
}
void GoalTouch(void)
-{
+{SELFPARAM();
entity ball;
float isclient, pscore, otherteam;
string pname;
// team ents //
//=======================//
void spawnfunc_nexball_team(void)
-{
+{SELFPARAM();
if(!g_nexball)
{
remove(self);
void nb_spawnteam(string teamname, float teamcolor)
{
- dprint("^2spawned team ", teamname, "\n");
+ LOG_TRACE("^2spawned team ", teamname, "\n");
entity e;
e = spawn();
e.classname = "nexball_team";
//=======================//
void SpawnBall(void)
-{
+{SELFPARAM();
if(!g_nexball) { remove(self); return; }
// balls += 4; // using the remaining bits to count balls will leave more than the max edict count, so it's fine
precache_sound(self.noise1);
precache_sound(self.noise2);
- WaypointSprite_AttachCarrier("nb-ball", self, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR); // the ball's team is not set yet, no rule update needed
+ WaypointSprite_AttachCarrier(WP_NbBall, self, RADARICON_FLAGCARRIER); // the ball's team is not set yet, no rule update needed
self.reset = ball_restart;
self.think = InitBall;
}
void spawnfunc_nexball_basketball(void)
-{
+{SELFPARAM();
nexball_mode |= NBM_BASKETBALL;
self.classname = "nexball_basketball";
if (!(balls & BALL_BASKET))
}
void spawnfunc_nexball_football(void)
-{
+{SELFPARAM();
nexball_mode |= NBM_FOOTBALL;
self.classname = "nexball_football";
self.solid = SOLID_TRIGGER;
}
float nb_Goal_Customize()
-{
+{SELFPARAM();
entity e, wp_owner;
e = WaypointSprite_getviewentity(other);
wp_owner = self.owner;
}
void SpawnGoal(void)
-{
+{SELFPARAM();
if(!g_nexball) { remove(self); return; }
EXACTTRIGGER_INIT;
if(self.team != GOAL_OUT && Team_TeamToNumber(self.team) != -1)
{
- WaypointSprite_SpawnFixed("goal", (self.absmin + self.absmax) * 0.5, self, sprite, RADARICON_NONE, ((self.team) ? Team_ColorRGB(self.team) : '1 0.5 0'));
+ entity wp = WaypointSprite_SpawnFixed(WP_NbGoal, (self.absmin + self.absmax) * 0.5, self, sprite, RADARICON_NONE);
+ wp.colormod = ((self.team) ? Team_ColorRGB(self.team) : '1 0.5 0');
self.sprite.customizeentityforclient = nb_Goal_Customize;
}
}
void spawnfunc_nexball_redgoal(void)
-{
+{SELFPARAM();
self.team = NUM_TEAM_1;
SpawnGoal();
}
void spawnfunc_nexball_bluegoal(void)
-{
+{SELFPARAM();
self.team = NUM_TEAM_2;
SpawnGoal();
}
void spawnfunc_nexball_yellowgoal(void)
-{
+{SELFPARAM();
self.team = NUM_TEAM_3;
SpawnGoal();
}
void spawnfunc_nexball_pinkgoal(void)
-{
+{SELFPARAM();
self.team = NUM_TEAM_4;
SpawnGoal();
}
void spawnfunc_nexball_fault(void)
-{
+{SELFPARAM();
self.team = GOAL_FAULT;
if(self.noise == "")
self.noise = "misc/typehit.wav";
}
void spawnfunc_nexball_out(void)
-{
+{SELFPARAM();
self.team = GOAL_OUT;
if(self.noise == "")
self.noise = "misc/typehit.wav";
void W_Nexball_Think()
-{
+{SELFPARAM();
//dprint("W_Nexball_Think\n");
//vector new_dir = steerlib_arrive(self.enemy.origin, 2500);
vector new_dir = normalize(self.enemy.origin + '0 0 50' - self.origin);
}
void W_Nexball_Touch(void)
-{
+{SELFPARAM();
entity ball, attacker;
attacker = self.owner;
//self.think = func_null;
}
void W_Nexball_Attack(float t)
-{
+{SELFPARAM();
entity ball;
float mul, mi, ma;
if(!(ball = self.ballcarried))
}
void W_Nexball_Attack2(void)
-{
+{SELFPARAM();
if(self.ballcarried.enemy)
{
entity _ball = self.ballcarried;
if(!(balls & BALL_BASKET))
return;
W_SetupShot(self, false, 2, "nexball/shoot2.wav", CH_WEAPON_A, 0);
-// pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
missile = spawn();
missile.owner = self;
}
float ball_customize()
-{
+{SELFPARAM();
if(!self.owner)
{
self.effects &= ~EF_FLAME;
}
float w_nexball_weapon(float req)
-{
+{SELFPARAM();
if(req == WR_THINK)
{
if(self.BUTTON_ATCK)
}
else if(req == WR_INIT)
{
- precache_model("models/weapons/g_porto.md3");
- precache_model("models/weapons/v_porto.md3");
- precache_model("models/weapons/h_porto.iqm");
+ precache_model(W_Model("g_porto.md3"));
+ precache_model(W_Model("v_porto.md3"));
+ precache_model(W_Model("h_porto.iqm"));
precache_model("models/elaser.mdl");
precache_sound("nexball/shoot1.wav");
precache_sound("nexball/shoot2.wav");
}
else if(req == WR_SETUP)
{
- //weapon_setup(WEP_PORTO);
+ //weapon_setup(WEP_PORTO.m_id);
}
// No need to check WR_CHECKAMMO* or WR_AIM, it should always return true
return true;
}
MUTATOR_HOOKFUNCTION(nexball_BallDrop)
-{
+{SELFPARAM();
if(self.ballcarried && g_nexball)
DropBall(self.ballcarried, self.origin, self.velocity);
}
MUTATOR_HOOKFUNCTION(nexball_PlayerPreThink)
-{
+{SELFPARAM();
makevectors(self.v_angle);
if(nexball_mode & NBM_BASKETBALL)
{
if(self.weaponentity.weapons)
{
self.weapons = self.weaponentity.weapons;
- WEP_ACTION(WEP_PORTO, WR_RESETPLAYER);
+ WEP_ACTION(WEP_PORTO.m_id, WR_RESETPLAYER);
self.switchweapon = self.weaponentity.switchweapon;
W_SwitchWeapon(self.switchweapon);
}
MUTATOR_HOOKFUNCTION(nexball_PlayerSpawn)
-{
+{SELFPARAM();
self.weaponentity.weapons = '0 0 0';
if(nexball_mode & NBM_BASKETBALL)
}
MUTATOR_HOOKFUNCTION(nexball_PlayerPhysics)
-{
+{SELFPARAM();
if(self.ballcarried)
{
self.stat_sv_airspeedlimit_nonqw *= autocvar_g_nexball_basketball_carrier_highspeed;
}
MUTATOR_HOOKFUNCTION(nexball_ForbidThrowing)
-{
- if(self.weapon == WEP_MORTAR)
+{SELFPARAM();
+ if(self.weapon == WEP_MORTAR.m_id)
return true;
return false;
}
MUTATOR_HOOKFUNCTION(nexball_FilterItem)
-{
+{SELFPARAM();
if(self.classname == "droppedweapon")
- if(self.weapon == WEP_MORTAR)
+ if(self.weapon == WEP_MORTAR.m_id)
return true;
return false;
MUTATOR_ONREMOVE
{
- print("This is a game type and it cannot be removed at runtime.");
+ LOG_INFO("This is a game type and it cannot be removed at runtime.");
return -1;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff