X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fnexball.qc;h=61385f6b5e86bd233dee19d7ee7ca523c495fc4a;hb=8b2a456d83da008b5d17ec6092716a20718c0798;hp=490071334a635d1cd02cf2a0da1ae6052c4d4fb7;hpb=f748acb3f1e9bbc5e058e025f447bd89c94fd5a1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/nexball.qc b/qcsrc/server/nexball.qc
index 490071334a..61385f6b5e 100644
--- a/qcsrc/server/nexball.qc
+++ b/qcsrc/server/nexball.qc
@@ -43,7 +43,7 @@ void nb_init() // Called early (worldspawn stage)
 	CVTOV(g_nexball_delay_idle);               //10
 	CVTOV(g_nexball_football_physics);         //0
 
-	radar_showennemies = cvar("g_nexball_radar_showallplayers");
+	radar_showennemies = autocvar_g_nexball_radar_showallplayers;
 
 	InitializeEntity(world, nb_delayedinit, INITPRIO_GAMETYPE);
 }
@@ -62,7 +62,7 @@ void ResetBall();
 void LogNB(string mode, entity actor)
 {
 	string s;
-	if(!cvar("sv_eventlog"))
+	if(!autocvar_sv_eventlog)
 		return;
 	s = strcat(":nexball:", mode);
 	if(actor != world)
@@ -80,8 +80,7 @@ void ball_restart (void)
 void nexball_setstatus (void)
 {
 	local entity oldself;
-	if (!g_nexball)
-		return;
+	self.items &~= IT_KEY1;
 	if (self.ballcarried)
 	{
 		if (self.ballcarried.teamtime && (self.ballcarried.teamtime < time))
@@ -167,9 +166,8 @@ void GiveBall (entity plyr, entity ball)
 	ball.effects |= EF_NOSHADOW;
 	ball.scale = 1; // scale down.
 
-	WaypointSprite_AttachCarrier("nb-ball", plyr);
+	WaypointSprite_AttachCarrier("nb-ball", plyr, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR);
 	WaypointSprite_UpdateRule(plyr.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT);
-	WaypointSprite_UpdateTeamRadar(plyr.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR);
 
 	if (g_nexball_basketball_delay_hold)
 	{
@@ -202,10 +200,8 @@ void DropBall (entity ball, vector org, vector vel)
 	}
 
 	WaypointSprite_Kill(ball.owner.waypointsprite_attachedforcarrier);
-	//WaypointSprite_AttachCarrier("nb-ball", ball);
-	WaypointSprite_Spawn("nb-ball", 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, FALSE); // no health bar please
+	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_UpdateRule(ball.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT);
-	WaypointSprite_UpdateTeamRadar(ball.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR);
 
 	ball.owner.ballcarried = world;
 	ball.owner = world;
@@ -226,7 +222,7 @@ void InitBall (void)
 	self.teamtime = 0;
 	self.pusher = world;
 	self.team = FALSE;
-	sound (self, CHAN_PROJECTILE, self.noise1, VOL_BASE, ATTN_NORM);
+	sound (self, CH_TRIGGER, self.noise1, VOL_BASE, ATTN_NORM);
 	WaypointSprite_Ping(self.waypointsprite_attachedforcarrier);
 	LogNB("init", world);
 }
@@ -257,7 +253,7 @@ void ResetBall (void)
 		setorigin(self, self.spawnorigin); // make sure it's positioned correctly anyway
 		self.movetype = MOVETYPE_NONE;
 		self.think = InitBall;
-		self.nextthink = max(time, game_starttime) + cvar("g_nexball_delay_start");
+		self.nextthink = max(time, game_starttime) + autocvar_g_nexball_delay_start;
 	}
 }
 
@@ -266,7 +262,7 @@ void football_touch (void)
 	if (other.solid == SOLID_BSP) {
 		if (time > self.lastground + 0.1)
 		{
-			sound (self, CHAN_PROJECTILE, self.noise, VOL_BASE, ATTN_NORM);
+			sound (self, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
 			self.lastground = time;
 		}
 		if (vlen(self.velocity) && !self.cnt)
@@ -306,13 +302,13 @@ void basketball_touch (void)
 		football_touch();
 		return;
 	}
-	if (!self.cnt && other.classname == "player" && (other.playerid != self.dropperid || time > self.ctf_droptime + cvar("g_nexball_delay_collect"))) {
+	if (!self.cnt && other.classname == "player" && (other.playerid != self.dropperid || time > self.ctf_droptime + autocvar_g_nexball_delay_collect)) {
 		if (other.health <= 0)
 			return;
 		LogNB("caught", other);
 		GiveBall(other, self);
 	} else if (other.solid == SOLID_BSP) {
-		sound (self, CHAN_PROJECTILE, self.noise, VOL_BASE, ATTN_NORM);
+		sound (self, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
 		if (vlen(self.velocity) && !self.cnt)
 			self.nextthink = min(time + g_nexball_delay_idle, self.teamtime);
 	}
@@ -370,7 +366,7 @@ void GoalTouch (void)
 		pscore = 1;
 	}
 
-	sound (ball, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NONE);
+	sound (ball, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NONE);
 
 	if(ball.team && pscore)
 	{
@@ -396,7 +392,7 @@ void GoalTouch (void)
 	ball.think = ResetBall;
 	if (ball.classname == "nexball_basketball")
 		ball.touch = football_touch; // better than SUB_Null: football control until the ball gets reset
-	ball.nextthink = time + cvar("g_nexball_delay_goal") * (self.team != GOAL_OUT);
+	ball.nextthink = time + autocvar_g_nexball_delay_goal * (self.team != GOAL_OUT);
 }
 
 //=======================//
@@ -471,13 +467,13 @@ void SpawnBall (void)
 
 	if (cvar(strcat("g_", self.classname, "_trail"))) //nexball_basketball :p
 	{
-		self.glow_color = cvar("g_nexball_trail_color");
+		self.glow_color = autocvar_g_nexball_trail_color;
 		self.glow_trail = TRUE;
 	}
 
 	self.movetype = MOVETYPE_FLY;
 
-	if (!cvar("g_nexball_sound_bounce"))
+	if (!autocvar_g_nexball_sound_bounce)
 		self.noise = "";
 	else if (!self.noise)
 		self.noise = "sound/nexball/bounce.wav";
@@ -492,12 +488,11 @@ void SpawnBall (void)
 	precache_sound (self.noise1);
 	precache_sound (self.noise2);
 
-	WaypointSprite_AttachCarrier("nb-ball", self); // the ball's team is not set yet, no rule update needed
-	WaypointSprite_UpdateTeamRadar(self.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR);
+	WaypointSprite_AttachCarrier("nb-ball", self, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR); // the ball's team is not set yet, no rule update needed
 
 	self.reset = ball_restart;
 	self.think = InitBall;
-	self.nextthink = game_starttime + cvar("g_nexball_delay_start");
+	self.nextthink = game_starttime + autocvar_g_nexball_delay_start;
 }
 
 void spawnfunc_nexball_basketball (void)
@@ -515,8 +510,8 @@ void spawnfunc_nexball_basketball (void)
 		self.effects = g_nexball_basketball_effects_default;
 	self.solid = SOLID_TRIGGER;
 	balls |= BALL_BASKET;
-	self.bouncefactor = cvar("g_nexball_basketball_bouncefactor");
-	self.bouncestop = cvar("g_nexball_basketball_bouncestop");
+	self.bouncefactor = autocvar_g_nexball_basketball_bouncefactor;
+	self.bouncestop = autocvar_g_nexball_basketball_bouncestop;
 	SpawnBall();
 }
 
@@ -525,8 +520,8 @@ void spawnfunc_nexball_football (void)
 	self.classname = "nexball_football";
 	self.solid = SOLID_TRIGGER;
 	balls |= BALL_FOOT;
-	self.bouncefactor = cvar("g_nexball_football_bouncefactor");
-	self.bouncestop = cvar("g_nexball_football_bouncestop");
+	self.bouncefactor = autocvar_g_nexball_football_bouncefactor;
+	self.bouncestop = autocvar_g_nexball_football_bouncestop;
 	SpawnBall();
 }
 
@@ -602,14 +597,14 @@ void W_Nexball_Touch (void)
 
 	PROJECTILE_TOUCH;
 	if(attacker.team != other.team || g_nexball_basketball_teamsteal)
-	if((ball = other.ballcarried) && (attacker.classname == "player" || attacker.classname == "gib"))
+	if((ball = other.ballcarried) && (attacker.classname == "player"))
 	{
-		other.velocity = other.velocity + normalize(self.velocity) * other.damageforcescale * cvar("g_balance_nexball_secondary_force");
+		other.velocity = other.velocity + normalize(self.velocity) * other.damageforcescale * autocvar_g_balance_nexball_secondary_force;
 		other.flags &~= FL_ONGROUND;
 		if(!attacker.ballcarried)
 		{
 			LogNB("stole", attacker);
-			sound (other, CHAN_AUTO, ball.noise2, VOL_BASE, ATTN_NORM);
+			sound (other, CH_TRIGGER, ball.noise2, VOL_BASE, ATTN_NORM);
 
 			if(attacker.team == other.team && time > attacker.teamkill_complain)
 			{
@@ -631,7 +626,7 @@ void W_Nexball_Attack (float t)
 	if (!(ball = self.ballcarried))
 		return;
 
-	W_SetupShot (self, FALSE, 4, "nexball/shoot1.wav",0);
+	W_SetupShot (self, FALSE, 4, "nexball/shoot1.wav", CH_WEAPON_A, 0);
 	tracebox(w_shotorg, BALL_MINS, BALL_MAXS, w_shotorg, MOVE_WORLDONLY, world);
 	if(trace_startsolid)
 	{
@@ -645,15 +640,15 @@ void W_Nexball_Attack (float t)
 		mul = 1;
 	else
 	{
-		mi = cvar("g_nexball_basketball_meter_minpower");
-		ma = max(mi, cvar("g_nexball_basketball_meter_maxpower")); // avoid confusion
+		mi = autocvar_g_nexball_basketball_meter_minpower;
+		ma = max(mi, autocvar_g_nexball_basketball_meter_maxpower); // avoid confusion
 		//One triangle wave period with 1 as max
 		mul = 2 * mod(t, g_nexball_meter_period) / g_nexball_meter_period;
 		if (mul > 1)
 			mul = 2 - mul;
 		mul = mi + (ma - mi) * mul; // range from the minimal power to the maximal power
 	}
-	DropBall (ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * cvar("g_balance_nexball_primary_speed") * mul, FALSE));
+	DropBall (ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, FALSE));
 	//TODO: use the speed_up cvar too ??
 }
 
@@ -662,7 +657,7 @@ void W_Nexball_Attack2 (void)
 	local entity missile;
 	if (!(balls & BALL_BASKET))
 		return;
-	W_SetupShot (self, FALSE, 2, "nexball/shoot2.wav",0);
+	W_SetupShot (self, FALSE, 2, "nexball/shoot2.wav", CH_WEAPON_A, 0);
 //	pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 	missile = spawn ();
 
@@ -676,11 +671,11 @@ void W_Nexball_Attack2 (void)
 	setsize (missile, '0 0 0', '0 0 0');
 	setorigin (missile, w_shotorg);
 
-	W_SetupProjectileVelocity(missile, cvar("g_balance_nexball_secondary_speed"), 0);
+	W_SetupProjectileVelocity(missile, autocvar_g_balance_nexball_secondary_speed, 0);
 	missile.angles = vectoangles (missile.velocity);
 	missile.touch = W_Nexball_Touch;
 	missile.think = SUB_Remove;
-	missile.nextthink = time + cvar("g_balance_nexball_secondary_lifetime"); //FIXME: use a distance instead?
+	missile.nextthink = time + autocvar_g_balance_nexball_secondary_lifetime; //FIXME: use a distance instead?
 
 	missile.effects = EF_BRIGHTFIELD | EF_LOWPRECISION;
 	missile.flags = FL_PROJECTILE;
@@ -691,31 +686,31 @@ float w_nexball_weapon(float req)
 	if (req == WR_THINK)
 	{
 		if (self.BUTTON_ATCK)
-		if (weapon_prepareattack(0, cvar("g_balance_nexball_primary_refire")))
-		if (cvar("g_nexball_basketball_meter"))
+		if (weapon_prepareattack(0, autocvar_g_balance_nexball_primary_refire))
+		if (autocvar_g_nexball_basketball_meter)
 		{
 			if (self.ballcarried && !self.metertime)
 				self.metertime = time;
 			else
-				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nexball_primary_animtime"), w_ready);
+				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
 		}
 		else
 		{
 			W_Nexball_Attack(-1);
-			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nexball_primary_animtime"), w_ready);
+			weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
 		}
 		if (self.BUTTON_ATCK2)
-		if (weapon_prepareattack(1, cvar("g_balance_nexball_secondary_refire")))
+		if (weapon_prepareattack(1, autocvar_g_balance_nexball_secondary_refire))
 		{
 			W_Nexball_Attack2();
-			weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_nexball_secondary_animtime"), w_ready);
+			weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_nexball_secondary_animtime, w_ready);
 		}
 
 		if (!self.BUTTON_ATCK && self.metertime && self.ballcarried)
 		{
 			W_Nexball_Attack(time - self.metertime);
 			// DropBall or stealing will set metertime back to 0
-			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nexball_primary_animtime"), w_ready);
+			weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
 		}
 	}
 	else if (req == WR_PRECACHE)
@@ -726,6 +721,7 @@ float w_nexball_weapon(float req)
 		precache_model ("models/elaser.mdl");
 		precache_sound ("nexball/shoot1.wav");
 		precache_sound ("nexball/shoot2.wav");
+		precache_sound ("misc/typehit.wav");
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_PORTO);