X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Funit%2Fraptor.qc;h=0a9b92167e5aed541a4842ef61270f85255ee1af;hb=0f444e0d57db660b27b5a54a263a61bc5da41004;hp=e74d669f58897ecc57b287405c948ab4ab76b06a;hpb=198765425d8c346faa41b601cba98247ca2ddac2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/vehicles/unit/raptor.qc b/qcsrc/common/vehicles/unit/raptor.qc
index e74d669f5..0a9b92167 100644
--- a/qcsrc/common/vehicles/unit/raptor.qc
+++ b/qcsrc/common/vehicles/unit/raptor.qc
@@ -308,6 +308,7 @@ float raptor_frame()
 	if(intermission_running)
 	{
 		self.vehicle.velocity = '0 0 0';
+		self.vehicle.avelocity = '0 0 0';
 		return 1;
 	}
 
@@ -961,6 +962,50 @@ float v_raptor(float req)
 #define raptor_bomb "gfx/vehicles/raptor_bombs.tga"
 #define raptor_drop "gfx/vehicles/axh-dropcross.tga"
 
+void RaptorCBShellfragDraw()
+{
+	if(wasfreed(self))
+		return;
+
+	Movetype_Physics_MatchTicrate(autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
+	self.move_avelocity += randomvec() * 15;
+	self.renderflags = 0;
+
+	if(self.cnt < time)
+		self.alpha = bound(0, self.nextthink - time, 1);
+
+	if(self.alpha < ALPHA_MIN_VISIBLE)
+		remove(self);
+}
+
+void RaptorCBShellfragToss(vector _org, vector _vel, vector _ang)
+{
+	entity sfrag;
+
+	sfrag = spawn();
+	setmodel(sfrag, "models/vehicles/clusterbomb_fragment.md3");
+	setorigin(sfrag, _org);
+
+	sfrag.move_movetype = MOVETYPE_BOUNCE;
+	sfrag.gravity = 0.15;
+	sfrag.solid = SOLID_CORPSE;
+
+	sfrag.draw = RaptorCBShellfragDraw;
+
+	sfrag.move_origin = sfrag.origin = _org;
+	sfrag.move_velocity = _vel;
+	sfrag.move_avelocity = prandomvec() * vlen(sfrag.move_velocity);
+	sfrag.angles = self.move_angles = _ang;
+
+	sfrag.move_time = time;
+	sfrag.damageforcescale = 4;
+
+	sfrag.nextthink = time + 3;
+	sfrag.cnt = time + 2;
+	sfrag.alpha = 1;
+	sfrag.drawmask = MASK_NORMAL;
+}
+
 float v_raptor(float req)
 {
 	switch(req)
@@ -1166,13 +1211,6 @@ float v_raptor(float req)
 		}
 		case VR_PRECACHE:
 		{
-			precache_model ("models/vehicles/raptor.dpm");
-			precache_model ("models/vehicles/raptor_gun.dpm");
-			precache_model ("models/vehicles/spinner.dpm");
-			precache_model ("models/vehicles/raptor_cockpit.dpm");
-			precache_model ("models/vehicles/clusterbomb_folded.md3");
-			precache_model ("models/vehicles/raptor_body.dpm");
-			
 			return TRUE;
 		}
 	}