hastype() can now take a list of types to check

diff --git a/game/txt/hlp/cobra_func.hlp b/game/txt/hlp/cobra_func.hlp
index 28974cecc2b2555410d0d576e65b7277f6913d8e..3dd6e0f668d21522f8d3d3b841bf0199caeda81c 100644 (file)
--- a/game/txt/hlp/cobra_func.hlp
+++ b/game/txt/hlp/cobra_func.hlp
@@ -1538,10 +1538,12 @@ Continued in HELP FOREACH2
 
   See also: orlflags(), andlflags(), orflags(), andflags()
 & HASTYPE()
-  hastype(<object>, <type>)
+  hastype(<object>, <type list>)
 
   Returns 1 if the object is of the named type, otherwise 0.
-  Valid types are: ROOM, EXIT, PLAYER, THING, GARBAGE.
+  Valid types are: ROOM, EXIT, PLAYER, THING, GARBAGE. You can
+  test to see if the object is one of a number of types by using a space-
+  separated list of types.
   If an invalid type is given, #-1 NO SUCH TYPE is returned.
 & HIDDEN()
   hidden(<player|descriptor>)

diff --git a/src/fundb.c b/src/fundb.c
index ba3eafa7bb50a554fe1bda0d93a792276234d7f3..e83efdcbf41597979fe845c05f3561c51f7d1ef3 100644 (file)
--- a/src/fundb.c
+++ b/src/fundb.c
@@ -981,40 +981,52 @@ FUNCTION(fun_hasflag)
 /* ARGSUSED */
 FUNCTION(fun_hastype)
 {
+  char *r, *s;
+  int found = 0;
   dbref it = match_thing(executor, args[0]);
   if (!GoodObject(it)) {
     safe_str(T(e_notvis), buff, bp);
     return;
   }
-  switch (*args[1]) {
-  case 'r':
-  case 'R':
-    safe_boolean(IsRoom(it), buff, bp);
-    break;
-  case 'e':
-  case 'E':
-    safe_boolean(IsExit(it), buff, bp);
-    break;
-  case 'p':
-  case 'P':
-    safe_boolean(IsPlayer(it), buff, bp);
-    break;
-  case 't':
-  case 'T':
-    safe_boolean(IsThing(it), buff, bp);
-    break;
-  case 'd':
-  case 'D':
-    safe_boolean(IsDivision(it), buff, bp);
-    break;
-  case 'g':
-  case 'G':
-    safe_boolean(IsGarbage(it), buff, bp);
-    break;
-  default:
-    safe_str(T("#-1 NO SUCH TYPE"), buff, bp);
-    break;
-  };
+  s = trim_space_sep(args[1], ' ');
+  r = split_token(&s, ' ');
+  do {
+    switch (*r) {
+    case 'r':
+    case 'R':
+      if (IsRoom(it))
+      found = 1;
+      break;
+    case 'e':
+    case 'E':
+      if (IsExit(it))
+      found = 1;
+      break;
+    case 'p':
+    case 'P':
+      if (IsPlayer(it))
+      found = 1;
+      break;
+    case 't':
+    case 'T':
+      if (IsThing(it))
+      found = 1;
+      break;
+    case 'g':
+    case 'G':
+      if (IsGarbage(it))
+      found = 1;
+      break;
+    default:
+      safe_str(T("#-1 NO SUCH TYPE"), buff, bp);
+      return;
+    }
+    if (found) {
+      safe_boolean(found, buff, bp);
+      return;
+    }
+  } while ((r = split_token(&s, ' ')));
+  safe_boolean(0, buff, bp);
 }
 
 /* ARGSUSED */