Merge branch 'master' into Mario/showspecs

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

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index dcf4bfed485eb5f50df0e3939742336f68a54c17..eb7d4787777c0435b67721dd874aff64a87592e7 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -1,20 +1,4 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qc"
-       #include "Defs.qc"
-       #include "../common/constants.qh"
-       #include "../common/util.qh"
-       #include "../common/buffs.qh"
-       #include "autocvars.qh"
-       #include "movetypes.qh"
-       #include "prandom.qh"
-       #include "main.qh"
-       #include "../csqcmodellib/cl_model.qh"
-       #include "../server/t_items.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
-.bool silent;
+#include "gibs.qh"
 
 void Gib_Delete()
 {
@@ -180,9 +164,9 @@ void Ent_GibSplash(bool isNew)
 
        type = ReadByte(); // gibbage type
        amount = ReadByte() / 16.0; // gibbage amount
-       org_x = ReadShort() * 4 + 2;
-       org_y = ReadShort() * 4 + 2;
-       org_z = ReadShort() * 4 + 2;
+       org.x = ReadShort() * 4 + 2;
+       org.y = ReadShort() * 4 + 2;
+       org.z = ReadShort() * 4 + 2;
        vel = decompressShortVector(ReadShort());
 
        float cl_gentle_gibs = autocvar_cl_gentle_gibs;