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

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.32 by root, Thu Feb 8 13:41:44 2007 UTC vs.
Revision 1.36 by root, Thu May 17 14:14:55 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
        * the rest will come from the level in bargaining skill
        */
       const double cha_ratio = 0.40;
       diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25);
       diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.);
       diff = .02 + (.80 - .02) * diff;
       if (flag == F_BUY)
-        val += (val * diff);
+        val += val * diff;
       else if (flag == F_SELL)
-        val -= (val * diff);
+        val -= val * diff;
       // now find a price range. the less good we can judge, the larger the range is
       // then the range is adjusted randomly around the correct value
       if (approximate)
         approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
     }
   /* I don't think this should really happen - if it does, it indicates and
-   * overflow of diff above.  That shoudl only happen if
+   * overflow of diff above.  That should only happen if
    * we are selling objects - in that case, the person just
    * gets no money.
    */
   if ((sint64) val < 0)
     val = 0;
           if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD))
             val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
           else
             val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
         }
       /* we will also have an extra 0-5% variation between shops of the same type
        * for valuable items (below a value of 50 this effect wouldn't be very
        * pointful, and could give fun with rounding.
        */
+      //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
       if (val > 50)
         val += float (val) * .05f * cosf ((tmp->uuid.seq & 0xffff) * float (M_PI * 2. / 0x10000));
     }
   return (sint64) val;
   for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
     if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
       pay_from_container (pl, pouch, to_pay);
-  if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
-    SET_FLAG (op, FLAG_WAS_WIZ);
   pl->update_stats ();
   return 1;
 }
 /* This pays for the item, and takes the proper amount of money off
  * the player.
     }
   SET_FLAG (tmp, FLAG_UNPAID);
 }
 void
-shop_listing (object *op)
+shop_listing (object *sign, object *op)
 {
-  int i, j, numitems = 0, numallocated = 0, nx, ny;
+  int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2;
-  char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
+  const char *shop_coords = get_ob_key_value (sign, "shop_coords");
   object *stack;
   shopinv *items;
   /* Should never happen, but just in case a monster does apply a sign */
   if (op->type != PLAYER)
     return;
-  new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
+  if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
+    {
+      x1 = 0;
+      y1 = 0;
+      x2 = op->map->width  - 1;
+      y2 = op->map->height - 1;
+    }
-  magic_mapping_mark (op, map_mark, 3);
   items = (shopinv *) malloc (40 * sizeof (shopinv));
   numallocated = 40;
   /* Find all the appropriate items */
-  for (i = 0; i < op->map->width; i++)
+  for (i = x1; i <= x2; i++)
     {
-      for (j = 0; j < op->map->height; j++)
+      for (j = y1; j < y2; j++)
         {
-          // magic map code now centers the map on the object at MAGIC_MAP_HALF.
+          if (is_in_shop (op->map, i, j))
-          nx = i - op->x + MAGIC_MAP_HALF;
-          ny = j - op->y + MAGIC_MAP_HALF;
-          /* unlikely, but really big shops could run into this issue */
-          if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE)
-            continue;
-          if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR)
             {
               stack = GET_MAP_OB (op->map, i, j);
               while (stack)
                 {
                 }
             }
         }
     }
-  free (map_mark);
   if (numitems == 0)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
       free (items);
       return;
     }
   qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
+  new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
   for (i = 0; i < numitems; i++)
     {
       /* Collapse items of the same name together */
       if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))

Diff Legend

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

Comparing deliantra/server/server/shop.C (file contents): Revision 1.32 by root, Thu Feb 8 13:41:44 2007 UTC vs. Revision 1.36 by root, Thu May 17 14:14:55 2007 UTC

Diff Legend

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.32 by root, Thu Feb 8 13:41:44 2007 UTC vs.
Revision 1.36 by root, Thu May 17 14:14:55 2007 UTC