diff options
32 files changed, 3 insertions, 44 deletions
diff --git a/crawl-ref/source/Makefile.obj b/crawl-ref/source/Makefile.obj index c6f5d69305..b04b4dca92 100644 --- a/crawl-ref/source/Makefile.obj +++ b/crawl-ref/source/Makefile.obj @@ -126,7 +126,6 @@ melee_attack.o \ menu.o \ message-stream.o \ message.o \ -mgen_data.o \ misc.o \ mislead.o \ mon-abil.o \ diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 9cd692b7c1..7d41971b6f 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -17,7 +17,6 @@ #include "cellular.h" #include "cloud.h" #include "colour.h" -#include "coord.h" #include "coordit.h" #include "dungeon.h" #include "env.h" diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index b8e2e3b3e1..e2315a630c 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -10,7 +10,6 @@ #include "cio.h" #include "colour.h" #include "command.h" -#include "coord.h" #include "dungeon.h" #include "env.h" #include "externs.h" diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h index 0fbbddd398..87716b0b26 100644 --- a/crawl-ref/source/art-func.h +++ b/crawl-ref/source/art-func.h @@ -25,7 +25,6 @@ #include "env.h" // For storm bow env.cgrid #include "food.h" // For evokes #include "godconduct.h" // did_god_conduct -#include "coord.h" #include "misc.h" #include "mgen_data.h" // For Sceptre of Asmodeus evoke #include "mon-info.h" diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 59f6c3ac0d..143b90040e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -24,7 +24,6 @@ #include "cio.h" #include "cloud.h" #include "colour.h" -#include "coord.h" #include "coordit.h" #include "delay.h" #include "dungeon.h" diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 3bda90b962..8271c85c65 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -39,7 +39,6 @@ #include "mon-project.h" #include "mon-util.h" #include "mgen_data.h" -#include "coord.h" #include "mon-stuff.h" #include "mutation.h" #include "options.h" diff --git a/crawl-ref/source/dgn-labyrinth.cc b/crawl-ref/source/dgn-labyrinth.cc index 97e364c2f2..e0ba995616 100644 --- a/crawl-ref/source/dgn-labyrinth.cc +++ b/crawl-ref/source/dgn-labyrinth.cc @@ -5,7 +5,6 @@ #include "AppHdr.h" -#include "coord.h" #include "coordit.h" #include "dungeon.h" #include "items.h" diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index 1cf683b46a..8b621838e9 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -3,7 +3,6 @@ #include "branch.h" #include "cio.h" #include "colour.h" -#include "coord.h" #include "coordit.h" #include "dungeon.h" #include "dgn-shoals.h" diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 6a37935322..718ddaaa36 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -20,7 +20,6 @@ #include "artefact.h" #include "branch.h" #include "chardump.h" -#include "coord.h" #include "coordit.h" #include "defines.h" #include "dgn-shoals.h" diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index eb6e2bb163..032e01fc9d 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -24,7 +24,6 @@ #include "beam.h" #include "cloud.h" #include "colour.h" -#include "coord.h" #include "coordit.h" #include "database.h" #include "delay.h" diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index d92cba31d3..b5c68d8ddd 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -28,7 +28,6 @@ #include "mon-place.h" #include "terrain.h" #include "mgen_data.h" -#include "coord.h" #include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index 7822187345..2eb2165af7 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -13,7 +13,6 @@ #include "beam.h" #include "cloud.h" #include "colour.h" -#include "coord.h" #include "coordit.h" #include "database.h" #include "delay.h" diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc index 66e5eb9e09..ab9b2b1539 100644 --- a/crawl-ref/source/godwrath.cc +++ b/crawl-ref/source/godwrath.cc @@ -26,7 +26,6 @@ #include "mon-place.h" #include "terrain.h" #include "mgen_data.h" -#include "coord.h" #include "makeitem.h" #include "mon-stuff.h" #include "mutation.h" diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 22475eca45..6cdedacca7 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -24,7 +24,6 @@ #include "cloud.h" #include "colour.h" #include "command.h" -#include "coord.h" #include "coordit.h" #include "debug.h" #include "decks.h" diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index 5cfc1ae468..5e38bec5fe 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -51,7 +51,6 @@ #include "mon-place.h" #include "terrain.h" #include "mgen_data.h" -#include "coord.h" #include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" diff --git a/crawl-ref/source/mgen_data.cc b/crawl-ref/source/mgen_data.cc deleted file mode 100644 index 757ae7185f..0000000000 --- a/crawl-ref/source/mgen_data.cc +++ /dev/null @@ -1,12 +0,0 @@ -#include "AppHdr.h" - -#include "mgen_data.h" - -#include "coord.h" - -const std::string TUKIMA_WEAPON = "tukima-weapon"; - -bool mgen_data::use_position() const -{ - return (in_bounds(pos)); -} diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h index f101c37589..dc783163c0 100644 --- a/crawl-ref/source/mgen_data.h +++ b/crawl-ref/source/mgen_data.h @@ -1,12 +1,13 @@ #ifndef MGEN_DATA_H #define MGEN_DATA_H +#include "coord.h" #include "mgen_enum.h" #include "player.h" // Hash key for passing a weapon to be given to // a dancing weapon. -extern const std::string TUKIMA_WEAPON; +#define TUKIMA_WEAPON "tukima-weapon" // A structure with all the data needed to whip up a new monster. struct mgen_data @@ -158,7 +159,7 @@ struct mgen_data // Is there a valid position set on this struct that we want to use // when placing the monster? - bool use_position() const; + bool use_position() const { return in_bounds(pos); }; bool summoned() const { return (abjuration_duration > 0); } diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index fe044975b8..53f9588e2c 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -27,7 +27,6 @@ #include "areas.h" #include "clua.h" #include "cloud.h" -#include "coord.h" #include "coordit.h" #include "database.h" #include "delay.h" diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 39f2d855da..d65d472a79 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -24,7 +24,6 @@ #include "mon-place.h" #include "terrain.h" #include "mgen_data.h" -#include "coord.h" #include "cloud.h" #include "mon-speak.h" #include "mon-stuff.h" diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index ff91c7e13d..252a4f2e59 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -42,7 +42,6 @@ #include "mon-place.h" #include "mon-project.h" #include "mgen_data.h" -#include "coord.h" #include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index b15308ef3f..84b9b5453e 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -32,7 +32,6 @@ #include "terrain.h" #include "mislead.h" #include "mgen_data.h" -#include "coord.h" #include "mon-gear.h" #include "mon-speak.h" #include "mon-stuff.h" diff --git a/crawl-ref/source/mon-clone.cc b/crawl-ref/source/mon-clone.cc index babba49262..b1231bc348 100644 --- a/crawl-ref/source/mon-clone.cc +++ b/crawl-ref/source/mon-clone.cc @@ -7,7 +7,6 @@ #include "arena.h" #include "artefact.h" -#include "coord.h" #include "directn.h" #include "externs.h" #include "env.h" diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc index 402417ba27..fba1c20745 100644 --- a/crawl-ref/source/mon-place.cc +++ b/crawl-ref/source/mon-place.cc @@ -15,7 +15,6 @@ #include "branch.h" #include "cloud.h" #include "colour.h" -#include "coord.h" #include "coordit.h" #include "directn.h" #include "dungeon.h" diff --git a/crawl-ref/source/mon-project.cc b/crawl-ref/source/mon-project.cc index ebeeea9084..1eafbdac42 100644 --- a/crawl-ref/source/mon-project.cc +++ b/crawl-ref/source/mon-project.cc @@ -16,7 +16,6 @@ #include "cloud.h" #include "directn.h" -#include "coord.h" #include "env.h" #include "itemprop.h" #include "mgen_data.h" diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index 1094329822..030ecb91ad 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -12,7 +12,6 @@ #include "attitude-change.h" #include "cloud.h" #include "cluautil.h" -#include "coord.h" #include "coordit.h" #include "database.h" #include "delay.h" diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 5b86673a46..e4e8a2ddad 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -38,7 +38,6 @@ #include "mon-death.h" #include "mon-iter.h" #include "mon-place.h" -#include "coord.h" #include "mon-stuff.h" #include "notes.h" #include "options.h" diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 985d56d8f1..3f341429a9 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -9,7 +9,6 @@ #include "artefact.h" #include "beam.h" #include "cloud.h" -#include "coord.h" #include "coordit.h" #include "database.h" #include "delay.h" diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index d3c4737d4e..eb68640bc9 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -21,7 +21,6 @@ #include "delay.h" #include "defines.h" #include "dactions.h" -#include "coord.h" #include "effects.h" #include "env.h" #include "format.h" diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 3daa252392..5558ba35b2 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -27,7 +27,6 @@ #include "artefact.h" #include "beam.h" #include "chardump.h" -#include "coord.h" #include "delay.h" #include "dgnevent.h" #include "effects.h" diff --git a/crawl-ref/source/spl-summoning.cc b/crawl-ref/source/spl-summoning.cc index 8914f0eddd..07b1f03acf 100644 --- a/crawl-ref/source/spl-summoning.cc +++ b/crawl-ref/source/spl-summoning.cc @@ -10,7 +10,6 @@ #include "areas.h" #include "artefact.h" #include "cloud.h" -#include "coord.h" #include "coordit.h" #include "database.h" #include "delay.h" diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc index 6ea7e95368..24d02e4ace 100644 --- a/crawl-ref/source/wiz-mon.cc +++ b/crawl-ref/source/wiz-mon.cc @@ -12,7 +12,6 @@ #include "artefact.h" #include "cio.h" #include "colour.h" -#include "coord.h" #include "dbg-util.h" #include "delay.h" #include "dungeon.h" diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 6c0b138897..43e734584f 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -14,7 +14,6 @@ #include "artefact.h" #include "beam.h" #include "branch.h" -#include "coord.h" #include "coordit.h" #include "database.h" #ifdef WIZARD |