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

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.23 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.25 by root, Wed Dec 20 09:14:22 2006 UTC

 #include <global.h>
 #include <spells.h>
 #include <skills.h>
 #include <living.h>
-#include <newclient.h>
-#ifndef __CEXTRACT__
-# include <sproto.h>
+#include <sproto.h>
-#endif
 #include <math.h>
 /* this is a measure of how effective store specialisation is. A general store
  * will offer this proportion of the 'maximum' price, a specialised store will
  * offer a range of prices around it such that the maximum price is always one
           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);
+              stack = GET_MAP_OB (op->map, i, j);
               while (stack)
                 {
                   if (QUERY_FLAG (stack, FLAG_UNPAID))
                     {
 /* elmex: this function checks whether we are in a shop or not */
 bool
 is_in_shop (maptile *map, int x, int y)
 {
-  for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above)
+  for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
     if (floor->type == SHOP_FLOOR)
       return true;
   return false;
 }

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