Merge branch 'TimePath/effectinfo' into 'master'

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

diff --git a/qcsrc/client/rubble.qc b/qcsrc/client/rubble.qc
index c09dd18aed4ed8bfe1cc3cc78256e869489efcc1..5af2e235070f7c5d7b63f2fc3d30353f0f206cfd 100644 (file)
--- a/qcsrc/client/rubble.qc
+++ b/qcsrc/client/rubble.qc
@@ -1,21 +1,14 @@
-#if defined(CSQC)
-       #include "rubble.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "rubble.qh"
 
 // LordHavoc: rewrote this file, it was really bad code
 
 void RubbleLimit(string cname, float limit, void() deleteproc)
-{
+{SELFPARAM();
        entity e;
        entity oldest;
-       entity oldself;
        float c;
        float oldesttime;
 
-       oldself = self;
-
        // remove rubble of the same type if it's at the limit
        // remove multiple rubble if the limit has been decreased
        while(1)
@@ -46,9 +39,7 @@ void RubbleLimit(string cname, float limit, void() deleteproc)
                        break;
 
                // delete this oldest one and search again
-               self = oldest;
-               deleteproc();
-               self = oldself;
+               WITH(entity, self, oldest, deleteproc());
        }
 }