diff options
| -rw-r--r-- | crawl-ref/source/beam.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/effects.h | 13 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 12 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.h | 10 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.h | 9 | ||||
| -rw-r--r-- | crawl-ref/source/mpr.h | 10 | ||||
| -rw-r--r-- | crawl-ref/source/mstuff2.h | 17 |
8 files changed, 15 insertions, 60 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 88b1be7cba..5a51b27251 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2816,7 +2816,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 mstuff2.cc. +// monster_teleport() in monstuff.cc. void mimic_alert(monsters *mimic) { if (!mimic->alive()) diff --git a/crawl-ref/source/effects.h b/crawl-ref/source/effects.h index bc5f77c41e..c28ec1eb7f 100644 --- a/crawl-ref/source/effects.h +++ b/crawl-ref/source/effects.h @@ -100,20 +100,13 @@ bool recharge_wand(const int item_slot = -1); // last updated 12may2000 {dlb} /* *********************************************************************** - * called from: mstuff2 + * called from: mon-cast * *********************************************************************** */ void direct_effect(monsters *src, spell_type spl, bolt &pbolt, actor *defender); // last updated 12may2000 {dlb} /* *********************************************************************** - * called from: mstuff2 - * *********************************************************************** */ -void mons_direct_effect(struct bolt &pbolt, int i); - - -// last updated 12may2000 {dlb} -/* *********************************************************************** * called from: acr * *********************************************************************** */ void yell(bool force = false); @@ -133,8 +126,8 @@ int holy_word_monsters(coord_def where, int pow, int caster, // last updated 12may2000 {dlb} /* *********************************************************************** - * called from: ability - decks - fight - it_use3 - item_use - mstuff2 - - * spell + * called from: ability - decks - fight - it_use3 - item_use - mon-abil - + * mon-cast - mon-util - spell * *********************************************************************** */ int torment(int caster, const coord_def& where); diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index a57f0ab949..af23e7d2ff 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2193,7 +2193,7 @@ void _merge_ammo_in_inventory(int slot) } // throw_it - currently handles player throwing only. Monster -// throwing is handled in mstuff2:mons_throw() +// throwing is handled in mon-act:_mons_throw() // Note: If teleport is true, assume that pbolt is already set up, // and teleport the projectile onto the square. // diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 439572fa2f..b5cf2f9151 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -478,7 +478,8 @@ bool give_monster_proper_name(monsters *mon, bool orcs_only = true); // last updated 12may2000 {dlb} /* *********************************************************************** - * called from: beam - direct - fight - monstuff - mstuff2 - spells4 - view + * called from: beam - direct - fight - mon-act - mon-behv - monplace - + * monstuff - mon-util - spells4 - view * *********************************************************************** */ flight_type mons_class_flies(int mc); flight_type mons_flies(const monsters *mon, bool randarts = true); @@ -565,7 +566,7 @@ int mons_unusable_items(const monsters *mon); // last updated 12may2000 {dlb} /* *********************************************************************** - * called from: beam - effects - fight - monstuff - mstuff2 - spells2 - + * called from: beam - effects - fight - monstuff - mon-util - spells2 - * spells3 - spells4 * *********************************************************************** */ mon_holy_type mons_class_holiness(int mc); @@ -645,13 +646,6 @@ bool name_zombie(monsters *mon, int mc, const std::string mon_name); bool name_zombie(monsters *mon, const monsters* orig); -// last updated 12may2000 {dlb} -/* *********************************************************************** - * called from: bang - beam - monstuff - mstuff2 - spells4 - view - * *********************************************************************** */ -// unsigned char mons_category(int which_mons); - - // last updated 07jan2001 (gdl) /* *********************************************************************** * called from: beam diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h index b8be4cfbfa..db490bcb44 100644 --- a/crawl-ref/source/monplace.h +++ b/crawl-ref/source/monplace.h @@ -270,13 +270,6 @@ int place_monster(mgen_data mg, bool force_pos = false); * *********************************************************************** */ monster_type pick_local_zombifiable_monster_type(int power); -// last updated 12may2000 {dlb} -/* *********************************************************************** - * called from: acr - debug - decks - effects - fight - it_use3 - item_use - - * items - monstuff - mstuff2 - religion - spell - spells - - * spells2 - spells3 - spells4 - * *********************************************************************** */ - class level_id; monster_type pick_random_monster(const level_id &place); @@ -301,7 +294,8 @@ bool empty_surrounds( const coord_def& where, dungeon_feature_type spc_wanted, // last updated 12may2000 {dlb} /* *********************************************************************** - * called from: ability - acr - items - maps - mstuff2 - spell - spells + * called from: ability - acr - items - maps - mon-abil - mon-cast + * - spell - spells * *********************************************************************** */ monster_type summon_any_demon(demon_class_type dct); diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index 40c6528587..1ef938ef93 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -81,9 +81,9 @@ bool monster_polymorph(monsters *monster, monster_type targetc, bool force_beh = false); // last updated: 08jun2000 {dlb} -/* *********************************************************************** - * called from: bang - beam - effects - fight - misc - monstuff - mstuff2 - - * spells1 - spells2 - spells3 - spells4 +/* ************************************************************************** + * called from: bang - beam - effects - fight - misc - mon-abil - mon-act - + * monstuff - spells1 - spells2 - spells3 - spells4 * *********************************************************************** */ int monster_die(monsters *monster, killer_type killer, int killer_index, bool silent = false, bool wizard = false); @@ -123,7 +123,8 @@ void monster_drop_ething(monsters *monster, bool mark_item_origins = false, bool monster_blink(monsters *monster, bool quiet = false); /* *********************************************************************** - * called from: beam - effects - fight - monstuff - mstuff2 - spells1 - + * called from: beam - effects - fight - mgrow - mon-abil - mon-act - + * mon-behv - mon-cast - monster - monstuff -spells1 - * spells2 - spells4 * *********************************************************************** */ bool simple_monster_message(const monsters *monster, const char *event, diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h index 80bb71d257..5ccc14774f 100644 --- a/crawl-ref/source/mpr.h +++ b/crawl-ref/source/mpr.h @@ -69,16 +69,6 @@ enum msg_colour_type MSGCOL_PLAIN // same as plain channel }; -// last updated 12may2000 {dlb} -/* *********************************************************************** - * called from: ability - acr - bang - beam - chardump - command - debug - - * decks - direct - effects - fight - files - food - it_use2 - - * it_use3 - item_use - items - macro - misc - monplace - - * monstuff - mstuff2 - mutation - ouch - overmap - player - - * religion - shopping - skills - spell - spl-book - spells - - * spells1 - spells2 - spells3 - spells4 - stuff - transfor - - * view - * *********************************************************************** */ void mpr(const char *inf, msg_channel_type channel = MSGCH_PLAIN, int param=0); // 4.1-style mpr, currently named mprf for minimal disruption. diff --git a/crawl-ref/source/mstuff2.h b/crawl-ref/source/mstuff2.h deleted file mode 100644 index 848dacbf7c..0000000000 --- a/crawl-ref/source/mstuff2.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * File: mstuff2.h - * Summary: Misc monster related functions. - * Written by: Linley Henzell - */ - - -#ifndef MSTUFF2_H -#define MSTUFF2_H - - -#include <string> -#include "externs.h" - -struct bolt; - -#endif |