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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC vs.
Revision 1.181 by root, Tue Apr 15 14:21:04 2008 UTC

             combat_ob = op;
             break;
         }
   ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
+  ob->deactivate (); // change_Weapon activates, fix this better
 }
 void
 player::set_observe (object *op)
 {
 }
 void
 give_initial_items (object *pl, treasurelist * items)
 {
-  object *op, *next = NULL;
-  if (pl->randomitems != NULL)
+  if (pl->randomitems)
     create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
-  for (op = pl->inv; op; op = next)
+  for (object *next, *op = pl->inv; op; op = next)
     {
       next = op->below;
       /* Forces get applied per default, unless they have the
        * flag "neutral" set. Sorry but I can't think of a better way
           if (op->nrof > 1)
             op->nrof = 1;
         }
       if (op->type == SPELLBOOK && op->inv)
-        {
-          CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
+        CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
-        }
       /* Give starting characters identified, uncursed, and undamned
        * items.  Just don't identify gold or silver, or it won't be
        * merged properly.
        */
 static void
 start_info (object *op)
 {
   char buf[MAX_BUF];
-  sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
+  sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
   new_draw_info (NDI_UNIQUE, 0, op, buf);
-  //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
-  //new_draw_info (NDI_UNIQUE, 0, op, " ");
 }
 /* This function takes the key that is passed, and does the
  * appropriate action with it (change race, or other things).
  * The function name is for historical reasons - now we have
   if (op->move_type & MOVE_FLYING)
     return 1;
   next = op->below;
+  int cnt = MAX_ITEM_PER_DROP;
+#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
   /* loop while there are items on the floor that are not marked as
    * destroyed */
   while (next && !next->destroyed ())
     {
       tmp = next;
       next = tmp->below;
+      if (cnt <= 0)
+        {
+          op->failmsg ("Couldn't pickup all items at once.");
+          return 0;
+        }
       if (op->destroyed ())
         return 0;
       if (!can_pick (op, tmp))
         continue;
       if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
         {
           if (item_matched_string (op, tmp, op->contr->search_str))
-            pick_up (op, tmp);
+            CHK_PICK_PICKUP;
           continue;
         }
       /* high not bit set?  We're using the old autopickup model */
       if (!(op->contr->mode & PU_NEWMODE))
           switch (op->contr->mode)
             {
               case 0:
                 return 1;       /* don't pick up */
               case 1:
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 return 1;
               case 2:
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 return 0;
               case 3:
                 return 0;       /* stop before pickup */
               case 4:
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 break;
               case 5:
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 stop = 1;
                 break;
               case 6:
-                if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
+                if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
-                  pick_up (op, tmp);
+                    && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
+                  CHK_PICK_PICKUP;
                 break;
               case 7:
                 if (tmp->type == MONEY || tmp->type == GEM)
-                  pick_up (op, tmp);
+                  CHK_PICK_PICKUP;
                 break;
               default:
                 /* use value density */
                 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
                     && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
-                  pick_up (op, tmp);
+                  CHK_PICK_PICKUP;
             }
         }
       else
         {                       /* old model */
           /* NEW pickup handling */
           /* all food and drink if desired */
           /* question: don't pick up known-poisonous stuff? */
           if (op->contr->mode & PU_FOOD)
             if (tmp->type == FOOD)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_DRINK)
             if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_POTION)
             if (tmp->type == POTION)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* spellbooks, skillscrolls and normal books/scrolls */
           if (op->contr->mode & PU_SPELLBOOK)
             if (tmp->type == SPELLBOOK)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_SKILLSCROLL)
             if (tmp->type == SKILLSCROLL)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_READABLES)
             if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* wands/staves/rods/horns */
           if (op->contr->mode & PU_MAGIC_DEVICE)
             if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* pick up all magical items */
           if (op->contr->mode & PU_MAGICAL)
             if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_VALUABLES)
             {
               if (tmp->type == MONEY || tmp->type == GEM)
                 {
-                  pick_up (op, tmp);
+                  CHK_PICK_PICKUP;
                   continue;
                 }
             }
           /* rings & amulets - talismans seems to be typed AMULET */
           if (op->contr->mode & PU_JEWELS)
             if (tmp->type == RING || tmp->type == AMULET)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* we don't forget dragon food */
           if (op->contr->mode & PU_FLESH)
             if (tmp->type == FLESH)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* bows and arrows. Bows are good for selling! */
           if (op->contr->mode & PU_BOW)
             if (tmp->type == BOW)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_ARROW)
             if (tmp->type == ARROW)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* all kinds of armor etc. */
           if (op->contr->mode & PU_ARMOUR)
             if (tmp->type == ARMOUR)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_HELMET)
             if (tmp->type == HELMET)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_SHIELD)
             if (tmp->type == SHIELD)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_BOOTS)
             if (tmp->type == BOOTS)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_GLOVES)
             if (tmp->type == GLOVES)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           if (op->contr->mode & PU_CLOAK)
             if (tmp->type == CLOAK)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* hoping to catch throwing daggers here */
           if (op->contr->mode & PU_MISSILEWEAPON)
             if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* careful: chairs and tables are weapons! */
           if (op->contr->mode & PU_ALLWEAPON)
               if (tmp->type == WEAPON && tmp->name != NULL)
                 {
                   if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
                       strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
                     {
-                      pick_up (op, tmp);
+                      CHK_PICK_PICKUP;
                       continue;
                     }
                 }
               if (tmp->type == WEAPON && tmp->name == NULL)
                 {
                   if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
                     {
-                      pick_up (op, tmp);
+                      CHK_PICK_PICKUP;
                       continue;
                     }
                 }
             }
           /* misc stuff that's useful */
           if (op->contr->mode & PU_KEY)
             if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
               {
-                pick_up (op, tmp);
+                CHK_PICK_PICKUP;
                 continue;
               }
           /* any of the last 4 bits set means we use the ratio for value
            * pickups */
               /* >=7 is the old standard setting.  Now we take the last 4 bits
                * and multiply them by 5, giving 0..15*5== 5..75 */
               wvratio = (op->contr->mode & PU_RATIO) * 5;
               if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
                 {
-                  pick_up (op, tmp);
+                  CHK_PICK_PICKUP;
 #if 0
                   fprintf (stderr, "HIGH WEIGHT/VALUE [");
                   if (tmp->name != NULL)
                     {
                       fprintf (stderr, "%s", tmp->name);
  *  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
 bool
 move_player (object *op, int dir)
 {
   int pick;
-  if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
+  if (!op->map || op->map->in_memory != MAP_ACTIVE)
     return 0;
   /* Sanity check: make sure dir is valid */
   if ((dir < 0) || (dir >= 9))
     {

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC vs. Revision 1.181 by root, Tue Apr 15 14:21:04 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC vs.
Revision 1.181 by root, Tue Apr 15 14:21:04 2008 UTC