summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acr.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-08 14:23:03 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-08 14:46:22 +0100
commit28f6c800df6bc63658b9c79e803bf81ac282aa1d (patch)
treedf593b87768f0324939f89ed6f4d7aea8c950de4 /crawl-ref/source/acr.cc
parenta4eda3c37bb9ec6d9b847e827390a66062229b99 (diff)
downloadcrawl-ref-28f6c800df6bc63658b9c79e803bf81ac282aa1d.tar.gz
crawl-ref-28f6c800df6bc63658b9c79e803bf81ac282aa1d.zip
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.
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r--crawl-ref/source/acr.cc9
1 files changed, 5 insertions, 4 deletions
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);