Merge branch 'Mario/arc_sounds' into 'master'

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

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index 801fbb091c74543db1ef93c8f275452342fa1530..3ec86c782de9d781c9d8945d9c3eef04dcbd1902 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -4,7 +4,7 @@ REGISTER_WEAPON(
 /* function  */ W_Electro,
 /* ammotype  */ ammo_cells,
 /* impulse   */ 5,
-/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH,
+/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
 /* rating    */ BOT_PICKUP_RATING_MID,
 /* color     */ '0 0.5 1',
 /* modelname */ "electro",
@@ -55,7 +55,8 @@ REGISTER_WEAPON(
        w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
        w_prop(id, sn, string, weaponreplace, weaponreplace) \
        w_prop(id, sn, float,  weaponstart, weaponstart) \
-       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride)
+       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride) \
+       w_prop(id, sn, float,  weaponthrowable, weaponthrowable)
 
 #ifdef SVQC
 ELECTRO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
@@ -65,7 +66,7 @@ void W_Electro_ExplodeCombo(void);
 #endif
 #else
 #ifdef SVQC
-void spawnfunc_weapon_electro() { weapon_defaultspawnfunc(WEP_ELECTRO); }
+void spawnfunc_weapon_electro(void) { weapon_defaultspawnfunc(WEP_ELECTRO); }
 
 void W_Electro_TriggerCombo(vector org, float rad, entity own)
 {
@@ -189,7 +190,7 @@ void W_Electro_TouchExplode(void)
        W_Electro_Explode();
 }
 
-void W_Electro_Bolt_Think()
+void W_Electro_Bolt_Think(void)
 {
        if(time >= self.ltime)
        {
@@ -247,11 +248,20 @@ void W_Electro_Attack_Bolt(void)
 
        W_DecreaseAmmo(WEP_CVAR_PRI(electro, ammo));
 
-       W_SetupShot_ProjectileSize(self, '0 0 -3', '0 0 -3', FALSE, 2, "weapons/electro_fire.wav", CH_WEAPON_A, WEP_CVAR_PRI(electro, damage));
+       W_SetupShot_ProjectileSize(
+               self,
+               '0 0 -3',
+               '0 0 -3',
+               FALSE,
+               2,
+               "weapons/electro_fire.wav",
+               CH_WEAPON_A,
+               WEP_CVAR_PRI(electro, damage)
+       );
 
        pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
-       proj = spawn ();
+       proj = spawn();
        proj.classname = "electro_bolt";
        proj.owner = proj.realowner = self;
        proj.bot_dodge = TRUE;
@@ -336,7 +346,16 @@ void W_Electro_Attack_Orb(void)
 {
        W_DecreaseAmmo(WEP_CVAR_SEC(electro, ammo));
 
-       W_SetupShot_ProjectileSize(self, '0 0 -4', '0 0 -4', FALSE, 2, "weapons/electro_fire2.wav", CH_WEAPON_A, WEP_CVAR_SEC(electro, damage));
+       W_SetupShot_ProjectileSize(
+               self,
+               '0 0 -4',
+               '0 0 -4',
+               FALSE,
+               2,
+               "weapons/electro_fire2.wav",
+               CH_WEAPON_A,
+               WEP_CVAR_SEC(electro, damage)
+       );
 
        w_shotdir = v_forward; // no TrueAim for grenades please
 
@@ -384,7 +403,7 @@ void W_Electro_Attack_Orb(void)
        other = proj; MUTATOR_CALLHOOK(EditProjectile);
 }
 
-void W_Electro_CheckAttack()
+void W_Electro_CheckAttack(void)
 {
        if(self.electro_count > 1)
        if(self.BUTTON_ATCK2)