Merge branch 'master' into Mario/mutator_minstagib

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / runematch.qc

diff --git a/qcsrc/server/runematch.qc b/qcsrc/server/runematch.qc
index 239afb04a81c4d72702fa840078e50dc1928c29f..ba8f648c888b33e0e312cdf8774b3e1cd0169cad 100644 (file)
--- a/qcsrc/server/runematch.qc
+++ b/qcsrc/server/runematch.qc
@@ -165,7 +165,7 @@ void rune_respawn();
 void RuneCarriedThink()
 {
        float rcount, rnum;
-       vector ang;
+       vector ang = '0 0 0';
        entity rune;
 
        if(self.owner.classname != "player" || time < game_starttime)
@@ -219,11 +219,11 @@ void rune_touch()
 
        other.runes = other.runes | self.runes | self.enemy.runes;
 
-       //self.think = SUB_Null;
+       //self.think = func_null;
        //self.nextthink = 0;
        self.think = RuneCarriedThink;
        self.nextthink = time;
-       self.touch = SUB_Null;
+       self.touch = func_null;
 
        self.solid = SOLID_NOT;
        setorigin(self, self.origin);
@@ -344,14 +344,14 @@ void DropAllRunes(entity pl)
        entity curse1, rune1, curse2, rune2;
 
        rcount = ccount = r = c = 0;
-       rune = find(rune, classname, "rune");
+       rune = find(world, classname, "rune");
        while(rune)
        {
                if(rune.owner == pl)
                        rcount = rcount + 1;
                rune = find(rune, classname, "rune");
        }
-       curse = find(curse, classname, "curse");
+       curse = find(world, classname, "curse");
        while(curse)
        {
                if(curse.owner == pl)