[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.177 by root, Thu Dec 27 15:32:41 2007 UTC vs.
Revision 1.178 by root, Sat Jan 5 06:11:28 2008 UTC

  *  found object is returned.
  */
 object *
 find_arrow (object *op, const char *type)
 {
-  object *tmp = 0;
-  for (op = op->inv; op; op = op->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
-    if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
-      tmp = find_arrow (splay (op), type);
-    else if (op->type == ARROW && op->race == type)
+    if (tmp->type == ARROW && !strcmp (tmp->race, type))
-      return splay (op);
+      return splay (tmp);
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
+    if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (tmp->race, type))
+      if (object *arrow = find_arrow (tmp, type))
+        {
+          splay (tmp);
+          return arrow;
+        }
-  return tmp;
+  return 0;
 }
 /*
  * Similar to find_arrow, but looks for (roughly) the best arrow to use
  * against the target.  A full test is not performed, simply a basic test

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines