From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 4 Jan 2015 16:52:36 +0000 (+0100)
Subject: subs: Clean up direction code range checks
X-Git-Tag: v4.3.33~117
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=bbacc2860670f46e26f0a2826edb2b77fd79d5a3

subs: Clean up direction code range checks

Compare with DIR_LAST instead of DIR_VIEW, to avoid assuming DIR_VIEW
is the first non-direction code.

While there, oops on unexpected code.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 2f6786305..db520020e 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -1021,7 +1021,8 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
     if (CANT_HAPPEN(QEMPTY(list)))
 	return 1;
 
-    if (dir <= DIR_STOP || dir >= DIR_VIEW) {
+    if (dir <= DIR_STOP || dir > DIR_LAST) {
+	CANT_HAPPEN(dir != DIR_STOP);
 	lnd_mar_put(list, actor);
 	return 1;
     }
diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 2182a4a25..58262fdc9 100644
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -796,7 +796,8 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor)
     if (CANT_HAPPEN(QEMPTY(list)))
 	return 1;
 
-    if (dir <= DIR_STOP || dir >= DIR_VIEW) {
+    if (dir <= DIR_STOP || dir > DIR_LAST) {
+	CANT_HAPPEN(dir != DIR_STOP);
 	shp_nav_put(list, actor);
 	return 1;
     }