]> git.pond.sub.org Git - empserver/commitdiff
bomb: Simplify after previous commit
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 29 May 2016 10:16:25 +0000 (12:16 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 6 Aug 2017 17:59:56 +0000 (19:59 +0200)
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
src/lib/commands/bomb.c

index 26f76b9e281307425dc7836f46b3313189427d8c..5aa83ff424c5c8b09b358ed46517543b1b889dbb 100644 (file)
@@ -302,17 +302,11 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target)
            return;
        if (!ip)
            continue;
-
-       for (i = I_NONE + 1; i <= I_MAX; i++) {
-           if (opt_SUPER_BARS && i == I_BAR)
-               continue;
-           if (&ichr[i] == ip)
-               break;
-       }
-       if (i > I_MAX)
+       if (opt_SUPER_BARS && ip->i_uid == I_BAR) {
            pr("You can't bomb %s!\n", ip->i_name);
-       else
-           break;
+           continue;
+       }
+       break;
     }
     for (qp = list->q_forw; qp != list; qp = next) {
        next = qp->q_forw;