Fix compile and add more fun

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index 5b74e11b50af47a03f712fc26a2d80aa5a63a9b3..02e06001ece8b504e01ae8ac17badd35883bbe0d 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -44,7 +44,7 @@ void Casing_Touch()
                        if(time >= self.nextthink)
                        {
                                string s;
-                               int f = floor(prandom() * 3) + 1;;
+                               int f = floor(prandom() * 3) + 1;
 
                                switch(self.state)
                                {

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index 835d14a1ee6f3b6d9336ae96ffdbef27ac6c6cc6..5d8543a781b532151fcba8f2c2f3a31896bed5ad 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -1,11 +1,11 @@
-.float silent;
+.bool silent;
 
 void Gib_Delete()
 {
        remove(self);
 }
 
-string species_prefix(float specnum)
+string species_prefix(int specnum)
 {
        switch(specnum)
        {
@@ -20,7 +20,7 @@ string species_prefix(float specnum)
        }
 }
 
-void Gib_setmodel(entity gib, string mdlname, float specnum)
+void Gib_setmodel(entity gib, string mdlname, int specnum)
 {
        switch(specnum)
        {
@@ -48,7 +48,7 @@ void Gib_setmodel(entity gib, string mdlname, float specnum)
        }
 }
 
-void new_te_bloodshower (float ef, vector org, float explosionspeed, float howmany)
+void new_te_bloodshower (int ef, vector org, float explosionspeed, int howmany)
 {
        float i, pmod;
        pmod = autocvar_cl_particles_quality;
@@ -109,7 +109,7 @@ void Gib_Draw()
        }
 }
 
-void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector vrand, float specnum, float destroyontouch, float issilent)
+void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector vrand, int specnum, bool destroyontouch, bool issilent)
 {
        entity gib;
 
@@ -151,15 +151,16 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
        RubbleLimit("gib", autocvar_cl_gibs_maxcount, Gib_Delete);
 }
 
-void Ent_GibSplash(float isNew)
+void Ent_GibSplash(bool isNew)
 {
-       float amount, type, specnum;
+       int amount, type, specnum;
        vector org, vel;
        string specstr;
-       float issilent;
+       bool issilent;
        string gentle_prefix = "morphed_";
 
-       float c, randomvalue;
+       float randomvalue;
+       int c;
 
        type = ReadByte(); // gibbage type
        amount = ReadByte() / 16.0; // gibbage amount

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index c23174ce1304e4395f026927bda0fcda263006bd..93db399ec353670f4ee295e92bd33a83698e8410 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -6,7 +6,7 @@
 #define int float
 
 #define stoi(s) stof(s)
-#define itos(s) stoi(s)
+#define itos(s) ftos(s)
 #endif
 
 #ifndef QCC_SUPPORT_BOOL