diff options
70 files changed, 119 insertions, 119 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 73dc7b730c..9c86936570 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -37,7 +37,7 @@ #include "message.h" #include "menu.h" #include "misc.h" -#include "monplace.h" +#include "mon-place.h" #include "mutation.h" #include "notes.h" #include "ouch.h" diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index e5d64fff31..1a5db5cbdb 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -20,7 +20,7 @@ #include "misc.h" #include "mon-iter.h" #include "mon-util.h" -#include "monplace.h" +#include "mon-place.h" #include "mtransit.h" #include "player.h" #include "dungeon.h" diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 70901ec1cb..83761a7cb6 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -90,8 +90,8 @@ #include "mon-act.h" #include "mon-cast.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "newgame.h" diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index dcae744e65..178a592129 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -24,8 +24,8 @@ #include "mon-behv.h" #include "mon-pick.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "spl-mis.h" #include "spl-util.h" #include "state.h" diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h index f4c076e478..c2e8cc5159 100644 --- a/crawl-ref/source/art-func.h +++ b/crawl-ref/source/art-func.h @@ -23,8 +23,8 @@ #include "effects.h" // For Sceptre of Torment tormenting #include "food.h" // For evokes -#include "monplace.h" // For Sceptre of Asmodeus evoke -#include "monstuff.h" // For Scythe of Curses cursing items +#include "mon-place.h" // For Sceptre of Asmodeus evoke +#include "mon-stuff.h" // For Scythe of Curses cursing items #include "spells3.h" // For Zonguldrok animating dead #include "spl-cast.h" // For evokes #include "spl-mis.h" // For Staff of Wucad Mu miscasts diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index 518d77cb9a..0cb8d91949 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -19,7 +19,7 @@ #include "mon-iter.h" #include "mon-util.h" #include "monster.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "player.h" #include "random.h" #include "religion.h" diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 8203461539..265732b9d3 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -46,8 +46,8 @@ #include "misc.h" #include "mon-behv.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "ouch.h" @@ -2877,7 +2877,7 @@ void fire_tracer(const monsters *monster, bolt &pbolt, bool explode_only) // When a mimic is hit by a ranged attack, it teleports away (the slow // way) and changes its appearance - the appearance change is in -// monster_teleport() in monstuff.cc. +// monster_teleport() in mon-stuff.cc. void mimic_alert(monsters *mimic) { if (!mimic->alive()) @@ -5153,7 +5153,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) } // The monster can be no more than lightly wounded/damaged, - // using the formula from monstuff.cc:mons_get_damage_level(). + // using the formula from mon-stuff.cc:mons_get_damage_level(). if (mon->hit_points <= mon->max_hit_points * 3 / 4) { simple_monster_message(mon, "'s soul is too badly injured."); diff --git a/crawl-ref/source/dbg-util.cc b/crawl-ref/source/dbg-util.cc index 1ccabe928d..12b2bf7931 100644 --- a/crawl-ref/source/dbg-util.cc +++ b/crawl-ref/source/dbg-util.cc @@ -12,7 +12,7 @@ #include "cio.h" #include "coord.h" #include "dungeon.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "religion.h" #include "shopping.h" diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index cdd4626e99..1c023c3e4c 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -32,8 +32,8 @@ #include "message.h" #include "misc.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mutation.h" #include "ouch.h" #include "player.h" diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 0ef9aa6aca..85e7b6ea29 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -34,7 +34,7 @@ #include "message.h" #include "misc.h" #include "mon-behv.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "notes.h" #include "ouch.h" diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 4a536275f7..33f285c55d 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -40,7 +40,7 @@ #include "macro.h" #include "menu.h" #include "message.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "newgame.h" #include "jobs.h" diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 01b33bd563..b0349a6721 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -44,7 +44,7 @@ #include "message.h" #include "menu.h" #include "misc.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-info.h" #include "mon-util.h" #include "output.h" diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 763dbe7066..e98318ead2 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -41,7 +41,7 @@ #include "message.h" #include "misc.h" #include "mon-util.h" -#include "monplace.h" +#include "mon-place.h" #include "notes.h" #include "place.h" #include "player.h" diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index a9eb9ceee6..64bf8dce2b 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -44,8 +44,8 @@ #include "mon-behv.h" #include "mon-cast.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "notes.h" diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index f452a9523c..9d2eb982c0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1921,7 +1921,7 @@ enum monster_type // (int) menv[].type MONS_WHITE_DRACONIAN, MONS_PALE_DRACONIAN, // 320 Should always be last colour. - // Sync up with monplace.cc's draconian selection if adding more. + // Sync up with mon-place.cc's draconian selection if adding more. MONS_DRACONIAN_CALLER, MONS_DRACONIAN_MONK, MONS_DRACONIAN_ZEALOT, diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 7bd0f6d512..8466aa7f7c 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -44,8 +44,8 @@ #include "misc.h" #include "mon-behv.h" #include "mon-cast.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "ouch.h" diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index cd63e9cd15..9bfb072dc3 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -8,7 +8,7 @@ #include "delay.h" #include "files.h" -#include "monplace.h" +#include "mon-place.h" #include <errno.h> #include <string.h> @@ -59,7 +59,7 @@ #include "message.h" #include "misc.h" #include "mon-act.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mtransit.h" #include "newgame.h" diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index a017265ad9..114cb53842 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -24,8 +24,8 @@ #include "mon-act.h" #include "mon-behv.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "options.h" diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc index d896de98c3..7b0f262c20 100644 --- a/crawl-ref/source/godwrath.cc +++ b/crawl-ref/source/godwrath.cc @@ -22,8 +22,8 @@ #include "message.h" #include "misc.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mutation.h" #include "ouch.h" #include "quiver.h" diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index f36bae0148..8e40030f83 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -30,7 +30,7 @@ #include "itemprop.h" #include "mapmark.h" #include "message.h" -#include "monplace.h" +#include "mon-place.h" #include "misc.h" #include "player.h" #include "religion.h" diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 0620ab8d8f..60e172f553 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -45,8 +45,8 @@ #include "misc.h" #include "mon-behv.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "notes.h" #include "options.h" #include "ouch.h" diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 565827c41c..d14d2b5d6d 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -27,7 +27,7 @@ #include "itemprop.h" #include "macro.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "notes.h" #include "player.h" #include "quiver.h" diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 625dafd11d..2e366841c7 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -43,8 +43,8 @@ #include "libutil.h" #include "message.h" #include "misc.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "notes.h" diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc index 589a9b3972..6857c3d82c 100644 --- a/crawl-ref/source/kills.cc +++ b/crawl-ref/source/kills.cc @@ -10,7 +10,7 @@ #include "describe.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "files.h" #include "ghost.h" #include "place.h" diff --git a/crawl-ref/source/l_dgnmon.cc b/crawl-ref/source/l_dgnmon.cc index 4b8a7bc5ba..7c37b6bdb0 100644 --- a/crawl-ref/source/l_dgnmon.cc +++ b/crawl-ref/source/l_dgnmon.cc @@ -11,8 +11,8 @@ #include "dungeon.h" #include "mapdef.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #define MONSLIST_METATABLE "crawldgn.monster_list" diff --git a/crawl-ref/source/l_mons.cc b/crawl-ref/source/l_mons.cc index 7d57a34961..5f9defaf6c 100644 --- a/crawl-ref/source/l_mons.cc +++ b/crawl-ref/source/l_mons.cc @@ -5,7 +5,7 @@ #include "delay.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" ///////////////////////////////////////////////////////////////////// // Monster handling diff --git a/crawl-ref/source/lev-pand.cc b/crawl-ref/source/lev-pand.cc index 827e753cd1..a772d6e3d6 100644 --- a/crawl-ref/source/lev-pand.cc +++ b/crawl-ref/source/lev-pand.cc @@ -12,7 +12,7 @@ #include "externs.h" #include "dungeon.h" -#include "monplace.h" +#include "mon-place.h" #include "mon-pick.h" #include "random.h" diff --git a/crawl-ref/source/makefile.obj b/crawl-ref/source/makefile.obj index ccbfb75aeb..b8728e6839 100644 --- a/crawl-ref/source/makefile.obj +++ b/crawl-ref/source/makefile.obj @@ -106,10 +106,10 @@ mon-info.o \ mon-iter.o \ mon-pick.o \ mon-util.o \ -monplace.o \ -monspeak.o \ +mon-place.o \ +mon-speak.o \ monster.o \ -monstuff.o \ +mon-stuff.o \ mt19937ar.o \ mtransit.o \ mutation.o \ diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index a9bff3cf52..a5fa792a76 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -31,7 +31,7 @@ #include "maps.h" #include "misc.h" #include "mon-cast.h" -#include "monplace.h" +#include "mon-place.h" #include "mon-util.h" #include "place.h" #include "random.h" diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index bc2139681d..0eced70f21 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -24,7 +24,7 @@ #include "message.h" #include "mapdef.h" #include "mon-util.h" -#include "monplace.h" +#include "mon-place.h" #include "random.h" #include "state.h" #include "terrain.h" diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 8cb98b8680..af1454f22f 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -20,7 +20,7 @@ #ifdef USE_TILE #include "coord.h" - #include "monstuff.h" + #include "mon-stuff.h" #include "mon-util.h" #include "newgame.h" #include "terrain.h" diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index e87a988682..77fb18d697 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -27,7 +27,7 @@ #include "libutil.h" #include "macro.h" #include "message.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "notes.h" #include "random.h" #include "religion.h" diff --git a/crawl-ref/source/mgrow.cc b/crawl-ref/source/mgrow.cc index 3693e43dd4..7be571d541 100644 --- a/crawl-ref/source/mgrow.cc +++ b/crawl-ref/source/mgrow.cc @@ -9,8 +9,8 @@ #include "enum.h" #include "mgrow.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "random.h" // Base experience required by a monster to reach HD 1. diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index d1744552bb..43d9499ed5 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -55,10 +55,10 @@ #include "makeitem.h" #include "mapmark.h" #include "message.h" -#include "monplace.h" +#include "mon-place.h" #include "mon-iter.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "ouch.h" #include "output.h" #include "overmap.h" diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index bfc77357b8..73af98dd11 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -25,9 +25,9 @@ #include "mon-behv.h" #include "mon-cast.h" #include "mon-iter.h" -#include "monplace.h" -#include "monspeak.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-speak.h" +#include "mon-stuff.h" #include "random.h" #include "spl-mis.h" #include "spl-util.h" diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 0f17f8c53b..1ca78665b2 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -32,8 +32,8 @@ #include "mon-behv.h" #include "mon-cast.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mutation.h" #include "notes.h" #include "options.h" diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index 2954e65065..7883a367b1 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -15,8 +15,8 @@ #include "fprop.h" #include "exclude.h" #include "los.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "random.h" #include "state.h" diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 3464517da8..08cba24f19 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -21,9 +21,9 @@ #include "los.h" #include "misc.h" #include "mon-behv.h" -#include "monplace.h" -#include "monspeak.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-speak.h" +#include "mon-stuff.h" #include "mon-util.h" #include "random.h" #include "religion.h" @@ -1764,7 +1764,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, return; case SPELL_ANIMATE_DEAD: - // see special handling in monstuff::handle_spell() {dlb} + // see special handling in mon-stuff::handle_spell() {dlb} animate_dead(monster, 5 + random2(5), SAME_ATTITUDE(monster), monster->foe, god); return; diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 2574dd8d57..be2b6482cc 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -50,7 +50,7 @@ MH_NONLIVING - golems and other constructs MH_PLANT - plants - exp_mod: see give_adjusted_experience() in monstuff.cc + exp_mod: see give_adjusted_experience() in mon-stuff.cc - the experience given for killing this monster is calculated something like this: diff --git a/crawl-ref/source/mon-info.h b/crawl-ref/source/mon-info.h index c5d559d4e9..20618caf1a 100644 --- a/crawl-ref/source/mon-info.h +++ b/crawl-ref/source/mon-info.h @@ -1,7 +1,7 @@ #ifndef MON_INFO_H #define MON_INFO_H -#include "monstuff.h" +#include "mon-stuff.h" // Monster info used by the pane; precomputes some data // to help with sorting and rendering. diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/mon-place.cc index 8d1edb789e..15c805455c 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/mon-place.cc @@ -8,7 +8,7 @@ #include <algorithm> -#include "monplace.h" +#include "mon-place.h" #include "arena.h" #include "branch.h" @@ -25,7 +25,7 @@ #include "mon-gear.h" #include "mon-pick.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "player.h" #include "random.h" #include "religion.h" diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/mon-place.h index 7e35108863..df810c11bb 100644 --- a/crawl-ref/source/monplace.h +++ b/crawl-ref/source/mon-place.h @@ -1,5 +1,5 @@ /* - * File: monplace.h + * File: mon-place.h * Summary: Functions used when placing monsters in the dungeon. * Written by: Linley Henzell */ diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/mon-speak.cc index 1d9650bbca..df2484850d 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/mon-speak.cc @@ -1,11 +1,11 @@ /* - * File: monspeak.cc + * File: mon-speak.cc * Summary: Functions to handle speaking monsters */ #include "AppHdr.h" -#include "monspeak.h" +#include "mon-speak.h" #include <stdlib.h> #include <string.h> @@ -23,7 +23,7 @@ #include "debug.h" #include "ghost.h" #include "message.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "jobs.h" #include "player.h" diff --git a/crawl-ref/source/monspeak.h b/crawl-ref/source/mon-speak.h index 9191cebce2..e0e65b24ff 100644 --- a/crawl-ref/source/monspeak.h +++ b/crawl-ref/source/mon-speak.h @@ -1,5 +1,5 @@ /* - * File: monspeak.h + * File: mon-speak.h * Summary: Functions to handle speaking monsters */ diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/mon-stuff.cc index 3e37144226..fd9c9eec10 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -1,11 +1,11 @@ /* - * File: monstuff.cc + * File: mon-stuff.cc * Summary: Misc monster related functions. * Written by: Linley Henzell */ #include "AppHdr.h" -#include "monstuff.h" +#include "mon-stuff.h" //#include <stdlib.h> //#include <string.h> @@ -35,8 +35,8 @@ #include "misc.h" #include "mon-behv.h" #include "mon-iter.h" -#include "monplace.h" -#include "monspeak.h" +#include "mon-place.h" +#include "mon-speak.h" #include "notes.h" #include "options.h" #include "player.h" diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/mon-stuff.h index 75656c73a1..fe82988618 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/mon-stuff.h @@ -1,5 +1,5 @@ /* - * File: monstuff.h + * File: mon-stuff.h * Summary: Misc monster related functions. * Written by: Linley Henzell */ diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index af66751b1b..c6b3a51d2a 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -23,8 +23,8 @@ #include "kills.h" #include "los.h" #include "mon-behv.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "options.h" #include "random.h" #include "religion.h" diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index ab8dc0dba3..1a9e9e1737 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -19,8 +19,8 @@ #include "misc.h" #include "mon-abil.h" #include "mon-behv.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mtransit.h" #include "random.h" #include "religion.h" @@ -1758,7 +1758,7 @@ bool monsters::pickup_misc(item_def &item, int near) return (pickup(item, MSLOT_MISCELLANY, near)); } -// Eaten items are handled elsewhere, in _handle_pickup() in monstuff.cc. +// Eaten items are handled elsewhere, in _handle_pickup() in mon-stuff.cc. bool monsters::pickup_item(item_def &item, int near, bool force) { // Equipping stuff can be forced when initially equipping monsters. diff --git a/crawl-ref/source/mtransit.cc b/crawl-ref/source/mtransit.cc index a743278398..e9bf292df2 100644 --- a/crawl-ref/source/mtransit.cc +++ b/crawl-ref/source/mtransit.cc @@ -13,7 +13,7 @@ #include "artefact.h" #include "dungeon.h" #include "items.h" -#include "monplace.h" +#include "mon-place.h" #include "mon-util.h" #include "random.h" diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index e4230464af..52ace7b1a8 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -51,8 +51,8 @@ #include "message.h" #include "misc.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "notes.h" #include "output.h" #include "player.h" diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 9e6978bb87..a1494fe726 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -34,7 +34,7 @@ #include "item_use.h" #include "menu.h" #include "message.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-info.h" #include "mon-util.h" #include "newgame.h" diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index dd00639ef6..a4d9f06bb6 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -54,8 +54,8 @@ #include "mon-behv.h" #include "mon-iter.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mutation.h" #include "newgame.h" #include "notes.h" diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc index 163b013423..d9dea1473c 100644 --- a/crawl-ref/source/shout.cc +++ b/crawl-ref/source/shout.cc @@ -16,9 +16,9 @@ #include "misc.h" #include "mon-behv.h" #include "mon-iter.h" -#include "monplace.h" +#include "mon-place.h" #include "monster.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "options.h" #include "player.h" #include "random.h" diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 1b2e1b14df..59e8163ae6 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -33,7 +33,7 @@ #include "los.h" #include "message.h" #include "misc.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "options.h" #include "player.h" diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index f2c92572a7..44448142b3 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -34,8 +34,8 @@ #include "misc.h" #include "mon-behv.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "ouch.h" #include "player.h" diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index edca2202c5..812b7d00d0 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -36,8 +36,8 @@ #include "misc.h" #include "mon-behv.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "player.h" #include "quiver.h" diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 027359417e..b046c0ac29 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -33,8 +33,8 @@ #include "message.h" #include "misc.h" #include "mon-behv.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "ouch.h" #include "player.h" diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 9a48b2ad31..94d6aa27cc 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -34,7 +34,7 @@ #include "misc.h" #include "message.h" #include "mon-cast.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mutation.h" #include "ouch.h" #include "player.h" diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc index bbab3c230a..e348a4c61c 100644 --- a/crawl-ref/source/spl-mis.cc +++ b/crawl-ref/source/spl-mis.cc @@ -18,8 +18,8 @@ #include "it_use2.h" #include "kills.h" #include "misc.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "player.h" diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index 283d022339..7b861de749 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -26,7 +26,7 @@ #include "message.h" #include "misc.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "notes.h" #include "options.h" #include "place.h" diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index d7f211bdea..3be83efe20 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -14,7 +14,7 @@ #include "los.h" #include "message.h" #include "misc.h" -#include "monplace.h" +#include "mon-place.h" #include "state.h" #include "stuff.h" #include "view.h" @@ -53,7 +53,7 @@ #include "items.h" #include "macro.h" #include "misc.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "notes.h" #include "output.h" diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index 16b7db05b7..45ea54fafe 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -23,8 +23,8 @@ #include "los.h" #include "message.h" #include "misc.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "ouch.h" #include "overmap.h" diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index e0b76d4b87..64b2f7e0bc 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -24,7 +24,7 @@ #include "kills.h" #include "los.h" #include "macro.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "player.h" #include "shopping.h" diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 40410f8362..47b245f71d 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -27,7 +27,7 @@ #include "message.h" #include "misc.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mtransit.h" #include "ouch.h" #include "player.h" diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 0046863591..51848b200e 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -32,7 +32,7 @@ #include "message.h" #include "misc.h" #include "mon-util.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "options.h" #ifdef USE_TILE #include "output.h" diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 3ee1f5e6bb..83cc0df5d2 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -49,8 +49,8 @@ #include "misc.h" #include "mon-behv.h" #include "mon-iter.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mon-util.h" #include "newgame.h" #include "options.h" diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc index 4aa2b2bac7..1e3b784ce8 100644 --- a/crawl-ref/source/wiz-fsim.cc +++ b/crawl-ref/source/wiz-fsim.cc @@ -17,9 +17,9 @@ #include "item_use.h" #include "it_use2.h" #include "message.h" -#include "monplace.h" +#include "mon-place.h" #include "monster.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "options.h" #include "player.h" #include "quiver.h" diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc index 8b11fb100a..eb800da140 100644 --- a/crawl-ref/source/wiz-item.cc +++ b/crawl-ref/source/wiz-item.cc @@ -22,7 +22,7 @@ #include "it_use2.h" #include "invent.h" #include "makeitem.h" -#include "monstuff.h" +#include "mon-stuff.h" #include "mon-util.h" #include "options.h" #include "religion.h" diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc index 7817b29e2d..3701d344a0 100644 --- a/crawl-ref/source/wiz-mon.cc +++ b/crawl-ref/source/wiz-mon.cc @@ -20,9 +20,9 @@ #include "jobs.h" #include "macro.h" #include "message.h" -#include "monplace.h" -#include "monspeak.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-speak.h" +#include "mon-stuff.h" #include "mon-iter.h" #include "mon-util.h" #include "output.h" diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 34f8392ee6..60e7dc50bf 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -28,8 +28,8 @@ #include "mon-behv.h" #include "mon-iter.h" #include "mon-util.h" -#include "monplace.h" -#include "monstuff.h" +#include "mon-place.h" +#include "mon-stuff.h" #include "mutation.h" #include "notes.h" #include "options.h" |