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

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.50 by elmex, Thu Apr 24 11:26:41 2008 UTC vs.
Revision 1.58 by root, Tue Dec 16 23:25:25 2008 UTC

     {
       if (tmp->arch != NULL)
         {
           if (flag == F_BUY)
             {
-              LOG (llevError, "Asking for buy-value of unidentified object.\n");
+              LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object.\n");
               val = tmp->arch->value * 50 * number;
             }
           else
             {                   /* Trying to sell something, or get true value */
               if (tmp->type == POTION)
       else
         {                       /* No archetype with this object */
           LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
           if (flag == F_BUY)
             {
-              LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
+              LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object without arch.\n");
               val = number * tmp->value * 10;
             }
           else
             val = number * tmp->value / 5;
         }
    * AND Cha = 30 will get optimal price.
    * Thus charisma will never get useless.
    * -b.e. edler@heydernet.de
    */
-  if (who != NULL && who->type == PLAYER)
+  if (who && who->type == PLAYER)
     {
       int lev_bargain = 0;
       int lev_identify = 0;
-      int idskill1 = 0;
-      int idskill2 = 0;
-      const typedata *tmptype;
-      tmptype = get_typedata (tmp->type);
       if (find_skill_by_number (who, SK_BARGAINING))
         lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
-      if (tmptype)
+      if (const typedata *tmptype = get_typedata (tmp->type))
         {
-          idskill1 = tmptype->identifyskill;
+          if (int idskill1 = tmptype->identifyskill)
-          if (idskill1)
             {
-              idskill2 = tmptype->identifyskill2;
+              int idskill2 = tmptype->identifyskill2;
               if (find_skill_by_number (who, idskill1))
                 lev_identify = find_skill_by_number (who, idskill1)->level;
               if (idskill2 && find_skill_by_number (who, idskill2))
                 lev_identify += find_skill_by_number (who, idskill2)->level;
             }
         }
-      else
-        LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
       /* ratio determines how much of the price modification
        * will come from the basic stat charisma
        * the rest will come from the level in bargaining skill
        */
                   if (coin == NULL)
                     return "nothing";
                   num = real_value / coin->value;
                   if (num == 1)
                     sprintf (buf, "about one %s", &coin->object::name);
                   else if (num < 5)
                     sprintf (buf, "a few %s", &coin->object::name_pl);
                   else if (num < 10)
                     sprintf (buf, "lots of %s", &coin->object::name_pl);
                   else if (num < 1000)
                     sprintf (buf, "a great many %s", &coin->object::name_pl);
                   else
                     sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
                   return buf;
                 }
             }
         }
           count--;
         }
     }
   for (i = 0; i < NUM_COINS; i++)
-    {
-      if (coin_objs[i]->nrof)
+    if (coin_objs[i]->nrof)
-        insert_ob_in_ob (coin_objs [i], pouch);
+      insert_ob_in_ob (coin_objs [i], pouch);
-      else
+    else
-        coin_objs[i]->destroy ();
+      coin_objs[i]->destroy ();
-    }
 }
 /* Checks all unpaid items in op's inventory, adds up all the money they
  * have, and checks that they can actually afford what they want to buy.
  * Returns 1 if they can, and 0 if they can't. also prints an appropriate message
         unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
       }
   if (unpaid_price > player_wealth)
     {
-      char buf[MAX_BUF];
+      dynbuf_text buf;
-      char cost[MAX_BUF];
-      char missing[MAX_BUF];
-      snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0));
+      buf << "You have " << unpaid_count
-      snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0));
+          << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
+          << ". You need another "                  << cost_string_from_value (unpaid_price - player_wealth, 0)
+          << " to be able to afford that. "
+             "H<You cannot leave a shop with items you cannot pay - drop those unpaid items first.>";
-      snprintf (buf, MAX_BUF, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.",
+      pl->failmsg (buf);
-                unpaid_count, cost, missing);
-      new_draw_info (NDI_UNIQUE, 0, pl, buf);
       return 0;
     }
   else
     return 1;
 /* elmex: this is for the bank plugin :( */
 sint64
 pay_player_arch (object *pl, const char *arch, sint64 amount)
 {
-  archetype *at = archetype::find (arch);
-  if (!at)
-    return 0;
-  if (amount > 0)
+  if (amount)
     {
-      object *tmp = arch_to_object (at);
+      object *ob = archetype::get (arch);
+      if (!ob)
+        return 0;
-      tmp->nrof = amount;
+      ob->nrof = amount;
-      insert_ob_in_ob (tmp, pl);
+      pl->insert (ob);
     }
   return 1;
 }
 {
   shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
   if (s1->type < s2->type)
     return -1;
   if (s1->type > s2->type)
     return 1;
   /* the type is the same (what atoi gets), so do a strcasecmp to sort
    * via alphabetical order
 void
 shop_listing (object *sign, object *op)
 {
   int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2;
-  const char *shop_coords = get_ob_key_value (sign, "shop_coords");
+  const char *shop_coords = sign->kv (shstr_shop_coords);
   object *stack;
   shopinv *items;
   /* Should never happen, but just in case a monster does apply a sign */
   if (op->type != PLAYER)
 /* elmex: this function checks whether the object is in a shop */
 bool
 is_in_shop (object *o)
 {
-  if (!o->map)
+  if (!o->is_on_map ())
     return false;
   return is_in_shop (o->map, o->x, o->y);
 }
 is_in_shop (maptile *map, int x, int y)
 {
   for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
     if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
       return floor->type == SHOP_FLOOR;
   return false;
 }

Diff Legend

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

Comparing deliantra/server/server/shop.C (file contents): Revision 1.50 by elmex, Thu Apr 24 11:26:41 2008 UTC vs. Revision 1.58 by root, Tue Dec 16 23:25:25 2008 UTC

Diff Legend

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.50 by elmex, Thu Apr 24 11:26:41 2008 UTC vs.
Revision 1.58 by root, Tue Dec 16 23:25:25 2008 UTC