summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-03 10:17:43 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-03 10:19:23 +0100
commite65199ef20df7201e5cb1a87e3e0fffdfd13523d (patch)
tree06cf6b7ef5f2e7b83b724c63b8f33ca6d65795d3 /crawl-ref
parent2fbd97bae9a937f03643ad0dc579f0595e42497f (diff)
downloadcrawl-ref-e65199ef20df7201e5cb1a87e3e0fffdfd13523d.tar.gz
crawl-ref-e65199ef20df7201e5cb1a87e3e0fffdfd13523d.zip
Remove "called from:" comments.
These were of questionable use and freshness. Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/abl-show.h4
-rw-r--r--crawl-ref/source/artefact.h33
-rw-r--r--crawl-ref/source/branch.h3
-rw-r--r--crawl-ref/source/command.h6
-rw-r--r--crawl-ref/source/debug.h5
-rw-r--r--crawl-ref/source/describe.h34
-rw-r--r--crawl-ref/source/dlua.h2
-rw-r--r--crawl-ref/source/effects.h53
-rw-r--r--crawl-ref/source/files.h16
-rw-r--r--crawl-ref/source/food.h29
-rw-r--r--crawl-ref/source/hiscores.h16
-rw-r--r--crawl-ref/source/initfile.h13
-rw-r--r--crawl-ref/source/it_use3.h20
-rw-r--r--crawl-ref/source/item_use.h69
-rw-r--r--crawl-ref/source/itemname.h3
-rw-r--r--crawl-ref/source/items.h41
-rw-r--r--crawl-ref/source/lev-pand.h11
-rw-r--r--crawl-ref/source/message.h20
-rw-r--r--crawl-ref/source/misc.h12
-rw-r--r--crawl-ref/source/mon-pick.h23
-rw-r--r--crawl-ref/source/mon-util.h133
-rw-r--r--crawl-ref/source/monplace.h15
-rw-r--r--crawl-ref/source/monstuff.h23
-rw-r--r--crawl-ref/source/newgame.h6
-rw-r--r--crawl-ref/source/player.h143
-rw-r--r--crawl-ref/source/skills.h5
-rw-r--r--crawl-ref/source/spl-book.h13
-rw-r--r--crawl-ref/source/spl-cast.h14
-rw-r--r--crawl-ref/source/spl-mis.h7
-rw-r--r--crawl-ref/source/traps.h8
-rw-r--r--crawl-ref/source/travel.h10
-rw-r--r--crawl-ref/source/version.h3
32 files changed, 3 insertions, 790 deletions
diff --git a/crawl-ref/source/abl-show.h b/crawl-ref/source/abl-show.h
index caf55b909d..1bd1a6afab 100644
--- a/crawl-ref/source/abl-show.h
+++ b/crawl-ref/source/abl-show.h
@@ -82,10 +82,6 @@ const std::string make_cost_description(ability_type ability);
std::vector<const char*> get_ability_names();
int choose_ability_menu(const std::vector<talent>& talents);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool activate_ability();
std::vector<talent> your_talents(bool check_confused);
bool string_matches_ability_name(const std::string key);
diff --git a/crawl-ref/source/artefact.h b/crawl-ref/source/artefact.h
index 117959064e..8f1d7d65f2 100644
--- a/crawl-ref/source/artefact.h
+++ b/crawl-ref/source/artefact.h
@@ -187,30 +187,15 @@ void set_unique_item_status(const item_def& item,
void set_unique_item_status(int unrand_index,
unique_item_status_type status );
-/* ***********************************************************************
- * called from: itemname
- * *********************************************************************** */
std::string get_artefact_name( const item_def &item );
-/* ***********************************************************************
- * called from: spl-book
- * *********************************************************************** */
void set_artefact_name( item_def &item, const std::string &name );
void set_artefact_appearance( item_def &item, const std::string &appear );
-/* ***********************************************************************
- * called from: effects
- * *********************************************************************** */
std::string artefact_name( const item_def &item, bool appearance = false );
-/* ***********************************************************************
- * called from: describe
- * *********************************************************************** */
const char *unrandart_descrip( int which_descrip, const item_def &item );
-/* ***********************************************************************
- * called from: dungeon makeitem
- * *********************************************************************** */
int find_okay_unrandart(unsigned char aclass, unsigned char atype = OBJ_RANDOM,
unrand_special_type specialness = UNRANDSPEC_EITHER,
bool in_abyss = false);
@@ -218,9 +203,6 @@ int find_okay_unrandart(unsigned char aclass, unsigned char atype = OBJ_RANDOM,
typedef FixedVector< int, ART_PROPERTIES > artefact_properties_t;
typedef FixedVector< bool, ART_PROPERTIES > artefact_known_props_t;
-/* ***********************************************************************
- * called from: describe - fight - it_use2 - item_use - player
- * *********************************************************************** */
void artefact_desc_properties( const item_def &item,
artefact_properties_t &proprt,
artefact_known_props_t &known,
@@ -244,21 +226,12 @@ int artefact_known_wpn_property( const item_def &item,
void artefact_wpn_learn_prop( item_def &item, artefact_prop_type prop );
bool artefact_wpn_known_prop( const item_def &item, artefact_prop_type prop );
-/* ***********************************************************************
- * called from: dungeon
- * *********************************************************************** */
bool make_item_randart( item_def &item );
bool make_item_unrandart( item_def &item, int unrand_index );
-/* ***********************************************************************
- * called from: randart - debug
- * *********************************************************************** */
bool randart_is_bad( const item_def &item );
bool randart_is_bad( const item_def &item, artefact_properties_t &proprt );
-/* ***********************************************************************
- * called from: items
- * *********************************************************************** */
int find_unrandart_index(const item_def& artefact);
unrandart_entry* get_unrand_entry(int unrand_index);
@@ -266,17 +239,11 @@ unrandart_entry* get_unrand_entry(int unrand_index);
unrand_special_type get_unrand_specialness(int unrand_index);
unrand_special_type get_unrand_specialness(const item_def &item);
-/* ***********************************************************************
- * called from: debug
- * *********************************************************************** */
void artefact_set_properties( item_def &item,
artefact_properties_t &proprt );
void artefact_set_property( item_def &item,
artefact_prop_type prop,
int val );
-/* ***********************************************************************
- * called from: mapdef
- * *********************************************************************** */
int get_unrandart_num( const char *name );
#endif
diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h
index 14e1c8fe49..4afd805974 100644
--- a/crawl-ref/source/branch.h
+++ b/crawl-ref/source/branch.h
@@ -58,9 +58,6 @@ extern Branch branches[];
Branch& your_branch();
-/* ***********************************************************************
- * called from: dungeon
- * *********************************************************************** */
bool at_branch_bottom();
branch_type str_to_branch(const std::string &branch,
diff --git a/crawl-ref/source/command.h b/crawl-ref/source/command.h
index 57f24ceb34..9aab940469 100644
--- a/crawl-ref/source/command.h
+++ b/crawl-ref/source/command.h
@@ -10,17 +10,11 @@
#include "enum.h"
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void adjust();
void list_weapons();
void list_armour();
void list_jewellery();
-/* ***********************************************************************
- * called from: clua
- * *********************************************************************** */
void swap_inv_slots(int slot1, int slot2, bool verbose);
void show_levelmap_help();
diff --git a/crawl-ref/source/debug.h b/crawl-ref/source/debug.h
index 9865993279..faa2bffe71 100644
--- a/crawl-ref/source/debug.h
+++ b/crawl-ref/source/debug.h
@@ -113,11 +113,6 @@ void debug_fight_statistics( bool use_init_defaults, bool defence = false );
void debug_list_monsters();
void debug_test_explore();
-
-// last updated 12 Jun 2008 {jpeg}
-/* ***********************************************************************
- * called from: directn
- * *********************************************************************** */
void error_message_to_player(void);
void debug_stethoscope(int mon);
diff --git a/crawl-ref/source/describe.h b/crawl-ref/source/describe.h
index a75829376a..ab07f30fa6 100644
--- a/crawl-ref/source/describe.h
+++ b/crawl-ref/source/describe.h
@@ -38,71 +38,37 @@ struct describe_info
void append_spells(std::string &desc, const item_def &item);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: chardump - spells4
- * *********************************************************************** */
bool is_dumpable_artefact( const item_def &item, bool verbose );
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: chardump - describe
- * *********************************************************************** */
std::string get_item_description( const item_def &item, bool verbose,
bool dump = false, bool noquote = false );
-// last updated 12 Jun 2008 {jpeg}
-/* ***********************************************************************
- * called from: acr - religion
- * *********************************************************************** */
std::string god_title(god_type which_god);
void describe_god( god_type which_god, bool give_title );
void describe_feature_wide(const coord_def& pos);
void get_feature_desc(const coord_def &gc, describe_info &inf);
-// last updated 24 Dec 2008 {mpc}
-/* ***********************************************************************
- * called from: l_dgn
- * *********************************************************************** */
void set_feature_desc_long(const std::string &raw_name,
const std::string &desc);
-/* ***********************************************************************
- * called from: item_use - shopping
- * *********************************************************************** */
void describe_item(item_def &item, bool allow_inscribe = false,
bool shopping = false);
void get_item_desc(const item_def &item, describe_info &inf,
bool terse = false);
void inscribe_item(item_def &item, bool proper_prompt);
-/* ***********************************************************************
- * called from: command
- * *********************************************************************** */
void append_weapon_stats(std::string &description, const item_def &item);
void append_armour_stats(std::string &description, const item_def &item);
void append_missile_info(std::string &description);
-// last updated 12 Jun 2008 {jpeg}
-/* ***********************************************************************
- * called from: command - direct
- * *********************************************************************** */
void describe_monsters(const monsters &mons, bool force_seen = false);
void get_monster_db_desc(const monsters &item, describe_info &inf,
bool force_seen = false);
-// last updated 12 Jun 2008 {jpeg}
-/* ***********************************************************************
- * called from: item_use - spl-cast
- * *********************************************************************** */
void get_spell_desc(const spell_type spell, describe_info &inf);
void describe_spell(spell_type spelled, const item_def* item = NULL);
-// last updated 13oct2003 {darshan}
-/* ***********************************************************************
- * called from: Kills - monstuff
- * *********************************************************************** */
std::string get_ghost_description(const monsters &mons, bool concise = false);
std::string get_skill_description(int skill, bool need_title = false);
diff --git a/crawl-ref/source/dlua.h b/crawl-ref/source/dlua.h
index 1e04dcd4e8..7e5bd9f573 100644
--- a/crawl-ref/source/dlua.h
+++ b/crawl-ref/source/dlua.h
@@ -72,6 +72,4 @@ public:
void init_dungeon_lua();
-//////////////////////////////////////////////////////////////////////////
-
#endif
diff --git a/crawl-ref/source/effects.h b/crawl-ref/source/effects.h
index c28ec1eb7f..fe13baee0f 100644
--- a/crawl-ref/source/effects.h
+++ b/crawl-ref/source/effects.h
@@ -16,26 +16,10 @@ struct bolt;
class monsters;
struct item_def;
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: ability - acr - beam - decks - fight - religion - spells
- * *********************************************************************** */
void banished(dungeon_feature_type gate_type, const std::string &who = "");
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: spells
- * *********************************************************************** */
bool forget_spell(void);
-
-// last updated 24may2000 {dlb}
-/* ***********************************************************************
- * called from: fight - it_use2 - it_use3 - items - religion - spells -
- * spells2 - spells4
- * *********************************************************************** */
bool lose_stat(unsigned char which_stat, unsigned char stat_loss,
bool force = false, const std::string cause = "",
bool see_source = true);
@@ -47,7 +31,6 @@ bool lose_stat(unsigned char which_stat, unsigned char stat_loss,
bool lose_stat(unsigned char which_stat, unsigned char stat_loss,
const item_def &cause, bool removed, bool force = false);
-// called from spells2 -cao
int mushroom_prob(item_def & corpse);
bool mushroom_spawn_message(int seen_targets, int seen_corpses);
@@ -71,18 +54,8 @@ int place_ring(std::vector<coord_def> & ring_points,
void collect_radius_points(std::vector<std::vector<coord_def> > &radius_points,
coord_def & origin, env_show_grid & losgrid);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: item_use - spell - spells
- * *********************************************************************** */
void random_uselessness(int scroll_slot = -1);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - decks - item_use - religion
- * *********************************************************************** */
bool acquirement(object_class_type force_class, int agent,
bool quiet = false, int *item_index = NULL);
@@ -91,31 +64,12 @@ int acquirement_create_item(object_class_type class_wanted,
bool quiet,
const coord_def &pos);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: item_use
- * *********************************************************************** */
bool recharge_wand(const int item_slot = -1);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: mon-cast
- * *********************************************************************** */
void direct_effect(monsters *src, spell_type spl, bolt &pbolt, actor *defender);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void yell(bool force = false);
-
-// last updated 24may2000 {dlb}
-/* ***********************************************************************
- * called from: item_use - spell
- * *********************************************************************** */
int holy_word(int pow, int caster, const coord_def& where, bool silent = false,
actor *attacker = NULL);
@@ -123,12 +77,6 @@ int holy_word_player(int pow, int caster, actor *attacker = NULL);
int holy_word_monsters(coord_def where, int pow, int caster,
actor *attacker = NULL);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: ability - decks - fight - it_use3 - item_use - mon-abil -
- * mon-cast - mon-util - spell
- * *********************************************************************** */
int torment(int caster, const coord_def& where);
int torment_player(int pow, int caster);
@@ -143,7 +91,6 @@ void conduct_electricity(coord_def where, actor *attacker);
void cleansing_flame(int pow, int caster, coord_def where,
actor *attacker = NULL);
-// called from: debug
void change_labyrinth(bool msg = false);
bool forget_inventory(bool quiet = false);
diff --git a/crawl-ref/source/files.h b/crawl-ref/source/files.h
index eded735f1b..23cb9d3041 100644
--- a/crawl-ref/source/files.h
+++ b/crawl-ref/source/files.h
@@ -83,19 +83,11 @@ bool load( dungeon_feature_type stair_taken, load_mode_type load_mode,
level_area_type old_level_type, char old_level,
branch_type where_were_you2 );
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - misc
- * *********************************************************************** */
void save_game(bool leave_game, const char *bye = NULL);
// Save game without exiting (used when changing levels).
void save_game_state();
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void restore_game(void);
bool apply_to_all_dungeons(bool (*applicator)());
@@ -117,16 +109,8 @@ public:
void go_to(const level_id &level);
};
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: ouch
- * *********************************************************************** */
void save_ghost( bool force = false );
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: files hiscores
- * *********************************************************************** */
std::string make_filename(std::string prefix, int level, branch_type branch,
level_area_type lt, bool isGhost );
diff --git a/crawl-ref/source/food.h b/crawl-ref/source/food.h
index b940275152..178bacb371 100644
--- a/crawl-ref/source/food.h
+++ b/crawl-ref/source/food.h
@@ -35,46 +35,17 @@ enum food_type
NUM_FOODS // 22
};
-
-// last updated 19jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool butchery(int which_corpse = -1);
-
-// last updated 19jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool eat_food(int slot = -1);
-
-// last updated 19jun2000 {dlb}
-/* ***********************************************************************
- * called from: abl-show - acr - fight - food - spell
- * *********************************************************************** */
void make_hungry(int hunger_amount, bool suppress_msg,
bool allow_reducing = false);
-// last updated 19jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr - fight - food - it_use2 - item_use
- * *********************************************************************** */
void lessen_hunger(int statiated_amount, bool suppress_msg);
-
-// last updated 19jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr - decks - food - religion
- * *********************************************************************** */
void set_hunger(int new_hunger_level, bool suppress_msg);
-
-// last updated 10sept2000 {bwr}
-/* ***********************************************************************
- * called from: delay.cc
- * *********************************************************************** */
void weapon_switch(int targ);
bool is_poisonous(const item_def &food);
diff --git a/crawl-ref/source/hiscores.h b/crawl-ref/source/hiscores.h
index 2d5f6b8f53..f2b4fd53a4 100644
--- a/crawl-ref/source/hiscores.h
+++ b/crawl-ref/source/hiscores.h
@@ -10,29 +10,13 @@
struct scorefile_entry;
-// last updated 16feb2001 {gdl}
-/* ***********************************************************************
- * called from: ouch
- * *********************************************************************** */
void hiscores_new_entry( const scorefile_entry &se );
-// last updated 02dec2006 {smm}
-/* ***********************************************************************
- * called from: ouch
- * *********************************************************************** */
void logfile_new_entry( const scorefile_entry &se );
-// last updated 16feb2001 {gdl}
-/* ***********************************************************************
- * called from: acr ouch
- * *********************************************************************** */
void hiscores_print_list( int display_count = -1, int format = SCORE_TERSE );
void hiscores_print_all(int display_count = -1, int format = SCORE_TERSE);
-// last updated 16feb2001 {gdl}
-/* ***********************************************************************
- * called from: ouch hiscores
- * *********************************************************************** */
std::string hiscores_format_single( const scorefile_entry &se );
std::string hiscores_format_single_long( const scorefile_entry &se,
bool verbose = false );
diff --git a/crawl-ref/source/initfile.h b/crawl-ref/source/initfile.h
index cf10cbb4bf..4a1339daf9 100644
--- a/crawl-ref/source/initfile.h
+++ b/crawl-ref/source/initfile.h
@@ -22,10 +22,6 @@ enum drop_mode_type
god_type str_to_god(std::string god);
int str_to_fprop (const std::string &str);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
std::string read_init_file(bool runscript = false);
void read_startup_prefs();
@@ -37,10 +33,6 @@ void parse_option_line(const std::string &line, bool runscript = false);
void apply_ascii_display(bool ascii);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void get_system_environment(void);
struct system_environment
@@ -80,11 +72,6 @@ public:
extern system_environment SysEnv;
-
-// last updated 16feb2001 {gdl}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool parse_args(int argc, char **argv, bool rc_only);
void write_newgame_options_file(void);
diff --git a/crawl-ref/source/it_use3.h b/crawl-ref/source/it_use3.h
index 9f281c4295..67767eabdd 100644
--- a/crawl-ref/source/it_use3.h
+++ b/crawl-ref/source/it_use3.h
@@ -8,32 +8,12 @@
#ifndef IT_USE3_H
#define IT_USE3_H
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: item_use
- * *********************************************************************** */
void skill_manual(int slot);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: item_use - spl-book
- * *********************************************************************** */
void tome_of_power(int slot);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool evoke_item(int slot = -1);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void noisy_equipment();
void shadow_lantern_effect();
void unrand_reacts();
diff --git a/crawl-ref/source/item_use.h b/crawl-ref/source/item_use.h
index 9fbd48605f..cc8522b76a 100644
--- a/crawl-ref/source/item_use.h
+++ b/crawl-ref/source/item_use.h
@@ -41,24 +41,10 @@ enum fire_type
struct bolt;
struct dist;
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - item_use
- * *********************************************************************** */
bool armour_prompt(const std::string & mesg, int *index, operation_types oper);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - item_use - items
- * *********************************************************************** */
bool takeoff_armour(int index);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void drink(int slot = -1);
bool elemental_missile_beam(int launcher_brand, int ammo_brand);
@@ -66,95 +52,42 @@ bool elemental_missile_beam(int launcher_brand, int ammo_brand);
bool safe_to_remove_or_wear(const item_def &item, bool remove,
bool quiet = false);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void examine_object(void);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool puton_ring(int slot = -1);
void jewellery_remove_effects(item_def &item, bool mesg = true);
-// called from: transfor
void jewellery_wear_effects(item_def &item);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void read_scroll(int slot = -1);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool remove_ring(int slot = -1, bool announce = false);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool item_is_quivered(const item_def &item);
int get_next_fire_item(int current, int offset);
int get_ammo_to_shoot(int item, dist &target, bool teleport = false);
void fire_thing(int item = -1);
void throw_item_no_quiver(void);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void wear_armour(int slot = -1);
bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary);
-// last updated 10Sept2001 {bwr}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool do_wear_armour(int item, bool quiet);
struct item_def;
-// last updated 30May2003 {ds}
-/* ***********************************************************************
- * called from: food
- * *********************************************************************** */
+
bool can_wield(item_def *weapon, bool say_why = false,
bool ignore_temporary_disability = false);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool wield_weapon(bool auto_wield, int slot = -1,
bool show_weff_messages = true, bool force = false,
bool show_unwield_msg = true);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void zap_wand(int slot = -1);
-
-// last updated 15jan2001 {gdl}
-/* ***********************************************************************
- * called from: item_use food
- * *********************************************************************** */
void wield_effects(int item_wield_2, bool showMsgs);
-// last updated 10sept2001 {bwr}
-/* ***********************************************************************
- * called from: delay.cc item_use.cc it_use2.cc
- * *********************************************************************** */
void use_artefact( unsigned char item_wield_2, bool *show_msgs = NULL);
void use_artefact(item_def &item, bool *show_msgs = NULL, bool unmeld = false);
diff --git a/crawl-ref/source/itemname.h b/crawl-ref/source/itemname.h
index 589c1b82d6..731c7b7443 100644
--- a/crawl-ref/source/itemname.h
+++ b/crawl-ref/source/itemname.h
@@ -97,9 +97,6 @@ std::string make_name(unsigned long seed, bool all_caps, int maxlen = -1,
const char* weapon_brand_name(const item_def& item, bool terse);
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void init_properties();
typedef FixedArray < item_type_id_state_type, NUM_IDTYPE, 50 > id_arr;
diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h
index 5d32ee4d21..dd0cac3de7 100644
--- a/crawl-ref/source/items.h
+++ b/crawl-ref/source/items.h
@@ -56,76 +56,35 @@ int item_on_floor(const item_def &item, const coord_def& where);
void init_item( int item );
-// last updated 13mar2001 {gdl}
-/* ***********************************************************************
- * called from: dungeon files
- * *********************************************************************** */
void link_items(void);
-// last updated 13mar2001 {gdl}
-/* ***********************************************************************
- * called from: files
- * *********************************************************************** */
void fix_item_coordinates(void);
-// last updated: 16oct2001 -- bwr
int get_item_slot( int reserve = 50 );
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: beam - fight - files - food - items - misc - monstuff -
- * religion - spells2 - spells3 - spells4
- * *********************************************************************** */
void unlink_item(int dest);
void destroy_item( item_def &item, bool never_created = false );
void destroy_item(int dest, bool never_created = false);
void destroy_item_stack( int x, int y, int cause = -1 );
void lose_item_stack( const coord_def& where );
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void item_check(bool verbose);
void request_autopickup(bool do_pickup = true);
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void pickup(void);
-/* ***********************************************************************
- * called from: directn
- * *********************************************************************** */
int item_name_specialness(const item_def& item);
void item_list_on_square( std::vector<const item_def*>& items,
int obj, bool force_squelch = false );
-// last updated 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: beam - items - transfor
- * *********************************************************************** */
bool copy_item_to_grid( const item_def &item, const coord_def& p,
int quant_drop = -1, // item.quantity by default
bool mark_dropped = false);
-// last updated Oct 15, 2000 -- bwr
-/* ***********************************************************************
- * called from: spells4.cc
- * *********************************************************************** */
bool move_top_item( const coord_def &src, const coord_def &dest );
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void drop(void);
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: command food item_use shopping spl-book transfor
- * *********************************************************************** */
int inv_count(void);
bool pickup_single_item(int link, int qty);
diff --git a/crawl-ref/source/lev-pand.h b/crawl-ref/source/lev-pand.h
index c3ac8ce8bc..8c8e18f6ff 100644
--- a/crawl-ref/source/lev-pand.h
+++ b/crawl-ref/source/lev-pand.h
@@ -8,19 +8,8 @@
#ifndef LEVPAND_H
#define LEVPAND_H
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: abyss - misc
- * *********************************************************************** */
void init_pandemonium(void);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - misc
- * *********************************************************************** */
void pandemonium_mons(void);
-
#endif
diff --git a/crawl-ref/source/message.h b/crawl-ref/source/message.h
index b25e43c090..4beb6f48e0 100644
--- a/crawl-ref/source/message.h
+++ b/crawl-ref/source/message.h
@@ -14,22 +14,10 @@
#include "enum.h"
#include "mpr.h"
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: ability - acr - command - direct - effects - item_use -
- * misc - player - spell - spl-book - spells1 - spells2 -
- * spells3
- * *********************************************************************** */
void mesclr(bool force = false);
void flush_prev_message();
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - bang - beam - decks - fight - files - it_use3 -
- * item_use - items - message - misc - ouch - player -
- * religion - spell - spells - spells2 - spells3
- * *********************************************************************** */
void more(bool user_forced = false);
@@ -70,16 +58,8 @@ void set_colour(char set_message_colour);
void reset_more_autoclear();
-// last updated 13oct2003 {dlb}
-/* ***********************************************************************
- * called from: chardump
- * *********************************************************************** */
std::string get_last_messages(int mcount);
-// last updated 31dec2008 {dlb}
-/* ***********************************************************************
- * called from: arena
- * *********************************************************************** */
std::vector<std::string> get_recent_messages(int &message_pos,
bool dumpworthy_only = true,
std::vector<int> *channels = NULL);
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h
index 737db0f517..c9c0e2eaee 100644
--- a/crawl-ref/source/misc.h
+++ b/crawl-ref/source/misc.h
@@ -43,24 +43,12 @@ void bleed_onto_floor(const coord_def& where, monster_type mon, int damage,
bool spatter = false, bool smell_alert = true);
void generate_random_blood_spatter_on_level();
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool check_annotation_exclusion_warning();
void up_stairs(dungeon_feature_type force_stair = DNGN_UNSEEN,
entry_cause_type entry_cause = EC_UNKNOWN);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - effects
- * *********************************************************************** */
std::string weird_glowing_colour();
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: it_use3
- * *********************************************************************** */
std::string weird_writing();
std::string weird_smell();
diff --git a/crawl-ref/source/mon-pick.h b/crawl-ref/source/mon-pick.h
index e77d756ad5..9fa7c42b83 100644
--- a/crawl-ref/source/mon-pick.h
+++ b/crawl-ref/source/mon-pick.h
@@ -10,39 +10,16 @@
#include "travel.h"
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - fight
- * *********************************************************************** */
int mons_rarity(int mcls, const level_id &place = level_id::current());
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon
- * *********************************************************************** */
int mons_level(int mcls, const level_id &place = level_id::current());
int mons_global_level(int mcls);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - mon-pick
- * *********************************************************************** */
bool mons_abyss(int mcls);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - mon-pick
- * *********************************************************************** */
int mons_rare_abyss(int mcls);
-
-// last updated 10jun2000 {dlb}
-/* ***********************************************************************
- * called from: levels - mon-pick
- * *********************************************************************** */
bool mons_pan(int mcls);
int mons_cocytus_level(int mcls);
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index b5cf2f9151..73f46da35d 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -462,10 +462,6 @@ monsterentry *get_monster_data(int p_monsterid);
const mon_resist_def &get_mons_class_resists(int mc);
mon_resist_def get_mons_resists(const monsters *mon);
-// last updated 10jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void init_monsters();
void init_monster_symbols();
@@ -476,11 +472,6 @@ std::string mons_type_name(int type, description_level_type desc);
bool give_monster_proper_name(monsters *mon, bool orcs_only = true);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * 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);
@@ -489,86 +480,40 @@ bool mons_amphibious(const monsters *mon);
bool mons_class_wall_shielded(int mc);
bool mons_wall_shielded(const monsters *mon);
-// last updated XXmay2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - monstuff
- * *********************************************************************** */
mon_itemuse_type mons_class_itemuse(int mc);
mon_itemuse_type mons_itemuse(const monsters *mon);
mon_itemeat_type mons_class_itemeat(int mc);
mon_itemeat_type mons_itemeat(const monsters *mon);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: beam - fight - monstuff - view
- * *********************************************************************** */
bool mons_sense_invis(const monsters *mon);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: view
- * *********************************************************************** */
int get_shout_noise_level(const shout_type shout);
shout_type mons_shouts(int mclass, bool demon_shout = false);
bool mons_is_ghost_demon(int mc);
bool mons_is_unique(int mc);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: describe - fight
- * *********************************************************************** */
-// int exper_value(int mclass, int mHD, int maxhp);
int mons_difficulty(int mtype);
int exper_value(const monsters *monster);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - mon-util
- * *********************************************************************** */
int hit_points(int hit_dice, int min_hp, int rand_hp);
int mons_type_hit_dice( int type );
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: beam - effects
- * *********************************************************************** */
int mons_resist_magic( const monsters *mon );
int mons_resist_turn_undead( const monsters *mon );
bool mons_immune_magic( const monsters *mon );
const char* mons_resist_string(const monsters *mon);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: fight - monstuff
- * *********************************************************************** */
int mons_damage(int mc, int rt);
mon_attack_def mons_attack_spec(const monsters *mon, int attk_number);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: food - spells4
- * *********************************************************************** */
corpse_effect_type mons_corpse_effect(int mc);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - fight - monstuff - mon-util
- * *********************************************************************** */
bool mons_class_flag(int mc, int bf);
int mons_unusable_items(const monsters *mon);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: beam - effects - fight - monstuff - mon-util - spells2 -
- * spells3 - spells4
- * *********************************************************************** */
mon_holy_type mons_class_holiness(int mc);
bool mons_is_mimic( int mc );
@@ -582,10 +527,6 @@ bool mons_is_summoned(const monsters *m, int* duration = NULL,
int *summon_info = NULL);
bool mons_is_shapeshifter(const monsters *m);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: monstuff - spells4 - view
- * *********************************************************************** */
mon_intel_type mons_class_intel(int mc);
mon_intel_type mons_intel(const monsters *mon);
@@ -600,34 +541,15 @@ habitat_type mons_secondary_habitat(const monsters *mon);
bool intelligent_ally(const monsters *mon);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - items - spells2 - spells4
- * *********************************************************************** */
bool mons_skeleton(int mc);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: describe - fight - items - misc - monstuff - mon-util -
- * player - spells2 - spells3
- * *********************************************************************** */
int mons_weight(int mc);
-
-// last updated 08may2001 {gdl}
-/* ***********************************************************************
- * called from: monplace mon-util
- * *********************************************************************** */
int mons_class_base_speed(int mc);
int mons_class_zombie_base_speed(int zombie_base_mc);
int mons_base_speed(const monsters *mon);
int mons_real_base_speed(int mc);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - mon-util - spells2
- * *********************************************************************** */
bool mons_class_can_regenerate(int mc);
bool mons_can_regenerate(const monsters *mon);
int mons_zombie_size(int mc);
@@ -645,25 +567,10 @@ bool mons_enslaved_soul(const monsters *mon);
bool name_zombie(monsters *mon, int mc, const std::string mon_name);
bool name_zombie(monsters *mon, const monsters* orig);
-
-// last updated 07jan2001 (gdl)
-/* ***********************************************************************
- * called from: beam
- * *********************************************************************** */
int mons_power(int mclass);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: spells2 - view
- * *********************************************************************** */
unsigned mons_char(int mc);
-
-// last updated 10jun2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - fight - misc
- * *********************************************************************** */
int mons_class_colour(int mc);
int mons_colour(const monsters *mon);
@@ -672,38 +579,15 @@ void mons_load_spells(monsters *mon, mon_spellbook_type book);
monster_type royal_jelly_ejectable_monster();
monster_type random_draconian_monster_species();
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - fight
- * *********************************************************************** */
void define_monster(int mid);
void define_monster(monsters &mons);
-// last updated 4jan2001 (gdl)
-/* ***********************************************************************
- * called from: delay - monstuff - spells1
- * *********************************************************************** */
void mons_pacify(monsters *mon);
-
-// last updated 4jan2001 (gdl)
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
bool mons_should_fire(struct bolt &beam);
-
-// last updated 23mar2001 (gdl)
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
bool ms_direct_nasty(spell_type monspell);
-// last updated 14jan2001 (gdl)
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
-
bool ms_useful_fleeing_out_of_sight(const monsters *mon, spell_type monspell);
bool ms_quick_get_away(const monsters *mon, spell_type monspell);
bool ms_waste_of_time(const monsters *mon, spell_type monspell);
@@ -717,24 +601,12 @@ bool mons_has_ranged_spell(const monsters *mon, bool attack_only = false,
bool mons_has_ranged_attack(const monsters *mon);
bool mons_has_ranged_ability(const monsters *mon);
-// last updated 06mar2001 (gdl)
-/* ***********************************************************************
- * called from:
- * *********************************************************************** */
const char *mons_pronoun(monster_type mon_type, pronoun_type variant,
bool visible = true);
-// last updated 14mar2001 (gdl)
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
bool mons_aligned(int m1, int m2);
bool mons_atts_aligned(mon_attitude_type fr1, mon_attitude_type fr2);
-// last updated 14mar2001 (gdl)
-/* ***********************************************************************
- * called from: monstuff acr
- * *********************************************************************** */
bool mons_friendly(const monsters *m);
bool mons_friendly_real(const monsters *m);
bool mons_neutral(const monsters *m);
@@ -797,11 +669,6 @@ bool mons_class_is_slowable(int mc);
bool mons_class_is_stationary(int mc);
bool mons_is_stationary(const monsters *mon);
-// last updated 15jul2009 (bh)
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
-
bool mons_is_fast( const monsters *mon );
bool mons_is_insubstantial(int mc);
diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h
index db490bcb44..0e402b1706 100644
--- a/crawl-ref/source/monplace.h
+++ b/crawl-ref/source/monplace.h
@@ -291,12 +291,6 @@ bool player_angers_monster(monsters *mon);
bool empty_surrounds( const coord_def& where, dungeon_feature_type spc_wanted,
int radius, bool allow_centre, coord_def& empty );
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: ability - acr - items - maps - mon-abil - mon-cast
- * - spell - spells
- * *********************************************************************** */
monster_type summon_any_demon(demon_class_type dct);
monster_type summon_any_holy_being(holy_being_class_type hbct);
@@ -305,9 +299,6 @@ monster_type summon_any_dragon(dragon_class_type dct);
bool drac_colour_incompatible(int drac, int colour);
-/* ***********************************************************************
- * called from: monplace monstuff
- * *********************************************************************** */
void mark_interesting_monst(monsters* monster,
beh_type behaviour = BEH_SLEEP);
@@ -327,16 +318,10 @@ coord_def find_newmons_square_contiguous(monster_type mons_class,
void spawn_random_monsters();
-/* ***********************************************************************
- * called from: luadgn
- * *********************************************************************** */
void set_vault_mon_list(const std::vector<mons_spec> &list);
void get_vault_mon_list(std::vector<mons_spec> &list);
-/* ***********************************************************************
- * called from: files
- * *********************************************************************** */
void setup_vault_mon_list();
int mons_tracking_range(const monsters *mon);
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h
index 1ef938ef93..c8df0edde0 100644
--- a/crawl-ref/source/monstuff.h
+++ b/crawl-ref/source/monstuff.h
@@ -48,7 +48,6 @@ public:
|| (x) == KILL_YOU_CONF)
#define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE)
-// useful macro
#define SAME_ATTITUDE(x) (mons_friendly_real(x) ? BEH_FRIENDLY : \
mons_good_neutral(x) ? BEH_GOOD_NEUTRAL : \
mons_strict_neutral(x) ? BEH_STRICT_NEUTRAL : \
@@ -59,15 +58,10 @@ public:
// for definition of type monsters {dlb}
#include "externs.h"
-// for definition of type monsters {dlb}
void get_mimic_item( const monsters *mimic, item_def & item );
int get_mimic_colour( const monsters *mimic );
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: fight - item_use - items - spell
- * *********************************************************************** */
void alert_nearby_monsters(void);
enum poly_power_type {
@@ -80,11 +74,6 @@ bool monster_polymorph(monsters *monster, monster_type targetc,
poly_power_type power = PPT_SAME,
bool force_beh = false);
-// last updated: 08jun2000 {dlb}
-/* **************************************************************************
- * 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);
@@ -103,10 +92,6 @@ bool mon_can_be_slimified(monsters *monster);
void mons_check_pool(monsters *monster, const coord_def &oldpos,
killer_type killer = KILL_NONE, int killnum = -1);
-// last updated: 17dec2000 {gdl}
-/* ***********************************************************************
- * called from: monstuff - fight
- * *********************************************************************** */
void monster_cleanup(monsters *monster);
int dismiss_monsters(std::string pattern);
@@ -117,16 +102,8 @@ bool curse_an_item(bool decay_potions, bool quiet = false);
void monster_drop_ething(monsters *monster, bool mark_item_origins = false,
int owner_id = NON_ITEM);
-/* ***********************************************************************
- * called from: fight
- * *********************************************************************** */
bool monster_blink(monsters *monster, bool quiet = false);
-/* ***********************************************************************
- * 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,
msg_channel_type channel = MSGCH_PLAIN,
int param = 0,
diff --git a/crawl-ref/source/newgame.h b/crawl-ref/source/newgame.h
index 5c58bb9813..3c1b65abd8 100644
--- a/crawl-ref/source/newgame.h
+++ b/crawl-ref/source/newgame.h
@@ -57,18 +57,12 @@ struct newgame_def
undead_state_type get_undead_state(const species_type sp);
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool new_game();
int give_first_conjuration_book();
bool choose_race(void);
bool choose_class(void);
-/* ***********************************************************************
- * called from: debug newgame
- * *********************************************************************** */
void give_basic_mutations(species_type speci);
#endif
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index b8c2c3af94..f4c18f543e 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -529,120 +529,49 @@ bool player_can_hit_monster(const monsters *mon);
bool player_is_shapechanged(void);
-/* ***********************************************************************
- * called from: player - item_use
- * *********************************************************************** */
bool is_light_armour( const item_def &item );
-/* ***********************************************************************
- * called from: beam - fight - misc - newgame
- * *********************************************************************** */
bool player_light_armour(bool with_skill = false);
-
-/* ***********************************************************************
- * called from: acr.cc - fight.cc - misc.cc - player.cc
- * *********************************************************************** */
bool player_in_water(void);
bool player_is_swimming(void);
bool player_is_airborne(void);
-/* ***********************************************************************
- * called from: ability - chardump - fight - religion - spell - spells -
- * spells0 - spells2
- * *********************************************************************** */
bool player_under_penance(void);
int player_wielded_item();
-/* ***********************************************************************
- * called from: ability - acr - fight - food - it_use2 - item_use - items -
- * misc - mutation - ouch
- * *********************************************************************** */
-
bool extrinsic_amulet_effect(jewellery_type amulet);
bool wearing_amulet(jewellery_type which_am, bool calc_unid = true);
-
-/* ***********************************************************************
- * called from: beam
- * *********************************************************************** */
bool you_resist_magic(int power);
-
-/* ***********************************************************************
- * called from: acr - decks - effects - it_use2 - it_use3 - item_use -
- * items - output - shopping - spells1 - spells3
- * *********************************************************************** */
int burden_change(void);
-
-/* ***********************************************************************
- * called from: items - misc
- * *********************************************************************** */
int carrying_capacity(burden_state_type bs = BS_OVERLOADED);
-
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
int check_stealth(void);
-
-/* ***********************************************************************
- * called from: bang - beam - chardump - fight - files - it_use2 -
- * item_use - misc - output - spells - spells1
- * *********************************************************************** */
int player_AC(void);
-
-/* ***********************************************************************
- * called from: spell
- * *********************************************************************** */
int player_energy(void);
-
-/* ***********************************************************************
- * called from: beam - chardump - fight - files - misc - output
- * *********************************************************************** */
int player_evasion(void);
-
-/* ***********************************************************************
- * called from: acr - spells1
- * *********************************************************************** */
int player_movement_speed(void);
-
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
int player_hunger_rate(void);
int calc_hunger(int food_cost);
-/* ***********************************************************************
- * called from: debug - it_use3 - spells0
- * *********************************************************************** */
int player_mag_abil(bool is_weighted);
int player_magical_power(void);
-/* ***********************************************************************
- * called from: fight - misc - ouch - spells
- * *********************************************************************** */
int player_prot_life(bool calc_unid = true, bool temp = true,
bool items = true);
-
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
int player_regen(void);
-
-/* ***********************************************************************
- * called from: fight - files - it_use2 - misc - ouch - spells - spells2
- * *********************************************************************** */
int player_res_cold(bool calc_unid = true, bool temp = true,
bool items = true);
int player_res_acid(bool calc_unid = true, bool items = true);
@@ -661,16 +590,9 @@ bool player_likes_water(bool permanently = false);
int player_mutation_level(mutation_type mut);
-/* ***********************************************************************
- * called from: fight - files - ouch
- * *********************************************************************** */
int player_res_electricity(bool calc_unid = true, bool temp = true,
bool items = true);
-
-/* ***********************************************************************
- * called from: acr - fight - misc - ouch - spells
- * *********************************************************************** */
int player_res_fire(bool calc_unid = true, bool temp = true,
bool items = true);
int player_res_sticky_flame(bool calc_unid = true, bool temp = true,
@@ -678,11 +600,6 @@ int player_res_sticky_flame(bool calc_unid = true, bool temp = true,
int player_res_steam(bool calc_unid = true, bool temp = true,
bool items = true);
-
-/* ***********************************************************************
- * called from: beam - decks - fight - fod - it_use2 - misc - ouch -
- * spells - spells2
- * *********************************************************************** */
int player_res_poison(bool calc_unid = true, bool temp = true,
bool items = true);
int player_res_rotting();
@@ -694,9 +611,6 @@ int player_res_magic(void);
int player_res_asphyx();
-/* ***********************************************************************
- * called from: beam - chardump - fight - misc - output
- * *********************************************************************** */
int player_shield_class(void);
@@ -711,47 +625,20 @@ int player_spec_holy(void);
int player_spec_poison(void);
int player_spec_summ(void);
-
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
int player_speed(void);
-
-/* ***********************************************************************
- * called from: chardump - spells
- * *********************************************************************** */
int player_spell_levels(void);
-/* ***********************************************************************
- * called from: libgui - item_use
- * *********************************************************************** */
bool player_knows_spell(int spell);
-// last updated 18may2000 {dlb}
-/* ***********************************************************************
- * called from: effects
- * *********************************************************************** */
int player_sust_abil(bool calc_unid = true);
void jiyva_stat_action();
-
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
int player_teleport(bool calc_unid = true);
-
-/* ***********************************************************************
- * called from: ability - acr - items - misc - spells1 - spells3
- * *********************************************************************** */
bool items_give_ability(const int slot, artefact_prop_type abil);
int scan_artefacts(artefact_prop_type which_property, bool calc_unid = true);
-
-/* ***********************************************************************
- * called from: fight - item_use
- * *********************************************************************** */
int slaying_bonus(char which_affected);
@@ -759,38 +646,17 @@ bool player_mesmerised_by(const monsters *mon);
void update_beholders(const monsters *mon, bool force = false);
void check_beholders();
-/* ***********************************************************************
- * called from: acr - decks - it_use2 - ouch
- * *********************************************************************** */
unsigned long exp_needed(int lev);
-
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
int get_expiration_threshold(duration_type dur);
bool dur_expiring(duration_type dur);
void display_char_status(void);
-
-/* ***********************************************************************
- * called from: item_use - items - misc - spells - spells3
- * *********************************************************************** */
void forget_map(unsigned char chance_forgotten = 100, bool force = false);
-
-// last updated 19may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - fight
- * *********************************************************************** */
void gain_exp(unsigned int exp_gained, unsigned int* actual_gain = NULL,
unsigned int* actual_avail_gain = NULL);
-// last updated 17dec2000 {gdl}
-/* ***********************************************************************
- * called from: acr - it_use2 - item_use - mutation - transfor - player -
- * misc - stuff
- * *********************************************************************** */
void modify_stat(stat_type which_stat, char amount, bool suppress_msg,
const std::string& cause, bool see_source = true);
void modify_stat(stat_type which_stat, char amount, bool suppress_msg,
@@ -803,17 +669,8 @@ void modify_stat(stat_type which_stat, char amount, bool suppress_msg,
bool player_in_bat_form();
bool player_can_open_doors();
-// last updated 19may2000 {dlb}
-/* ***********************************************************************
- * called from: decks - it_use2 - player
- * *********************************************************************** */
void level_change(bool skip_attribute_increase = false);
-
-/* ***********************************************************************
- * called from: ability - fight - item_use - mutation - newgame - spells0 -
- * transfor
- * *********************************************************************** */
bool player_genus( genus_type which_genus,
species_type species = SP_UNKNOWN );
bool is_player_same_species( const int mon, bool = false );
diff --git a/crawl-ref/source/skills.h b/crawl-ref/source/skills.h
index cfaf879081..1a4f295f09 100644
--- a/crawl-ref/source/skills.h
+++ b/crawl-ref/source/skills.h
@@ -11,11 +11,6 @@
int skill_cost_needed( int level );
void calc_total_skill_points( void );
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: ability - bang - beam - debug - fight - it_use3 - item_use -
- * items - misc - spell
- * *********************************************************************** */
int exercise(int exsk, int deg);
#endif
diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h
index 315531adc6..d4ab7630f3 100644
--- a/crawl-ref/source/spl-book.h
+++ b/crawl-ref/source/spl-book.h
@@ -21,10 +21,6 @@ enum read_book_action_type
RBOOK_READ_SPELL
};
-// updated 24may2000 {dlb}
-/* ***********************************************************************
- * called from: dungeon - effects - shopping
- * *********************************************************************** */
int book_rarity(unsigned char which_book);
int spell_rarity(spell_type which_spell);
void init_spell_rarities();
@@ -35,17 +31,8 @@ bool is_valid_spell_in_book( int splbook, int spell );
void mark_had_book(const item_def &book);
void mark_had_book(int booktype);
-// updated 24may2000 {dlb}
-/* ***********************************************************************
- * called from: it_use3 - item_use - spl-book
- * *********************************************************************** */
int read_book( item_def &item, read_book_action_type action );
-
-// updated 24may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool player_can_memorise(const item_def &book);
bool can_learn_spell(bool silent = false);
bool learn_spell();
diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h
index 630334f9b3..348a2c5dea 100644
--- a/crawl-ref/source/spl-cast.h
+++ b/crawl-ref/source/spl-cast.h
@@ -51,28 +51,14 @@ int calc_spell_power(spell_type spell, bool apply_intel,
bool fail_rate_chk = false, bool cap_power = true);
int spell_enhancement( unsigned int typeflags );
-// last updaetd 12may2000 {dlb}
-/* ***********************************************************************
- * called from: it_use3 - spell
- * *********************************************************************** */
void exercise_spell(spell_type spell_ex, bool spc, bool divide);
-
-// last updaetd 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
bool cast_a_spell( bool check_range, spell_type spell = SPELL_NO_SPELL );
bool maybe_identify_staff( item_def &item, spell_type spell = SPELL_NO_SPELL );
void inspect_spells();
-
-// last updaetd 12may2000 {dlb}
-/* ***********************************************************************
- * called from: ability - debug - it_use3 - spell
- * *********************************************************************** */
spret_type your_spells(spell_type spell, int powc = 0, bool allow_fail = true);
const char* failure_rate_to_string( int fail );
diff --git a/crawl-ref/source/spl-mis.h b/crawl-ref/source/spl-mis.h
index d322db75a0..0bf8eb0548 100644
--- a/crawl-ref/source/spl-mis.h
+++ b/crawl-ref/source/spl-mis.h
@@ -7,13 +7,6 @@
#ifndef SPL_MIS_H
#define SPL_MIS_H
-// last updated 23jul2008 {mpc}
-/* ***********************************************************************
- * called from: decks - effects - fight - item_use - it_use2 - it_use3 -
- * item_use - monstuff - religion - spells2 - spells4 -
- * spl-book - spl-cast - traps - xom
- * *********************************************************************** */
-
#include "enum.h"
#include "beam.h"
diff --git a/crawl-ref/source/traps.h b/crawl-ref/source/traps.h
index 3633b805aa..7f49e2bcca 100644
--- a/crawl-ref/source/traps.h
+++ b/crawl-ref/source/traps.h
@@ -13,18 +13,10 @@
struct bolt;
class monsters;
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr
- * *********************************************************************** */
void disarm_trap(const coord_def& where);
void remove_net_from( monsters *mon );
void free_self_from_net(void);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: acr - misc
- * *********************************************************************** */
void handle_traps(trap_type trt, int i, bool trap_known);
int get_trapping_net(const coord_def& where, bool trapped = true);
void mark_net_trapping(const coord_def& where);
diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index d64d56670e..2b08a3841f 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -53,10 +53,7 @@ enum run_mode_type
/* ***********************************************************************
* Initialises the travel subsystem.
- *
- * ***********************************************************************
- * called from: initfile (what's a better place to initialise stuff?)
- * *********************************************************************** */
+ */
void initialise_travel();
void init_travel_terrain_check(bool check_race_equip = true);
void stop_running(void);
@@ -86,10 +83,7 @@ bool is_travelsafe_square(const coord_def& c, bool ignore_hostile = false,
* If grab_items is true, greedy explore is triggered - in greedy mode, explore
* grabs items that are eligible for autopickup and visits (previously
* unvisited) shops.
- *
- * ***********************************************************************
- * called from: acr
- * *********************************************************************** */
+ */
void start_explore(bool grab_items = false);
struct level_pos;
diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h
index 172a1c54cd..52c8d0e470 100644
--- a/crawl-ref/source/version.h
+++ b/crawl-ref/source/version.h
@@ -129,9 +129,6 @@ namespace Version
std::string LDFLAGS();
}
-/* ***********************************************************************
- * called from: initfile debug
- * *********************************************************************** */
std::string compilation_info();
#endif