From 2f86e79e8070116117867591a146b8683f42ff26 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 9 Apr 2011 15:36:21 +0200 Subject: [PATCH] Drop potentially misleading build and radar error messages buil() complains about the argument when snxtsct() fails. Misleading when the argument is fine, but snxtsct() fails due to bad conditional argument. Same for radar() with snxtitem(). --- src/lib/commands/buil.c | 6 ++---- src/lib/commands/rada.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c index 5170710c..be3ded13 100644 --- a/src/lib/commands/buil.c +++ b/src/lib/commands/buil.c @@ -28,7 +28,7 @@ * * Known contributors to this file: * Steve McClure, 1998-2000 - * Markus Armbruster, 2004-2009 + * Markus Armbruster, 2004-2011 */ #include @@ -92,10 +92,8 @@ buil(void) return RET_SYN; what = *p; - if (!snxtsct(&nstr, player->argp[2])) { - pr("Bad sector specification.\n"); + if (!snxtsct(&nstr, player->argp[2])) return RET_SYN; - } tlev = (int)natp->nat_level[NAT_TLEV]; rlev = (int)natp->nat_level[NAT_RLEV]; diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c index 63f384ee..be0552ca 100644 --- a/src/lib/commands/rada.c +++ b/src/lib/commands/rada.c @@ -86,10 +86,8 @@ radar(int type) case NS_LIST: case NS_GROUP: /* assumes a NS_LIST return is a unit no */ - if (!snxtitem(&ni, type, cp, NULL)) { - pr("Specify at least one %s\n", ef_nameof(type)); + if (!snxtitem(&ni, type, cp, NULL)) return RET_SYN; - } while (nxtitem(&ni, &item)) { if (!player->owner) continue;