Merge remote branch 'origin/master' into samual/menu_updates

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

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index 18602fee02e749c1beaa5a45cbba0599d3e21cd3..d4d1041c80b5b2bfb63cbf1208021b9cb3ad55af 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -15,6 +15,8 @@ void Casing_Draw()
        }
 
        Movetype_Physics_MatchTicrate(autocvar_cl_casings_ticrate, autocvar_cl_casings_sloppy);
+       if(wasfreed(self))
+               return; // deleted by touch function
 
        self.renderflags = 0;
        self.alpha = bound(0, self.cnt - time, 1);
@@ -55,7 +57,7 @@ void Casing_Touch()
                                                break;
                                }
 
-                               asound (self, CH_SHOTS, s, VOL_BASE, ATTN_NORM);
+                               sound (self, CH_SHOTS, s, VOL_BASE, ATTN_LARGE);
                        }
                }
        }
@@ -107,7 +109,7 @@ void Ent_Casing(float isNew)
                                casing.cnt = time + autocvar_cl_casings_shell_time;
                                break;
                        default:
-                               setmodel(casing, "models/casing_bronze.mdl");
+                               setmodel(casing, "models/casing_bronze.iqm");
                                casing.cnt = time + autocvar_cl_casings_bronze_time;
                                break;
                }
@@ -123,7 +125,7 @@ void Ent_Casing(float isNew)
 void Casings_Precache()
 {
        precache_model("models/casing_shell.mdl");
-       precache_model("models/casing_bronze.mdl");
+       precache_model("models/casing_bronze.iqm");
        precache_sound("weapons/brass1.wav");
        precache_sound("weapons/brass2.wav");
        precache_sound("weapons/brass3.wav");