Unhandled weapon requests from weapon functions should return FALSE

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_blaster.qc

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index 7db42548f68705b0817290c9d4fd9ab01319338c..9509b7b8eeb8f9d6e4ca70128658d59ea5e536de 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -7,9 +7,11 @@ REGISTER_WEAPON(
 /* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
 /* rating    */ 0,
 /* color     */ '1 0.5 0.5',
-/* model     */ "laser",
+/* modelname */ "laser",
+/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairlaser 0.4",
-/* refname   */ "laser",
+/* wepimg    */ "weaponlaser",
+/* refname   */ "blaster",
 /* wepname   */ _("Blaster")
 );
 
@@ -223,7 +225,7 @@ float W_Blaster(float request)
                        precache_model("models/weapons/v_laser.md3");
                        precache_model("models/weapons/h_laser.iqm");
                        precache_sound("weapons/lasergun_fire.wav");
-                       BLASTER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       BLASTER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                
@@ -247,16 +249,15 @@ float W_Blaster(float request)
                
                case WR_SUICIDEMESSAGE:
                {
-                       return WEAPON_LASER_SUICIDE;
+                       return WEAPON_BLASTER_SUICIDE;
                }
                
                case WR_KILLMESSAGE:
                {
-                       return WEAPON_LASER_MURDER;
+                       return WEAPON_BLASTER_MURDER;
                }
        }
-       
-       return TRUE;
+       return FALSE;
 }
 #endif
 #ifdef CSQC
@@ -268,7 +269,7 @@ float W_Blaster(float request)
                {
                        vector org2;
                        org2 = w_org + w_backoff * 6;
-                       pointparticles(particleeffectnum("new_laser_impact"), org2, w_backoff * 1000, 1);
+                       pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1);
                        if(!w_issilent) { sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); }
                        return TRUE;
                }
@@ -284,8 +285,7 @@ float W_Blaster(float request)
                        return FALSE;
                }
        }
-       
-       return TRUE;
+       return FALSE;
 }
 #endif
 #endif