]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
This is a commit message, one of many noone will realy need or read
authorJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 20:25:34 +0000 (22:25 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 20:25:34 +0000 (22:25 +0200)
qcsrc/common/constants.qh
qcsrc/server/vehicles/spiderbot.qc

index 46f1d1dd443263c39f36171aed5270bba712f9ae..0398d84ffc4544a7916f1a944391ab069b83388e 100644 (file)
@@ -533,7 +533,7 @@ float DEATH_QUIET = 10021;
 float DEATH_HEADSHOT = 10022;
 
 
-#define DEATH_VEFIRST       10030
+#define DEATH_VHFIRST       10030
 #define DEATH_VHCRUSH       10030
 #define DEATH_SBMINIGUN     10031
 #define DEATH_SBROCKET      10032
@@ -544,7 +544,8 @@ float DEATH_HEADSHOT = 10022;
 #define DEATH_RAPTOR_CANNON 10037
 #define DEATH_RAPTOR_BOMB   10038
 #define DEATH_RAPTOR_DEATH  10039
-#define DEATH_VELAST        10039
+#define DEATH_VHLAST        10039
+#define DEATH_ISVEHICLE(t)            ((t) >= DEATH_VHFIRST && (t) <= DEATH_VHLAST)
 
 float DEATH_GENERIC = 10050;
 
index b9c87cff8e9aa7e03a171f725794cb5867973e89..9cb629ce91bb0a9c3507bd0b5b2b1b24990f0694 100644 (file)
@@ -148,10 +148,10 @@ void spiderbot_rocket_do()
         return;
 
     crosshair_trace(self.owner);
-
+//normalize(v_forward + (v_up * 0.5) + randomvec() * 0.25) * autocvar_g_vehicle_spiderbot_rocket_speed,
     v = gettaginfo(self.tur_head,gettagindex(self.tur_head,"tag_fire"));
     rocket = vehicles_projectile("spiderbot_rocket_explode", "weapons/rocket_impact.wav", "spiderbot_rocket_launch", "weapons/rocket_fire.wav",
-                           v, normalize(v_forward + (v_up * 0.5) + randomvec() * 0.25) * autocvar_g_vehicle_spiderbot_rocket_speed,
+                           v, normalize(v_forward) * autocvar_g_vehicle_spiderbot_rocket_speed,
                            autocvar_g_vehicle_spiderbot_rocket_damage, autocvar_g_vehicle_spiderbot_rocket_radius, autocvar_g_vehicle_spiderbot_rocket_force, 1,
                            DEATH_SBROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health);
 
@@ -274,7 +274,10 @@ float spiderbot_frame()
     }
 
     self = spider;
-
+    
+    //vector v;
+    //v = gettaginfo(self.tur_head,gettagindex(self.tur_head,"tag_fire"));
+    //te_lightning1(world, v, v + normalize(v_forward + (v_up * 0.5) + randomvec() * 0.25) * autocvar_g_vehicle_spiderbot_rocket_speed);
     crosshair_trace(player);
     //UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload2) + ('0 1 0' * (1 - player.vehicle_reload2)), 2);