X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fbumblebee.qc;h=4330966dc7894f2b959b4c51ceedaa302e56e4f4;hb=b1288ba426a18f2a8a7743139306b7f6ba3d5cbc;hp=429b8e5f9f8c55cdf709e2e405c5481dffb74527;hpb=e46955aa359b3a9b0399b572ebd34e3770c283b7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/vehicles/bumblebee.qc b/qcsrc/server/vehicles/bumblebee.qc
index 429b8e5f9..4330966dc 100644
--- a/qcsrc/server/vehicles/bumblebee.qc
+++ b/qcsrc/server/vehicles/bumblebee.qc
@@ -214,9 +214,7 @@ float bumb_gunner_frame()
 
 void bumb_gunner_exit(float _exitflag)
 {
-
-
-	if(clienttype(self) == CLIENTTYPE_REAL)
+	if(IS_REAL_CLIENT(self))
 	{
 		msg_entity = self;
 		WriteByte(MSG_ONE, SVC_SETVIEWPORT);
@@ -341,7 +339,7 @@ float bumb_gunner_enter()
 
 float vehicles_valid_pilot()
 {
-	if(other.classname != "player")
+	if not(IS_PLAYER(other))
 		return FALSE;
 
 	if(other.deadflag != DEAD_NO)
@@ -350,7 +348,7 @@ float vehicles_valid_pilot()
 	if(other.vehicle != world)
 		return FALSE;
 
-	if(clienttype(other) != CLIENTTYPE_REAL)
+	if not(IS_REAL_CLIENT(other))
 		if(!autocvar_g_vehicles_allow_bots)
 			return FALSE;
 
@@ -561,7 +559,7 @@ float bumb_pilot_frame()
 							if(autocvar_g_vehicle_bumblebee_healgun_hps)
 								trace_ent.vehicle_health = min(trace_ent.vehicle_health + autocvar_g_vehicle_bumblebee_healgun_hps * frametime, trace_ent.tur_health);
 						}
-						else if(trace_ent.flags & FL_CLIENT)
+						else if(IS_CLIENT(trace_ent))
 						{
 							if(trace_ent.health <= autocvar_g_vehicle_bumblebee_healgun_hmax && autocvar_g_vehicle_bumblebee_healgun_hps)
 								trace_ent.health = min(trace_ent.health + autocvar_g_vehicle_bumblebee_healgun_hps * frametime, autocvar_g_vehicle_bumblebee_healgun_hmax);
@@ -687,43 +685,14 @@ void bumb_exit(float eject)
 	
 	spot = vehicles_findgoodexit(spot);
 	
+	// Hide beam
+	if(self.gun3.enemy || !wasfreed(self.gun3.enemy)) {
+		self.gun3.enemy.effects |= EF_NODRAW;
+    }
 
 	self.owner.velocity = 0.75 * self.vehicle.velocity + normalize(spot - self.vehicle.origin) * 200;
 	self.owner.velocity_z += 10;
 	setorigin(self.owner, spot);
-
-	/*if(eject)
-	{
-	    spot = self.origin + v_forward * 100 + '0 0 64';
-	    spot = vehicles_findgoodexit(spot);
-	    //setorigin(self.owner , spot);
-	    self.owner.velocity = (v_up + v_forward * 0.25) * 250;
-	    self.owner.oldvelocity = self.owner.velocity;
-	}
-	else
-	{
-		if(vlen(self.velocity) > autocvar_g_vehicle_bumblebee_speed_forward * 0.5)		
-		{
-			if(vlen(self.velocity) > autocvar_sv_maxairspeed)
-				self.owner.velocity = normalize(self.velocity) * autocvar_sv_maxairspeed;
-			else
-				self.owner.velocity = self.velocity + v_forward * 100;
-			
-			self.owner.velocity_z += 200;
-			spot = self.origin + v_forward * 128 + '0 0 32';
-			spot = vehicles_findgoodexit(spot);
-		}
-		else
-		{
-			self.owner.velocity = self.velocity * 0.5;
-			self.owner.velocity_z += 10;
-			spot = self.origin - v_forward * 300 + '0 0 32';
-			spot = vehicles_findgoodexit(spot);
-		}
-	    self.owner.oldvelocity = self.owner.velocity;
-	    //setorigin(self.owner , spot);
-	}
-	*/
 	
 	antilag_clear(self.owner);
     self.owner = world;