Fix quickmenu command "Send private message to" adding a space in the beginning of...

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

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index 6c14fc3a2bc5c7b4725c759a2cd3f282f0cf2772..61d7f10ba5c9be8715e8d9e833a53b41de9dd188 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -1,17 +1,19 @@
-#if defined(CSQC)
-       #include "movetypes.qh"
-       #include "prandom.qh"
-       #include "rubble.qh"
+#include "casings.qh"
+#include "_all.qh"
 
-       .float cnt;
-       .float alpha;
-       .int state;
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "../common/movetypes/movetypes.qh"
+#include "../common/weapons/all.qh"
+#include "prandom.qh"
+#include "rubble.qh"
 
+#include "../common/util.qh"
 
-.bool silent;
+.float cnt;
+.float alpha;
+.int state;
+
+entityclass(Casing);
+class(Casing) .bool silent;
 
 void Casing_Delete()
 {
@@ -22,7 +24,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;
        }
@@ -62,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;
                                }
 
@@ -144,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"));
+       precache_sound(W_Sound("brass2"));
+       precache_sound(W_Sound("brass3"));
+       precache_sound(W_Sound("casings1"));
+       precache_sound(W_Sound("casings2"));
+       precache_sound(W_Sound("casings3"));
 }