]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Fix a little detail in the grabber code
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 8 Sep 2010 13:26:46 +0000 (16:26 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 8 Sep 2010 13:26:46 +0000 (16:26 +0300)
data/qcsrc/server/g_grabber.qc

index 07a21b30c506b28a3d209877b77fb0cd21a47144..4a40b8a152457b719c7c98fc22e7fc9ae060faea 100644 (file)
@@ -133,7 +133,14 @@ void GrabberThink()
 \r
        // prevent the grabber from sticking to a player that has been swallowed\r
        if(self.aiment.eater.classname == "player")\r
-               RemoveGrabber(self.owner);\r
+       {\r
+               // if the grabber is linked to a player we have swallowed, disconnect it (or it grabber will stick to us / the player inside us)\r
+               // otherwise, link the grabber to the player who ate our linked player\r
+               if(self.aiment.eater != self.owner)\r
+                       SetMovetypeFollow(self, self.aiment.eater);\r
+               else\r
+                       RemoveGrabber(self.owner);\r
+       }\r
 \r
        self.nextthink = time;\r
 \r