--- deliantra/server/include/map.h 2006/09/16 22:06:17 1.20 +++ deliantra/server/include/map.h 2006/09/16 22:24:12 1.21 @@ -22,7 +22,7 @@ */ /* - * The mapstruct is allocated each time a new map is opened. + * The maptile is allocated each time a new map is opened. * It contains pointers (very indirectly) to all objects on the map. */ @@ -276,10 +276,10 @@ * (or even through the macros), but doing so will completely * break map tiling. */ -ACC_CLASS (mapstruct) -struct mapstruct:zero_initialised, attachable < mapstruct > +ACC_CLASS (maptile) +struct maptile : zero_initialised, attachable { - struct mapstruct *ACC (RW, next); /* Next map, linked list */ + maptile *ACC (RW, next); /* Next map, linked list */ char *ACC (RO, tmpname); /* Name of temporary file */ char *ACC (RO, name); /* Name of map as given by its creator */ struct region *ACC (RW, region); /* What jurisdiction in the game world this map is ruled by @@ -325,7 +325,7 @@ char *ACC (RO, msg); /* Message map creator may have left */ char *ACC (RO, maplore); /* Map lore information */ char *tile_path[4]; /* path to adjoining maps */ - struct mapstruct *tile_map[4]; /* Next map, linked list */ + maptile *tile_map[4]; /* Next map, linked list */ char ACC (RW, path)[HUGE_BUF]; /* Filename of the map */ };