From dba0e928767de98d65d7070e933d790e485cf3e7 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 10 Nov 2009 13:55:08 +0100 Subject: Remove a few obsolete includes. Also add a few previously indirect includes. --- crawl-ref/source/abl-show.cc | 3 --- crawl-ref/source/abyss.cc | 1 - crawl-ref/source/arena.cc | 1 - crawl-ref/source/behold.cc | 1 - crawl-ref/source/chardump.cc | 1 - crawl-ref/source/cloud.cc | 2 -- crawl-ref/source/command.cc | 2 -- crawl-ref/source/coordit.cc | 1 - crawl-ref/source/dbg-maps.cc | 2 -- crawl-ref/source/decks.cc | 2 -- crawl-ref/source/delay.cc | 2 -- crawl-ref/source/describe.cc | 2 -- crawl-ref/source/directn.cc | 2 -- crawl-ref/source/dungeon.cc | 3 --- crawl-ref/source/exclude.cc | 2 -- crawl-ref/source/fight.cc | 1 - crawl-ref/source/files.cc | 1 - crawl-ref/source/format.cc | 1 - crawl-ref/source/godabil.cc | 1 - crawl-ref/source/godwrath.cc | 4 ++-- crawl-ref/source/hiscores.cc | 1 - crawl-ref/source/initfile.cc | 1 - crawl-ref/source/invent.cc | 1 - crawl-ref/source/it_use3.cc | 1 - crawl-ref/source/item_use.cc | 1 - crawl-ref/source/itemname.cc | 2 -- crawl-ref/source/itemprop.cc | 1 - crawl-ref/source/items.cc | 1 - crawl-ref/source/l_crawl.cc | 1 - crawl-ref/source/l_dgn.cc | 2 -- crawl-ref/source/l_item.cc | 1 - crawl-ref/source/l_los.cc | 1 - crawl-ref/source/l_view.cc | 2 +- crawl-ref/source/l_you.cc | 1 + crawl-ref/source/libgui.cc | 2 -- crawl-ref/source/libunix.cc | 1 - crawl-ref/source/libw32c.cc | 1 - crawl-ref/source/losparam.cc | 1 - crawl-ref/source/makeitem.cc | 1 - crawl-ref/source/map_knowledge.cc | 2 -- crawl-ref/source/menu.cc | 1 - crawl-ref/source/misc.cc | 2 -- crawl-ref/source/mon-abil.cc | 1 - crawl-ref/source/mon-behv.cc | 1 - crawl-ref/source/mon-cast.cc | 1 - crawl-ref/source/mon-util.cc | 2 -- crawl-ref/source/monplace.cc | 2 -- crawl-ref/source/monspeak.cc | 1 - crawl-ref/source/monster.cc | 1 - crawl-ref/source/monstuff.cc | 1 - crawl-ref/source/mutation.cc | 1 - crawl-ref/source/newgame.cc | 1 - crawl-ref/source/output.cc | 3 --- crawl-ref/source/overmap.cc | 3 --- crawl-ref/source/player.cc | 3 --- crawl-ref/source/religion.cc | 7 ------- crawl-ref/source/show.cc | 4 ---- crawl-ref/source/showsymb.cc | 1 - crawl-ref/source/spells2.cc | 5 ----- crawl-ref/source/spells3.cc | 1 - crawl-ref/source/spl-cast.cc | 2 -- crawl-ref/source/spl-util.cc | 3 +-- crawl-ref/source/stash.cc | 1 - crawl-ref/source/state.cc | 1 - crawl-ref/source/stuff.cc | 2 -- crawl-ref/source/tags.cc | 2 -- crawl-ref/source/teleport.cc | 2 -- crawl-ref/source/terrain.cc | 1 - crawl-ref/source/tilepick.cc | 1 - crawl-ref/source/tilereg.cc | 4 ---- crawl-ref/source/tilesdl.cc | 3 --- crawl-ref/source/traps.cc | 1 - crawl-ref/source/travel.cc | 3 --- crawl-ref/source/tutorial.cc | 2 -- crawl-ref/source/view.cc | 11 ----------- crawl-ref/source/wiz-dgn.cc | 1 - crawl-ref/source/wiz-item.cc | 2 -- crawl-ref/source/wiz-mon.cc | 2 -- crawl-ref/source/xom.cc | 2 -- 79 files changed, 5 insertions(+), 143 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 65fadfa10d..73dc7b730c 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -24,7 +24,6 @@ #include "abyss.h" #include "artefact.h" #include "beam.h" -#include "cloud.h" #include "database.h" #include "decks.h" #include "delay.h" @@ -38,7 +37,6 @@ #include "message.h" #include "menu.h" #include "misc.h" -#include "mon-util.h" #include "monplace.h" #include "mutation.h" #include "notes.h" @@ -57,7 +55,6 @@ #include "stuff.h" #include "transfor.h" #include "tutorial.h" -#include "shout.h" #ifdef UNIX #include "libunix.h" diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 4e025bba0d..cf3f74267d 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -39,7 +39,6 @@ #include "tiles.h" #include "traps.h" #include "view.h" -#include "shout.h" #include "xom.h" const coord_def abyss_center(45,35); diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index 8e4497b2cb..dcae744e65 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -30,7 +30,6 @@ #include "spl-util.h" #include "state.h" #include "view.h" -#include "shout.h" #include "viewgeom.h" #define DEBUG_DIAGNOSTICS 1 diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index d7dd225aa8..b4835e3090 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -17,7 +17,6 @@ #include "state.h" #include "stuff.h" #include "view.h" -#include "shout.h" // Add a monster to the list of beholders. void player::add_beholder(const monsters* mon) diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index 35e32f778b..fbbeb77e76 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -55,7 +55,6 @@ #include "stuff.h" #include "transfor.h" #include "view.h" -#include "shout.h" #include "viewchar.h" #include "xom.h" diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 768de70f57..fda354706a 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -16,7 +16,6 @@ #include "cloud.h" #include "colour.h" #include "coord.h" -#include "map_knowledge.h" #include "fprop.h" #include "mapmark.h" #include "ouch.h" @@ -25,7 +24,6 @@ #include "spells4.h" #include "stuff.h" #include "terrain.h" -#include "shout.h" #include "mutation.h" #include "los.h" diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 7ce3e38ea6..457a598224 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -27,7 +27,6 @@ #include "describe.h" #include "files.h" #include "ghost.h" -#include "initfile.h" #include "invent.h" #include "itemname.h" #include "items.h" @@ -52,7 +51,6 @@ #include "terrain.h" #include "transfor.h" #include "view.h" -#include "shout.h" #include "viewchar.h" static void _adjust_item(void); diff --git a/crawl-ref/source/coordit.cc b/crawl-ref/source/coordit.cc index c0c79414c0..3a759c2a61 100644 --- a/crawl-ref/source/coordit.cc +++ b/crawl-ref/source/coordit.cc @@ -8,7 +8,6 @@ #include "coordit.h" #include "coord.h" -#include "los.h" #include "player.h" rectangle_iterator::rectangle_iterator( const coord_def& corner1, diff --git a/crawl-ref/source/dbg-maps.cc b/crawl-ref/source/dbg-maps.cc index d5b22d0e98..9ec020e217 100644 --- a/crawl-ref/source/dbg-maps.cc +++ b/crawl-ref/source/dbg-maps.cc @@ -13,14 +13,12 @@ #include "coord.h" #include "dungeon.h" #include "map_knowledge.h" -#include "fprop.h" #include "initfile.h" #include "maps.h" #include "message.h" #include "place.h" #include "player.h" #include "view.h" -#include "shout.h" #ifdef DEBUG_DIAGNOSTICS // Map statistics generation. diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 70fe3ead25..e82ba90e70 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -27,7 +27,6 @@ #include "item_use.h" #include "itemprop.h" #include "items.h" -#include "los.h" #include "makeitem.h" #include "maps.h" #include "message.h" @@ -52,7 +51,6 @@ #include "transfor.h" #include "traps.h" #include "view.h" -#include "shout.h" #include "xom.h" // DECK STRUCTURE: deck.plus is the number of cards the deck *started* diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 85ab997616..0ef9aa6aca 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -22,7 +22,6 @@ #include "describe.h" #include "directn.h" #include "enum.h" -#include "map_knowledge.h" #include "fprop.h" #include "exclude.h" #include "food.h" @@ -52,7 +51,6 @@ #include "travel.h" #include "tutorial.h" #include "view.h" -#include "shout.h" #include "xom.h" extern std::vector items_for_multidrop; diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index f4a57bef67..933bd6886d 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -38,7 +38,6 @@ #include "itemprop.h" #include "items.h" #include "macro.h" -#include "mapmark.h" #include "menu.h" #include "message.h" #include "monstuff.h" @@ -50,7 +49,6 @@ #include "religion.h" #include "rng.h" #include "skills2.h" -#include "spells3.h" #include "spl-book.h" #include "stuff.h" #include "spl-cast.h" diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 5e6f1f8d42..839666be38 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -34,7 +34,6 @@ #include "dungeon.h" #include "map_knowledge.h" #include "fprop.h" -#include "initfile.h" #include "invent.h" #include "itemname.h" #include "items.h" @@ -65,7 +64,6 @@ #include "travel.h" #include "tutorial.h" #include "view.h" -#include "shout.h" #include "viewchar.h" #include "viewgeom.h" #include "wiz-mon.h" diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 454c4f5fb9..096700f6f2 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -31,11 +31,9 @@ #include "directn.h" #include "dungeon.h" #include "files.h" -#include "itemname.h" #include "itemprop.h" #include "items.h" #include "l_defs.h" -#include "los.h" #include "makeitem.h" #include "mapdef.h" #include "mapmark.h" @@ -56,7 +54,6 @@ #include "terrain.h" #include "traps.h" #include "travel.h" -#include "shout.h" #ifdef WIZARD #include "cio.h" // for cancelable_get_line() diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc index f83cf4c646..6ddbcd9c2b 100644 --- a/crawl-ref/source/exclude.cc +++ b/crawl-ref/source/exclude.cc @@ -9,7 +9,6 @@ #include "coord.h" #include "map_knowledge.h" -#include "fprop.h" #include "mon-util.h" #include "options.h" #include "overmap.h" @@ -19,7 +18,6 @@ #include "travel.h" #include "tutorial.h" #include "view.h" -#include "shout.h" static bool _mon_needs_auto_exclude(const monsters *mon, bool sleepy = false) { diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 2f52f2f30c..77e0813412 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -64,7 +64,6 @@ #include "tutorial.h" #include "view.h" #include "shout.h" -#include "viewgeom.h" #include "xom.h" #ifdef NOTE_DEBUG_CHAOS_BRAND diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 7b7ed06092..cd63e9cd15 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -79,7 +79,6 @@ #include "travel.h" #include "tutorial.h" #include "view.h" -#include "shout.h" #include "viewgeom.h" #ifdef TARGET_COMPILER_VC diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc index 725b34b492..224bfda38f 100644 --- a/crawl-ref/source/format.cc +++ b/crawl-ref/source/format.cc @@ -8,7 +8,6 @@ #include "colour.h" #include "format.h" #include "showsymb.h" -#include "shout.h" #include "viewchar.h" formatted_string::formatted_string(int init_colour) diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index 6201bd88b9..a7f4c77484 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -39,7 +39,6 @@ #include "stuff.h" #include "terrain.h" #include "view.h" -#include "shout.h" bool yred_injury_mirror(bool actual) { diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc index 357b35d42d..3243efd929 100644 --- a/crawl-ref/source/godwrath.cc +++ b/crawl-ref/source/godwrath.cc @@ -9,6 +9,7 @@ #include "externs.h" +#include "artefact.h" #include "attitude-change.h" #include "database.h" #include "decks.h" @@ -17,7 +18,6 @@ #include "food.h" #include "ghost.h" #include "godabil.h" -#include "goditem.h" #include "it_use2.h" #include "message.h" #include "misc.h" @@ -26,8 +26,8 @@ #include "monstuff.h" #include "mutation.h" #include "ouch.h" -#include "religion.h" #include "quiver.h" +#include "religion.h" #include "spells1.h" #include "spells2.h" #include "spells3.h" diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 1eccb34f23..73b19f57a8 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -39,7 +39,6 @@ #include "initfile.h" #include "itemname.h" #include "itemprop.h" -#include "items.h" #include "kills.h" #include "libutil.h" #include "message.h" diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index eda4e11858..41cc6dcca0 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -45,7 +45,6 @@ #include "travel.h" #include "items.h" #include "view.h" -#include "shout.h" #include "viewchar.h" // For finding the executable's path diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index f6848309a7..83c94fe9f9 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -37,7 +37,6 @@ #include "shopping.h" #include "showsymb.h" #include "stuff.h" -#include "shout.h" #include "menu.h" #include "mon-util.h" #include "state.h" diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 4e66d4e57b..f36bae0148 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -28,7 +28,6 @@ #include "item_use.h" #include "itemname.h" #include "itemprop.h" -#include "los.h" #include "mapmark.h" #include "message.h" #include "monplace.h" diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 4fc8cbf02a..217fc7444b 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -29,7 +29,6 @@ #include "directn.h" #include "effects.h" #include "map_knowledge.h" -#include "fprop.h" #include "fight.h" #include "food.h" #include "godabil.h" diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 0f5935f2e5..16adb7a234 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -26,7 +26,6 @@ #include "decks.h" #include "food.h" #include "goditem.h" -#include "initfile.h" #include "invent.h" #include "item_use.h" #include "itemprop.h" @@ -45,7 +44,6 @@ #include "state.h" #include "stuff.h" #include "transfor.h" -#include "shout.h" id_arr type_ids; diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 755078c862..565827c41c 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -34,7 +34,6 @@ #include "random.h" #include "shopping.h" #include "stuff.h" -#include "transfor.h" #include "xom.h" diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 64793c4feb..625dafd11d 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -63,7 +63,6 @@ #include "state.h" #include "terrain.h" #include "tutorial.h" -#include "shout.h" #include "viewgeom.h" #include "xom.h" diff --git a/crawl-ref/source/l_crawl.cc b/crawl-ref/source/l_crawl.cc index f98ffe8e11..0918a9f099 100644 --- a/crawl-ref/source/l_crawl.cc +++ b/crawl-ref/source/l_crawl.cc @@ -24,7 +24,6 @@ #include "random.h" #include "stuff.h" #include "view.h" -#include "shout.h" #ifdef UNIX #include diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc index a462e12a3d..86fee24781 100644 --- a/crawl-ref/source/l_dgn.cc +++ b/crawl-ref/source/l_dgn.cc @@ -11,14 +11,12 @@ #include "coord.h" #include "directn.h" #include "l_defs.h" -#include "initfile.h" #include "mapmark.h" #include "maps.h" #include "random.h" #include "spl-util.h" #include "state.h" #include "view.h" -#include "shout.h" /////////////////////////////////////////////////////////////////////////// // Lua dungeon bindings (in the dgn table). diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc index 355d801afe..c0723885a4 100644 --- a/crawl-ref/source/l_item.cc +++ b/crawl-ref/source/l_item.cc @@ -8,7 +8,6 @@ #include "artefact.h" #include "colour.h" #include "command.h" -#include "initfile.h" #include "invent.h" #include "item_use.h" #include "itemprop.h" diff --git a/crawl-ref/source/l_los.cc b/crawl-ref/source/l_los.cc index 377dc4461b..1e2b866e47 100644 --- a/crawl-ref/source/l_los.cc +++ b/crawl-ref/source/l_los.cc @@ -12,7 +12,6 @@ #include "coord.h" #include "los.h" #include "ray.h" -#include "stuff.h" #define RAY_METATABLE "dgn.ray" diff --git a/crawl-ref/source/l_view.cc b/crawl-ref/source/l_view.cc index 04d076e3af..bb1b7bdbc0 100644 --- a/crawl-ref/source/l_view.cc +++ b/crawl-ref/source/l_view.cc @@ -6,10 +6,10 @@ #include "AppHdr.h" #include "l_libs.h" +#include "l_defs.h" #include "cluautil.h" #include "env.h" -#include "l_defs.h" #include "player.h" coord_def player2show(const coord_def &s) diff --git a/crawl-ref/source/l_you.cc b/crawl-ref/source/l_you.cc index cd9a6ab3fa..ed74c57826 100644 --- a/crawl-ref/source/l_you.cc +++ b/crawl-ref/source/l_you.cc @@ -23,6 +23,7 @@ #include "spl-util.h" #include "stuff.h" #include "transfor.h" +#include "travel.h" ///////////////////////////////////////////////////////////////////// // Bindings to get information on the player (clua). diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc index 100f6a9775..bbb55dd4df 100644 --- a/crawl-ref/source/libgui.cc +++ b/crawl-ref/source/libgui.cc @@ -15,7 +15,6 @@ #include "cio.h" #include "defines.h" -#include "directn.h" #include "itemprop.h" #include "externs.h" #include "tilereg.h" @@ -28,7 +27,6 @@ #include "tiles.h" #include "tilesdl.h" #include "travel.h" -#include "shout.h" #include "viewgeom.h" #include diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index 828ed18a47..1479396951 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -35,7 +35,6 @@ #include "state.h" #include "stuff.h" #include "view.h" -#include "shout.h" #include "viewgeom.h" #ifdef DGL_ENABLE_CORE_DUMP diff --git a/crawl-ref/source/libw32c.cc b/crawl-ref/source/libw32c.cc index 047a8ee5a1..a9fff4df09 100644 --- a/crawl-ref/source/libw32c.cc +++ b/crawl-ref/source/libw32c.cc @@ -71,7 +71,6 @@ #include "state.h" #include "stuff.h" #include "view.h" -#include "shout.h" #include "viewgeom.h" char oldTitle[80]; diff --git a/crawl-ref/source/losparam.cc b/crawl-ref/source/losparam.cc index 3666081897..77fd88943a 100644 --- a/crawl-ref/source/losparam.cc +++ b/crawl-ref/source/losparam.cc @@ -10,7 +10,6 @@ #include "cloud.h" #include "env.h" #include "externs.h" -#include "los.h" #include "mon-util.h" #include "terrain.h" diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 3e9dfaddab..332187dd4e 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -28,7 +28,6 @@ #include "random.h" #include "spl-book.h" #include "travel.h" -#include "shout.h" void item_set_appearance(item_def &item); diff --git a/crawl-ref/source/map_knowledge.cc b/crawl-ref/source/map_knowledge.cc index 87951a4d69..e46d7fb45c 100644 --- a/crawl-ref/source/map_knowledge.cc +++ b/crawl-ref/source/map_knowledge.cc @@ -2,7 +2,6 @@ #include "map_knowledge.h" -#include "coord.h" #include "coordit.h" #include "dgnevent.h" #include "directn.h" @@ -13,7 +12,6 @@ #include "stuff.h" #include "terrain.h" #include "view.h" -#include "shout.h" // These are hidden from the rest of the world... use the functions // below to get information about the map grid. diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index f95c33a179..8cb98b8680 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -17,7 +17,6 @@ #include "options.h" #include "player.h" #include "tutorial.h" -#include "shout.h" #ifdef USE_TILE #include "coord.h" diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index fed192cb41..077794339b 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -43,7 +43,6 @@ #include "dgnevent.h" #include "directn.h" #include "dungeon.h" -#include "map_knowledge.h" #include "fprop.h" #include "fight.h" #include "files.h" @@ -52,7 +51,6 @@ #include "itemprop.h" #include "items.h" #include "lev-pand.h" -#include "los.h" #include "macro.h" #include "makeitem.h" #include "mapmark.h" diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 3f52e69449..0d3b2e9b2a 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -18,7 +18,6 @@ #include "beam.h" #include "colour.h" #include "directn.h" -#include "map_knowledge.h" #include "fprop.h" #include "ghost.h" #include "misc.h" diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index 6fd35d26d3..2954e65065 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -12,7 +12,6 @@ #include "coord.h" #include "coordit.h" -#include "map_knowledge.h" #include "fprop.h" #include "exclude.h" #include "los.h" diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 8caa4a1737..04311be6d4 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -14,7 +14,6 @@ #include "colour.h" #include "database.h" #include "effects.h" -#include "map_knowledge.h" #include "fprop.h" #include "fight.h" #include "ghost.h" diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 233c22368b..2366ebe00b 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -15,7 +15,6 @@ #include "colour.h" #include "database.h" #include "directn.h" -#include "map_knowledge.h" #include "fprop.h" #include "fight.h" #include "ghost.h" @@ -33,7 +32,6 @@ #include "state.h" #include "stuff.h" #include "terrain.h" -#include "shout.h" //jmf: moved from inside function static FixedVector < int, NUM_MONSTERS > mon_entry; diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index e45bad6ad5..3fb1dbaf99 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -13,7 +13,6 @@ #include "arena.h" #include "branch.h" #include "directn.h" // for the Compass -#include "map_knowledge.h" #include "fprop.h" #include "externs.h" #include "options.h" @@ -35,7 +34,6 @@ #include "terrain.h" #include "traps.h" #include "view.h" -#include "shout.h" static std::vector vault_mon_types; static std::vector vault_mon_bases; diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index 8143508fed..3241200ae1 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -31,7 +31,6 @@ #include "state.h" #include "stuff.h" #include "view.h" -#include "shout.h" // Try the exact key lookup along with the entire prefix list. // If that fails, start ignoring hostile/religion/silence, in that order, diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index d2051f9f62..847935c37a 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -25,7 +25,6 @@ #include "random.h" #include "religion.h" #include "shopping.h" // for item values -#include "spells3.h" #include "state.h" #include "traps.h" #include "tutorial.h" diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 8adaf37642..d8e71794f8 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -24,7 +24,6 @@ #include "delay.h" #include "dgnevent.h" #include "directn.h" -#include "map_knowledge.h" #include "fprop.h" #include "files.h" #include "food.h" diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index c0b7c045d8..8aaf5460d3 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -44,7 +44,6 @@ #include "transfor.h" #include "tutorial.h" #include "view.h" -#include "shout.h" #include "xom.h" static int _body_covered(); diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 860b1a6ff8..4223ef6c0e 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -36,7 +36,6 @@ #include "abl-show.h" #include "artefact.h" -#include "branch.h" #include "cio.h" #include "command.h" #include "describe.h" diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 05b9a425dd..9e6978bb87 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -25,7 +25,6 @@ #include "colour.h" #include "coord.h" #include "describe.h" -#include "directn.h" #include "format.h" #include "fight.h" #include "godabil.h" @@ -35,7 +34,6 @@ #include "item_use.h" #include "menu.h" #include "message.h" -#include "misc.h" #include "monstuff.h" #include "mon-info.h" #include "mon-util.h" @@ -50,7 +48,6 @@ #include "stuff.h" #include "transfor.h" #include "travel.h" -#include "shout.h" #include "viewchar.h" #include "viewgeom.h" diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc index 6cbb4cee88..37ff1f5f87 100644 --- a/crawl-ref/source/overmap.cc +++ b/crawl-ref/source/overmap.cc @@ -26,10 +26,8 @@ #include "directn.h" #include "dungeon.h" #include "map_knowledge.h" -#include "fprop.h" #include "feature.h" #include "files.h" -#include "initfile.h" #include "menu.h" #include "religion.h" #include "shopping.h" @@ -37,7 +35,6 @@ #include "stuff.h" #include "terrain.h" #include "view.h" -#include "shout.h" typedef std::map stair_map_type; typedef std::map shop_map_type; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index c7181c13f8..e02c28e6e7 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -30,7 +30,6 @@ #include "dgnevent.h" #include "effects.h" #include "map_knowledge.h" -#include "fprop.h" #include "fight.h" #include "food.h" #include "godabil.h" @@ -40,12 +39,10 @@ #include "items.h" #include "it_use2.h" #include "kills.h" -#include "los.h" #include "macro.h" #include "message.h" #include "misc.h" #include "mon-util.h" -#include "monstuff.h" #include "mutation.h" #include "notes.h" #include "options.h" diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 088c508473..b27568236f 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -34,7 +34,6 @@ #include "describe.h" #include "effects.h" #include "enum.h" -#include "map_knowledge.h" #include "fprop.h" #include "fight.h" #include "files.h" @@ -44,13 +43,10 @@ #include "godwrath.h" #include "hiscores.h" #include "invent.h" -#include "it_use2.h" -#include "itemname.h" #include "itemprop.h" #include "item_use.h" #include "items.h" #include "kills.h" -#include "los.h" #include "macro.h" #include "makeitem.h" #include "message.h" @@ -69,7 +65,6 @@ #include "shopping.h" #include "skills2.h" #include "spells1.h" -#include "spells2.h" #include "spells3.h" #include "spells4.h" #include "spl-mis.h" @@ -77,10 +72,8 @@ #include "state.h" #include "stuff.h" #include "terrain.h" -#include "transfor.h" #include "tutorial.h" #include "view.h" -#include "shout.h" #include "xom.h" #if DEBUG_RELIGION diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc index 1c9a62dbf3..09812deac3 100644 --- a/crawl-ref/source/show.cc +++ b/crawl-ref/source/show.cc @@ -3,12 +3,8 @@ #include "show.h" #include "cloud.h" -#include "colour.h" -#include "coord.h" #include "coordit.h" -#include "directn.h" #include "env.h" -#include "feature.h" #include "mon-util.h" #include "monster.h" #include "options.h" diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index 39570c3cf0..b35fdaeeea 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -23,7 +23,6 @@ #include "overmap.h" #include "random.h" #include "show.h" -#include "spells3.h" #include "state.h" #include "stuff.h" #include "terrain.h" diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 4f67a57f98..bf1a9d5414 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -21,18 +21,15 @@ #include "cloud.h" #include "delay.h" #include "directn.h" -#include "dungeon.h" #include "effects.h" #include "map_knowledge.h" #include "fprop.h" #include "ghost.h" #include "goditem.h" #include "invent.h" -#include "itemname.h" #include "itemprop.h" #include "items.h" #include "it_use2.h" -#include "los.h" #include "message.h" #include "misc.h" #include "mon-behv.h" @@ -42,8 +39,6 @@ #include "ouch.h" #include "player.h" #include "religion.h" -#include "spells4.h" -#include "spl-mis.h" #include "stuff.h" #include "teleport.h" #include "tiles.h" diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 52b848dbdd..f235c04520 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -25,7 +25,6 @@ #include "debug.h" #include "delay.h" #include "effects.h" -#include "map_knowledge.h" #include "fprop.h" #include "food.h" #include "goditem.h" diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index e0f6e525a4..c3ed79ebb9 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -20,7 +20,6 @@ #include "describe.h" #include "effects.h" #include "map_knowledge.h" -#include "fprop.h" #include "food.h" #include "format.h" #include "godabil.h" @@ -30,7 +29,6 @@ #include "item_use.h" #include "itemname.h" #include "itemprop.h" -#include "los.h" #include "macro.h" #include "menu.h" #include "misc.h" diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index a11341c80c..0a002bf72a 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -24,10 +24,9 @@ #include "debug.h" #include "godabil.h" #include "stuff.h" -#include "los.h" #include "macro.h" #include "mon-behv.h" -#include "monstuff.h" +#include "mon-util.h" #include "notes.h" #include "player.h" #include "religion.h" diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index d5f999c097..283d022339 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -22,7 +22,6 @@ #include "items.h" #include "kills.h" #include "libutil.h" -#include "los.h" #include "menu.h" #include "message.h" #include "misc.h" diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc index 8d739e67b9..734da875af 100644 --- a/crawl-ref/source/state.cc +++ b/crawl-ref/source/state.cc @@ -23,7 +23,6 @@ #include "religion.h" #include "state.h" #include "tutorial.h" -#include "shout.h" game_state::game_state() : game_crashed(false), mouse_enabled(false), waiting_for_command(false), diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 90b66b3429..d7f211bdea 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -18,7 +18,6 @@ #include "state.h" #include "stuff.h" #include "view.h" -#include "shout.h" #include "viewchar.h" #include "viewgeom.h" @@ -62,7 +61,6 @@ #include "religion.h" #include "tutorial.h" #include "view.h" -#include "shout.h" stack_iterator::stack_iterator(const coord_def& pos) { diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index 71ef7e28b0..4b5ab14ae8 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -65,7 +65,6 @@ #include "dungeon.h" #include "enum.h" #include "map_knowledge.h" -#include "fprop.h" #include "externs.h" #include "files.h" #include "ghost.h" @@ -83,7 +82,6 @@ #include "tilemcache.h" #include "travel.h" #include "view.h" -#include "shout.h" #if defined(DEBUG) || defined(DEBUG_MONS_SCAN) #include "coord.h" diff --git a/crawl-ref/source/teleport.cc b/crawl-ref/source/teleport.cc index 21207698e5..133590ef1b 100644 --- a/crawl-ref/source/teleport.cc +++ b/crawl-ref/source/teleport.cc @@ -10,14 +10,12 @@ #include "cloud.h" #include "coord.h" #include "env.h" -#include "map_knowledge.h" #include "fprop.h" #include "los.h" #include "player.h" #include "random.h" #include "state.h" #include "terrain.h" -#include "shout.h" bool random_near_space(const coord_def& origin, coord_def& target, bool allow_adjacent, bool restrict_los, diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index 6239562763..16b7db05b7 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -35,7 +35,6 @@ #include "transfor.h" #include "traps.h" #include "view.h" -#include "shout.h" actor* actor_at(const coord_def& c) { diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 0dd87e77ac..e0b76d4b87 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -42,7 +42,6 @@ #include "traps.h" #include "travel.h" #include "view.h" -#include "shout.h" #include "viewgeom.h" void TileNewLevel(bool first_time) diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index f57652ff1a..14d53e03e1 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -12,7 +12,6 @@ #include "cio.h" #include "coord.h" #include "map_knowledge.h" -#include "fprop.h" #include "debug.h" #include "describe.h" #include "files.h" @@ -31,9 +30,7 @@ #include "options.h" #include "player.h" #include "religion.h" -#include "showsymb.h" #include "species.h" -#include "spells3.h" #include "spl-book.h" #include "spl-cast.h" #include "spl-util.h" @@ -42,7 +39,6 @@ #include "terrain.h" #include "transfor.h" #include "travel.h" -#include "shout.h" #include "viewgeom.h" #include "tilereg.h" diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index b0bf32d8e1..d63b336ae6 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -6,9 +6,7 @@ #include "cio.h" #include "coord.h" #include "map_knowledge.h" -#include "fprop.h" #include "itemname.h" -#include "items.h" #include "itemprop.h" #include "files.h" #include "macro.h" @@ -24,7 +22,6 @@ #include "tilesdl.h" #include "travel.h" #include "view.h" -#include "shout.h" #include "viewgeom.h" #include "tiledef-dngn.h" diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 261a8bfde6..40410f8362 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -19,7 +19,6 @@ #include "describe.h" #include "directn.h" #include "map_knowledge.h" -#include "fprop.h" #include "itemname.h" #include "itemprop.h" #include "items.h" diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 7e0293d58b..0046863591 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -23,13 +23,11 @@ #include "dgnevent.h" #include "directn.h" #include "map_knowledge.h" -#include "fprop.h" #include "exclude.h" #include "godabil.h" #include "itemname.h" #include "itemprop.h" #include "items.h" -#include "los.h" #include "macro.h" #include "message.h" #include "misc.h" @@ -53,7 +51,6 @@ #include "travel.h" #include "tutorial.h" #include "view.h" -#include "shout.h" #include #include diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index ae925a00f3..f90b026058 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -25,7 +25,6 @@ #include "describe.h" #include "food.h" #include "format.h" -#include "initfile.h" #include "invent.h" #include "itemname.h" #include "itemprop.h" @@ -57,7 +56,6 @@ #include "tiles.h" #endif #include "view.h" -#include "shout.h" #include "viewchar.h" #include "viewgeom.h" diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index e333bec5e6..c0a55da171 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -23,7 +23,6 @@ #include "externs.h" #include "map_knowledge.h" -#include "fprop.h" #include "viewchar.h" #include "viewgeom.h" #include "viewmap.h" @@ -31,24 +30,18 @@ #include "attitude-change.h" #include "branch.h" -#include "command.h" #include "cio.h" -#include "cloud.h" #include "clua.h" #include "colour.h" #include "database.h" #include "debug.h" #include "delay.h" -#include "dgnevent.h" #include "directn.h" #include "dungeon.h" #include "exclude.h" #include "feature.h" #include "files.h" -#include "format.h" -#include "ghost.h" #include "godabil.h" -#include "goditem.h" #include "itemprop.h" #include "los.h" #include "macro.h" @@ -60,15 +53,11 @@ #include "mon-util.h" #include "newgame.h" #include "options.h" -#include "jobs.h" #include "notes.h" #include "output.h" #include "overmap.h" -#include "place.h" #include "player.h" #include "random.h" -#include "religion.h" -#include "skills.h" #include "stuff.h" #include "spells3.h" #include "stash.h" diff --git a/crawl-ref/source/wiz-dgn.cc b/crawl-ref/source/wiz-dgn.cc index d5747370e2..5d178d02c1 100644 --- a/crawl-ref/source/wiz-dgn.cc +++ b/crawl-ref/source/wiz-dgn.cc @@ -29,7 +29,6 @@ #include "terrain.h" #include "traps.h" #include "view.h" -#include "shout.h" #include "wiz-mon.h" #ifdef WIZARD diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc index 23758bef03..8b11fb100a 100644 --- a/crawl-ref/source/wiz-item.cc +++ b/crawl-ref/source/wiz-item.cc @@ -27,12 +27,10 @@ #include "options.h" #include "religion.h" #include "spl-book.h" -#include "spl-util.h" #include "stash.h" #include "stuff.h" #include "terrain.h" #include "view.h" -#include "shout.h" #ifdef WIZARD static void _make_all_books() diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc index fe17464637..ce43e02d8f 100644 --- a/crawl-ref/source/wiz-mon.cc +++ b/crawl-ref/source/wiz-mon.cc @@ -13,7 +13,6 @@ #include "dbg-util.h" #include "delay.h" #include "map_knowledge.h" -#include "fprop.h" #include "ghost.h" #include "invent.h" #include "items.h" @@ -31,7 +30,6 @@ #include "spl-util.h" #include "stuff.h" #include "view.h" -#include "shout.h" #ifdef WIZARD // Creates a specific monster by mon type number. diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index b502715536..91d006d747 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -16,7 +16,6 @@ #include "directn.h" #include "effects.h" #include "map_knowledge.h" -#include "fprop.h" #include "feature.h" #include "goditem.h" #include "it_use2.h" @@ -53,7 +52,6 @@ #include "transfor.h" #include "traps.h" #include "view.h" -#include "shout.h" #include "viewchar.h" #include "xom.h" -- cgit v1.2.3-54-g00ecf