Declare more ints as ints

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

diff --git a/qcsrc/common/weapons/w_rpc.qc b/qcsrc/common/weapons/w_rpc.qc
index 81e1144434287fde8164cc48e27679ef7a20f117..d641572c343f87c7a01c151cc61ca9ec8ef235cf 100644 (file)
--- a/qcsrc/common/weapons/w_rpc.qc
+++ b/qcsrc/common/weapons/w_rpc.qc
@@ -9,7 +9,7 @@ REGISTER_WEAPON(
 /* color     */ '0.5 0.5 0',
 /* modelname */ "ok_rl",
 /* simplemdl */ "foobar",
-/* crosshair */ "gfx/crosshairrocketlauncher 0.5875",
+/* crosshair */ "gfx/crosshairrocketlauncher 0.7",
 /* wepimg    */ "weaponrpc",
 /* refname   */ "rpc",
 /* wepname      */ _("Rocket Propelled Chainsaw")
@@ -65,7 +65,7 @@ void W_RocketPropelledChainsaw_Touch (void)
        W_RocketPropelledChainsaw_Explode();
 }
 
-void W_RocketPropelledChainsaw_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void W_RocketPropelledChainsaw_Damage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
        if (self.health <= 0)
                return;
@@ -107,19 +107,19 @@ void W_RocketPropelledChainsaw_Attack (void)
        entity flash = spawn ();
 
        W_DecreaseAmmo(WEP_CVAR(rpc, ammo));
-       W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 5, "weapons/rocket_fire.wav", CH_WEAPON_A, WEP_CVAR(rpc, damage));
+       W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', false, 5, "weapons/rocket_fire.wav", CH_WEAPON_A, WEP_CVAR(rpc, damage));
        pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
        PROJECTILE_MAKETRIGGER(missile);
 
        missile.owner = missile.realowner = self;
-       missile.bot_dodge = TRUE;
+       missile.bot_dodge = true;
        missile.bot_dodgerating = WEP_CVAR(rpc, damage) * 2;
 
        missile.takedamage = DAMAGE_YES;
        missile.damageforcescale = WEP_CVAR(rpc, damageforcescale);
        missile.health = WEP_CVAR(rpc, health);
        missile.event_damage = W_RocketPropelledChainsaw_Damage;
-       missile.damagedbycontents = TRUE;
+       missile.damagedbycontents = true;
        missile.movetype = MOVETYPE_FLY;
 
        missile.projectiledeathtype = WEP_RPC;
@@ -135,7 +135,7 @@ void W_RocketPropelledChainsaw_Attack (void)
        missile.nextthink = time;
        missile.flags = FL_PROJECTILE;
 
-       CSQCProjectile(missile, TRUE, PROJECTILE_RPC, FALSE);
+       CSQCProjectile(missile, true, PROJECTILE_RPC, false);
 
        setmodel(flash, "models/flash.md3"); // precision set below
        SUB_SetFade (flash, time, 0.1);
@@ -146,15 +146,15 @@ void W_RocketPropelledChainsaw_Attack (void)
        other = missile; MUTATOR_CALLHOOK(EditProjectile);
 }
 
-float W_RocketPropelledChainsaw(float req)
+bool W_RocketPropelledChainsaw(int req)
 {
-       float ammo_amount = FALSE;
+       float ammo_amount = false;
        switch(req)
        {
                case WR_AIM:
                {
-                       self.BUTTON_ATCK = bot_aim(WEP_CVAR(rpc, speed), 0, WEP_CVAR(rpc, lifetime), FALSE);
-                       return TRUE;
+                       self.BUTTON_ATCK = bot_aim(WEP_CVAR(rpc, speed), 0, WEP_CVAR(rpc, lifetime), false);
+                       return true;
                }
                case WR_THINK:
                {
@@ -177,7 +177,7 @@ float W_RocketPropelledChainsaw(float req)
                                }
                        }
 
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
@@ -186,8 +186,8 @@ float W_RocketPropelledChainsaw(float req)
                        precache_model("models/weapons/v_ok_rl.md3");
                        precache_model("models/weapons/g_ok_rl.md3");
                        precache_sound ("weapons/rocket_fire.wav");
-                       RPC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
-                       return TRUE;
+                       RPC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
+                       return true;
                }
                case WR_CHECKAMMO1:
                {
@@ -197,17 +197,17 @@ float W_RocketPropelledChainsaw(float req)
                }
                case WR_CHECKAMMO2:
                {
-                       return FALSE;
+                       return false;
                }
                case WR_CONFIG:
                {
-                       RPC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
-                       return TRUE;
+                       RPC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
+                       return true;
                }
                case WR_RELOAD:
                {
                        W_Reload(WEP_CVAR(rpc, ammo), "weapons/reload.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_SUICIDEMESSAGE:
                {
@@ -227,12 +227,12 @@ float W_RocketPropelledChainsaw(float req)
                }
        }
 
-       return FALSE;
+       return false;
 }
 #endif
 
 #ifdef CSQC
-float W_RocketPropelledChainsaw(float req)
+bool W_RocketPropelledChainsaw(int req)
 {
        switch(req)
        {
@@ -244,21 +244,21 @@ float W_RocketPropelledChainsaw(float req)
                        if(!w_issilent)
                                sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
 
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
                        precache_sound("weapons/rocket_impact.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_ZOOMRETICLE:
                {
                        // no weapon specific image for this weapon
-                       return FALSE;
+                       return false;
                }
        }
 
-       return FALSE;
+       return false;
 }
 #endif
 #endif