From 7de511fb66c05434fe67e644052e994c72b9ffa3 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 8 Apr 2011 21:13:07 +0200
Subject: [PATCH] Factor snxtsct_use_condarg() out of snxtsct()

---
 include/nsc.h          |  1 +
 src/lib/subs/snxtsct.c | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/include/nsc.h b/include/nsc.h
index 30bc8730..04f6d1bc 100644
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -312,6 +312,7 @@ extern void snxtsct_area(struct nstr_sect *, struct range *);
 extern void snxtsct_all(struct nstr_sect *);
 extern void snxtsct_rewind(struct nstr_sect *);
 extern void snxtsct_dist(struct nstr_sect *, coord, coord, int);
+extern int snxtsct_use_condarg(struct nstr_sect *);
 /* src/lib/subs/nstr.c */
 extern int nstr_comp(struct nscstr *np, int len, int type, char *str);
 extern char *nstr_comp_val(char *, struct valstr *, int);
diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c
index 9bb76dec..7657c456 100644
--- a/src/lib/subs/snxtsct.c
+++ b/src/lib/subs/snxtsct.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1989
- *     Markus Armbruster, 2006-2009
+ *     Markus Armbruster, 2006-2011
  */
 
 #include <config.h>
@@ -57,7 +57,7 @@ snxtsct(struct nstr_sect *np, char *str)
     struct range range;
     struct natstr *natp;
     coord cx, cy;
-    int dist, n;
+    int dist;
     char buf[1024];
 
     if (!str || !*str) {
@@ -91,12 +91,7 @@ snxtsct(struct nstr_sect *np, char *str)
     default:
 	return 0;
     }
-    if (!player->condarg)
-	return 1;
-    n = nstr_comp(np->cond, sizeof(np->cond) / sizeof(*np->cond),
-		  EF_SECTOR, player->condarg);
-    np->ncond = n >= 0 ? n : 0;
-    return n >= 0;
+    return snxtsct_use_condarg(np);
 }
 
 void
@@ -125,6 +120,21 @@ snxtsct_area(struct nstr_sect *np, struct range *range)
     np->dy = 0;
 }
 
+int
+snxtsct_use_condarg(struct nstr_sect *np)
+{
+    int n;
+
+    if (!player->condarg)
+	return 1;
+    n = nstr_comp(np->cond, sizeof(np->cond) / sizeof(*np->cond),
+		  EF_SECTOR, player->condarg);
+    if (n < 0)
+	return 0;
+    np->ncond = n;
+    return 1;
+}
+
 void
 snxtsct_rewind(struct nstr_sect *np)
 {