Use the function in client code too

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

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index d97e995576a24d138d88cfc3f65cdafee3a8685a..09c2e685365f8915633d7c954e96d2af62dfd7ba 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -1,4 +1,19 @@
-.bool silent;
+#include "casings.qh"
+#include "_all.qh"
+
+#include "../common/movetypes/movetypes.qh"
+#include "../common/weapons/all.qh"
+#include "prandom.qh"
+#include "rubble.qh"
+
+#include "../common/util.qh"
+
+.float cnt;
+.float alpha;
+.int state;
+
+entityclass(Casing);
+class(Casing) .bool silent;
 
 void Casing_Delete()
 {
@@ -49,10 +64,10 @@ void Casing_Touch()
                                switch(self.state)
                                {
                                        case 1:
-                                               s = strcat("weapons/casings", itos(f), ".wav");
+                                               s = W_Sound(strcat("casings", itos(f)));
                                                break;
                                        default:
-                                               s = strcat("weapons/brass", itos(f), ".wav");
+                                               s = W_Sound(strcat("brass", itos(f)));
                                                break;
                                }
 
@@ -67,7 +82,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;
 }
@@ -131,10 +146,10 @@ void Casings_Precache()
 {
        precache_model("models/casing_shell.mdl");
        precache_model("models/casing_bronze.iqm");
-       precache_sound("weapons/brass1.wav");
-       precache_sound("weapons/brass2.wav");
-       precache_sound("weapons/brass3.wav");
-       precache_sound("weapons/casings1.wav");
-       precache_sound("weapons/casings2.wav");
-       precache_sound("weapons/casings3.wav");
+       precache_sound(W_Sound("brass1.wav"));
+       precache_sound(W_Sound("brass2.wav"));
+       precache_sound(W_Sound("brass3.wav"));
+       precache_sound(W_Sound("casings1.wav"));
+       precache_sound(W_Sound("casings2.wav"));
+       precache_sound(W_Sound("casings3.wav"));
 }