Merge branch 'master' into martin-t/globals

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

diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc
index 416012238a3fd84c766071759ccd0f1543acb84d..35f0fe52256b8cbca67f35bd846ea1caaf2d9957 100644 (file)
--- a/qcsrc/common/effects/qc/gibs.qc
+++ b/qcsrc/common/effects/qc/gibs.qc
@@ -1,6 +1,5 @@
 #include "gibs.qh"
 
-#ifdef IMPLEMENTATION
 REGISTER_NET_TEMP(net_gibsplash)
 
 #ifdef SVQC
@@ -17,7 +16,7 @@ bool Violence_GibSplash_SendEntity(entity this, entity to, int sf)
        WriteShort(channel, floor(this.origin.x / 4)); // not using a coord here, as gibs don't need this accuracy
        WriteShort(channel, floor(this.origin.y / 4)); // not using a coord here, as gibs don't need this accuracy
        WriteShort(channel, floor(this.origin.z / 4)); // not using a coord here, as gibs don't need this accuracy
-       WriteShort(channel, this.oldorigin.x); // acrually compressed velocity
+       WriteShort(channel, this.oldorigin.x); // actually compressed velocity
        return true;
 }
 
@@ -170,7 +169,7 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
 
        // TODO remove some gibs according to cl_nogibs
        gib = RubbleNew("gib");
-       gib.move_movetype = MOVETYPE_BOUNCE;
+       set_movetype(gib, MOVETYPE_BOUNCE);
        gib.gravity = 1;
        gib.solid = SOLID_CORPSE;
        gib.cnt = specnum;
@@ -314,5 +313,3 @@ NET_HANDLE(net_gibsplash, bool isNew)
        delete(this);
 }
 #endif
-
-#endif