De-stringify particle effects

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / unit / racer.qc

diff --git a/qcsrc/common/vehicles/unit/racer.qc b/qcsrc/common/vehicles/unit/racer.qc
index 41a0b12ff71eaf2811fc826d9991226c3f734a7c..38b06c3b3a80dd72fe182366622bfb9d9c4397b7 100644 (file)
--- a/qcsrc/common/vehicles/unit/racer.qc
+++ b/qcsrc/common/vehicles/unit/racer.qc
@@ -1,9 +1,10 @@
 #ifndef VEHICLE_RACER
 #define VEHICLE_RACER
+#ifndef MENUQC
 int v_racer(int);
+#endif
 REGISTER_VEHICLE_SIMPLE(
 /* VEH_##id   */ RACER,
-/* function   */ v_racer,
 /* spawnflags */ VHF_DMGSHAKE | VHF_DMGROLL,
 /* mins,maxs  */ '-120 -120 -40' * 0.5, '120 120 40' * 0.5,
 /* model         */ "models/vehicles/wakizashi.dpm",
@@ -14,6 +15,9 @@ REGISTER_VEHICLE_SIMPLE(
 /* fullname   */ _("Racer")
 ) {
     this.m_icon = "vehicle_racer";
+#ifndef MENUQC
+    this.vehicle_func = v_racer;
+#endif
 }
 #endif
 
@@ -130,7 +134,7 @@ void racer_align4point(float _delta)
        self.velocity += push_vector * _delta;
 
        float uforce = autocvar_g_vehicle_racer_upforcedamper;
-       
+
        int cont = pointcontents(self.origin - '0 0 64');
        if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
        {
@@ -141,7 +145,7 @@ void racer_align4point(float _delta)
                else
                        self.velocity_z += 200;
        }
-       
+
 
        // Anti ocilation
        if(self.velocity_z > 0)
@@ -170,7 +174,7 @@ void racer_fire_cannon(string tagname)
        entity bolt;
 
        v = gettaginfo(self, gettagindex(self, tagname));
-       bolt = vehicles_projectile("wakizashi_gun_muzzleflash", "weapons/lasergun_fire.wav",
+       bolt = vehicles_projectile(EFFECT_RACER_MUZZLEFLASH.eent_eff_name, W_Sound("lasergun_fire"),
                                                   v, normalize(v_forward + randomvec() * autocvar_g_vehicle_racer_cannon_spread) * autocvar_g_vehicle_racer_cannon_speed,
                                                   autocvar_g_vehicle_racer_cannon_damage, autocvar_g_vehicle_racer_cannon_radius, autocvar_g_vehicle_racer_cannon_force,  0,
                                                   DEATH_VH_WAKI_GUN, PROJECTILE_WAKICANNON, 0, true, true, self.owner);
@@ -224,7 +228,7 @@ void racer_rocket_groundhugger()
                self.velocity = olddir * newvel;
                self.velocity_z -= 1600 * sys_frametime; // 2x grav looks better for this one
        }
-       
+
        int cont = pointcontents(self.origin - '0 0 32');
        if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
                self.velocity_z += 200;
@@ -288,7 +292,7 @@ void racer_rocket_tracker()
 void racer_fire_rocket(string tagname, entity trg)
 {
        vector v = gettaginfo(self, gettagindex(self, tagname));
-       entity rocket = vehicles_projectile("wakizashi_rocket_launch", "weapons/rocket_fire.wav",
+       entity rocket = vehicles_projectile(EFFECT_RACER_ROCKETLAUNCH.eent_eff_name, W_Sound("rocket_fire"),
                                                   v, v_forward * autocvar_g_vehicle_racer_rocket_speed,
                                                   autocvar_g_vehicle_racer_rocket_damage, autocvar_g_vehicle_racer_rocket_radius, autocvar_g_vehicle_racer_rocket_force, 3,
                                                   DEATH_VH_WAKI_ROCKET, PROJECTILE_WAKIROCKET, 20, false, false, self.owner);
@@ -402,7 +406,7 @@ float racer_frame()
        {
 #ifdef SVQC
                if(time - racer.wait > 0.2)
-                       pointparticles(particleeffectnum("wakizashi_booster_smoke"), self.origin - v_forward * 32, v_forward  * vlen(self.velocity), 1);
+                       pointparticles(particleeffectnum(EFFECT_RACER_BOOSTER), self.origin - v_forward * 32, v_forward  * vlen(self.velocity), 1);
 #endif
 
                racer.wait = time;
@@ -423,7 +427,7 @@ float racer_frame()
                {
                        traceline(racer.origin, racer.origin - '0 0 256', MOVE_NORMAL, self);
                        if(trace_fraction != 1.0)
-                               pointparticles(particleeffectnum("smoke_small"), trace_endpos, '0 0 0', 1);
+                               pointparticles(particleeffectnum(EFFECT_SMOKE_SMALL), trace_endpos, '0 0 0', 1);
 
                        racer.invincible_finished = time + 0.1 + (random() * 0.1);
                }
@@ -574,7 +578,7 @@ void racer_think()
 
        self.angles_x *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * pushdeltatime);
        self.angles_z *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * pushdeltatime);
-       
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -648,10 +652,10 @@ void racer_blowup()
 void racer_blowup_think()
 {
        self.nextthink = time;
-       
+
        if(time >= self.delay)
                racer_blowup();
-       
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -700,7 +704,7 @@ void racer_draw()
 
        self.move_angles_x *= 1 - (getstatf(STAT_VEH_RACER_ANGLESTABILIZER) * pushdeltatime);
        self.move_angles_z *= 1 - (getstatf(STAT_VEH_RACER_ANGLESTABILIZER) * pushdeltatime);
-       
+
        Movetype_Physics_MatchServer(false);
 }
 #endif
@@ -732,7 +736,7 @@ bool v_racer(int req)
 
                        self.move_movetype = MOVETYPE_BOUNCE;
                #endif
-                          
+
                        return true;
                }
 
@@ -763,9 +767,9 @@ bool v_racer(int req)
                        self.solid                = SOLID_SLIDEBOX;
                        self.delay                = time;
                        self.scale                = 0.5;
-                       
+
                        self.PlayerPhysplug = racer_frame;
-                       
+
                        self.bouncefactor = autocvar_g_vehicle_racer_bouncefactor;
                        self.bouncestop = autocvar_g_vehicle_racer_bouncestop;
                        self.damageforcescale = 0.5;
@@ -790,7 +794,7 @@ bool v_racer(int req)
                        self.cnt                        = 1 + random() * 2;
                        self.touch                      = racer_deadtouch;
 
-                       Send_Effect("explosion_medium", self.origin, '0 0 0', 1);
+                       Send_Effect(EFFECT_EXPLOSION_MEDIUM, self.origin, '0 0 0', 1);
 
                        if(random() < 0.5)
                                self.avelocity_z = 32;
@@ -853,8 +857,8 @@ bool v_racer(int req)
                case VR_PRECACHE:
                {
                #ifdef SVQC
-                       precache_sound ("weapons/lasergun_fire.wav");
-                       precache_sound ("weapons/rocket_fire.wav");
+                       precache_sound (W_Sound("lasergun_fire"));
+                       precache_sound (W_Sound("rocket_fire"));
 
                        precache_sound ("vehicles/racer_idle.wav");
                        precache_sound ("vehicles/racer_move.wav");