--- deliantra/server/random_maps/treasure.C 2006/12/12 21:39:56 1.9 +++ deliantra/server/random_maps/treasure.C 2006/12/20 09:14:22 1.10 @@ -314,7 +314,7 @@ /* don't bother searching this square unless the map says life exists. */ if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE) { - object *the_monster = get_map_ob (map, lx, ly); + object *the_monster = GET_MAP_OB (map, lx, ly); for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_MONSTER)); the_monster = the_monster->above); if (the_monster && QUERY_FLAG (the_monster, FLAG_MONSTER)) @@ -455,7 +455,7 @@ layout[x][y] = 1; if (GET_MAP_FLAGS (map, x, y) & P_IS_ALIVE) { - object *the_monster = get_map_ob (map, x, y); + object *the_monster = GET_MAP_OB (map, x, y); /* check off this point */ for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_ALIVE)); the_monster = the_monster->above); @@ -675,14 +675,14 @@ { object *tmp; - for (tmp = get_map_ob (map, x, y); tmp != NULL; tmp = tmp->above) + for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) if (QUERY_FLAG (tmp, FLAG_ALIVE)) { if (tmp->head) tmp = tmp->head; tmp->remove (); tmp->destroy (); - tmp = get_map_ob (map, x, y); + tmp = GET_MAP_OB (map, x, y); if (tmp == NULL) break; }; @@ -741,7 +741,7 @@ { object *tmp; - for (tmp = get_map_ob (map, x, y); tmp != NULL; tmp = tmp->above) + for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) return tmp; return NULL;