From cc2629d6cfbbe8f29edb478d82bf9c5751282d4e Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 28 Jul 2007 07:08:45 +0000
Subject: [PATCH] (sctoff): Oops on bad arguments.  Recovery by returning -1
 seems dangerous.  Not touching that now.

(sctoff): Use XYOFFSET().  No functional change.
---
 src/lib/common/xy.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c
index 877263bf..7c93e11d 100644
--- a/src/lib/common/xy.c
+++ b/src/lib/common/xy.c
@@ -167,11 +167,9 @@ yabs(struct natstr *np, coord rely)
 int
 sctoff(coord x, coord y)
 {
-    if ((x + y) & 01) {
-	logerror("%d,%d is an invalid sector specification!\n", x, y);
+    if (CANT_HAPPEN((x + y) & 1))
 	return -1;
-    }
-    return (YNORM(y) * WORLD_X + XNORM(x)) / 2;
+    return XYOFFSET(XNORM(x), YNORM(y));
 }
 
 coord