Merge branch 'master' into Melanosuchus/minigames

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

diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc
index b410898d552c13e92d86ae731e5967871012e9fe..d4ef9554702af9628800348dd0180e84baf6c90c 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -194,9 +194,9 @@ void W_MineLayer_ProximityExplode(void)
        W_MineLayer_Explode();
 }
 
-float W_MineLayer_Count(entity e)
+int W_MineLayer_Count(entity e)
 {
-       float minecount = 0;
+       int minecount = 0;
        entity mine;
        for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.realowner == e)
                minecount += 1;
@@ -218,7 +218,7 @@ void W_MineLayer_Think(void)
                        self.movetype = MOVETYPE_NONE;
                }
        }
-       
+
        // our lifetime has expired, it's time to die - mine_time just allows us to play a sound for this
        // TODO: replace this mine_trigger.wav sound with a real countdown
        if((time > self.cnt) && (!self.mine_time) && (self.cnt > 0))
@@ -290,19 +290,19 @@ void W_MineLayer_Touch(void)
        }
 }
 
-void W_MineLayer_Damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void W_MineLayer_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
        if(self.health <= 0)
                return;
-               
+
        float is_from_enemy = (inflictor.realowner != self.realowner);
-               
+
        if(!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, (is_from_enemy ? 1 : -1)))
                return; // g_projectiles_damage says to halt
-               
+
        self.health = self.health - damage;
        self.angles = vectoangles(self.velocity);
-       
+
        if(self.health <= 0)
                W_PrepareExplosionByDamage(attacker, W_MineLayer_Explode);
 }
@@ -375,7 +375,7 @@ void W_MineLayer_Attack(void)
        // common properties
 
        other = mine; MUTATOR_CALLHOOK(EditProjectile);
-       
+
        self.minelayer_mines = W_MineLayer_Count(self);
 }
 
@@ -400,7 +400,7 @@ float W_MineLayer_PlacedMines(float detonate)
        return minfound;
 }
 
-float W_MineLayer(float req)
+bool W_MineLayer(int req)
 {
        entity mine;
        float ammo_amount;
@@ -503,7 +503,7 @@ float W_MineLayer(float req)
                                //      dprint(ftos(desirabledamage),"\n");
                                if(self.BUTTON_ATCK2 == true) self.BUTTON_ATCK = false;
                        }
-                       
+
                        return true;
                }
                case WR_THINK:
@@ -528,7 +528,7 @@ float W_MineLayer(float req)
                                if(W_MineLayer_PlacedMines(true))
                                        sound(self, CH_WEAPON_B, "weapons/mine_det.wav", VOL_BASE, ATTN_NORM);
                        }
-                       
+
                        return true;
                }
                case WR_INIT:
@@ -542,7 +542,7 @@ float W_MineLayer(float req)
                        precache_sound("weapons/mine_fire.wav");
                        precache_sound("weapons/mine_stick.wav");
                        precache_sound("weapons/mine_trigger.wav");
-                       MINELAYER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       MINELAYER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -565,7 +565,7 @@ float W_MineLayer(float req)
                }
                case WR_CONFIG:
                {
-                       MINELAYER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       MINELAYER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:
@@ -591,7 +591,7 @@ float W_MineLayer(float req)
 }
 #endif
 #ifdef CSQC
-float W_MineLayer(float req)
+bool W_MineLayer(int req)
 {
        switch(req)
        {
@@ -602,7 +602,7 @@ float W_MineLayer(float req)
                        pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1);
                        if(!w_issilent)
                                sound(self, CH_SHOTS, "weapons/mine_exp.wav", VOL_BASE, ATTN_NORM);
-                       
+
                        return true;
                }
                case WR_INIT: