--- deliantra/server/include/map.h 2008/12/27 02:31:19 1.105 +++ deliantra/server/include/map.h 2008/12/27 08:41:44 1.107 @@ -124,7 +124,8 @@ object *ACC (RW, bot); object *ACC (RW, top); /* lowest/highest object on this space */ object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ - tick_t smell; // the last ptick a player was seen here, or 0 + uint32_t smell; // the last count a player was seen here, or 0 + static uint32_t smellcount; // global smell counter uint8 flags_; /* flags about this space (see the P_ values above) */ sint8 ACC (RW, light); /* How much light this space provides */ MoveType ACC (RW, move_block); /* What movement types this space blocks */ @@ -504,9 +505,7 @@ { \ nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ \ - if (xy_normalise (m, nx, ny)) \ - m->touch (); \ - else \ + if (!xy_normalise (m, nx, ny)) \ m = 0; \ }