From 28f6c800df6bc63658b9c79e803bf81ac282aa1d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sun, 8 Nov 2009 14:23:03 +0100 Subject: Split map knowledge and FPROPs. map_cell no longer has the field "properties", which has been replaced by the unsigned long array env.pgrid. env.map has been renamed to env.map_knowledge. It should really be moved into player. --- crawl-ref/source/acr.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/acr.cc') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index be571cd77d..3ff8fe146c 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -64,7 +64,8 @@ #include "directn.h" #include "dungeon.h" #include "effects.h" -#include "envmap.h" +#include "map_knowledge.h" +#include "fprop.h" #include "fight.h" #include "files.h" #include "food.h" @@ -3318,7 +3319,7 @@ static void _open_door(coord_def move, bool check_confused) // door! if (is_terrain_seen(dc)) { - set_envmap_obj(dc, DNGN_OPEN_DOOR); + set_map_knowledge_obj(dc, DNGN_OPEN_DOOR); #ifdef USE_TILE env.tile_bk_bg(dc) = TILE_DNGN_OPEN_DOOR; #endif @@ -3478,7 +3479,7 @@ static void _close_door(coord_def move) // want the entire door to be updated. if (is_terrain_seen(dc)) { - set_envmap_obj(dc, DNGN_CLOSED_DOOR); + set_map_knowledge_obj(dc, DNGN_CLOSED_DOOR); #ifdef USE_TILE env.tile_bk_bg(dc) = TILE_DNGN_CLOSED_DOOR; #endif @@ -3549,7 +3550,7 @@ static bool _initialise(void) igrd.init(NON_ITEM); mgrd.init(NON_MONSTER); - env.map.init(map_cell()); + env.map_knowledge.init(map_cell()); you.unique_creatures.init(false); you.unique_items.init(UNIQ_NOT_EXISTS); -- cgit v1.2.3-54-g00ecf