diff -i smaug14/src/track.c smaug18/src/track.c
8c8
<  * Tricops and Fireblade                                      |             *
---
>  * Tricops, Fireblade, Edmond, Conran                         |             *
23c23
< #define BFS_MARK    536870912
---
> #define BFS_MARK    ROOM_TRACK
45,47c45,47
< #define MARK(room)    (SET_BIT(       (room)->room_flags, BFS_MARK) )
< #define UNMARK(room)  (REMOVE_BIT(    (room)->room_flags, BFS_MARK) )
< #define IS_MARKED(room)       (IS_SET(        (room)->room_flags, BFS_MARK) )
---
> #define MARK(room)    (xSET_BIT(      (room)->room_flags, BFS_MARK) )
> #define UNMARK(room)  (xREMOVE_BIT(   (room)->room_flags, BFS_MARK) )
> #define IS_MARKED(room)       (xIS_SET(       (room)->room_flags, BFS_MARK) )
291c291
<       if ( IS_SET( ch->in_room->room_flags, ROOM_SAFE ) )
---
>       if ( xIS_SET( ch->in_room->room_flags, ROOM_SAFE ) )