Merge branch 'TimePath/experiments/csqc_prediction' into Mario/qc_physics

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / casings.qc

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index b7693efbb8d545670636b7730a2a73898b11de35..6c14fc3a2bc5c7b4725c759a2cd3f282f0cf2772 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -5,7 +5,7 @@
 
        .float cnt;
        .float alpha;
-       .float state;
+       .int state;
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif
@@ -22,7 +22,7 @@ void Casing_Draw()
 {
        if(self.move_flags & FL_ONGROUND)
        {
-               self.move_angles_x = 0;
+               self.move_angles.x = 0;
                self.move_angles_z = 0;
                self.flags &= ~FL_ONGROUND;
        }
@@ -80,7 +80,7 @@ void Casing_Touch()
 void Casing_Damage(float thisdmg, int hittype, vector org, vector thisforce)
 {
        if(thisforce.z < 0)
-               thisforce_z = 0;
+               thisforce.z = 0;
        self.move_velocity = self.move_velocity + thisforce + '0 0 100';
        self.move_flags &= ~FL_ONGROUND;
 }