From 5688c07d47feaa5130f1898941e598cbf9354806 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 1 Jan 2016 20:54:52 +1000 Subject: [PATCH] Use loop to kill hooks attached to nade --- qcsrc/common/mutators/mutator/nades/nades.qc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 3fd4d6ce5..6b0b1f5a3 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -648,10 +648,11 @@ void nade_boom() case NADE_TYPE_MONSTER: nade_monster_boom(); break; } - entity head; - for(head = world; (head = find(head, classname, "grapplinghook")); ) - if(head.aiment == self) - RemoveGrapplingHook(head.realowner); + FOREACH_ENTITY_ENT(aiment, self, + { + if(it.classname == "grapplinghook") + RemoveGrapplingHook(it.realowner); + }); remove(self); } @@ -670,10 +671,11 @@ void nade_touch() is_weapclip = 1;*/ if(ITEM_TOUCH_NEEDKILL()) // || is_weapclip) { - entity head; - for(head = world; (head = find(head, classname, "grapplinghook")); ) - if(head.aiment == self) - RemoveGrapplingHook(head.realowner); + FOREACH_ENTITY_ENT(aiment, self, + { + if(it.classname == "grapplinghook") + RemoveGrapplingHook(it.realowner); + }); remove(self); return; } -- 2.39.2