diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-08 14:23:03 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-08 14:46:22 +0100 |
| commit | 28f6c800df6bc63658b9c79e803bf81ac282aa1d (patch) | |
| tree | df593b87768f0324939f89ed6f4d7aea8c950de4 /crawl-ref/source/beam.cc | |
| parent | a4eda3c37bb9ec6d9b847e827390a66062229b99 (diff) | |
| download | crawl-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/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 3218c0ba30..916e47176a 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -33,7 +33,8 @@ #include "dgnevent.h" #include "effects.h" #include "enum.h" -#include "envmap.h" +#include "map_knowledge.h" +#include "fprop.h" #include "fight.h" #include "item_use.h" #include "it_use2.h" @@ -1721,7 +1722,7 @@ void bolt::digging_wall_effect() // Blood does not transfer onto floor. if (is_bloodcovered(pos())) - env.map(pos()).property &= ~(FPROP_BLOODY); + env.pgrid(pos()) &= ~(FPROP_BLOODY); if (!msg_generated) { @@ -1814,7 +1815,7 @@ void bolt::nuke_wall_effect() { // Blood does not transfer onto floor. if (is_bloodcovered(pos())) - env.map(pos()).property &= ~(FPROP_BLOODY); + env.pgrid(pos()) &= ~(FPROP_BLOODY); grd(pos()) = DNGN_FLOOR; if (player_can_hear(pos())) @@ -1829,7 +1830,7 @@ void bolt::nuke_wall_effect() // Blood does not transfer onto floor. if (is_bloodcovered(pos())) - env.map(pos()).property &= ~(FPROP_BLOODY); + env.pgrid(pos()) &= ~(FPROP_BLOODY); if (player_can_hear(pos())) { |