Massive change from using x and y to using coord_defs(). Not quite tested,

most likely broken in some places and might break tiles. Will fix in the
near future.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6636 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 67 deletions

diff --git a/crawl-ref/source/mstuff2.h b/crawl-ref/source/mstuff2.h
index 6c364f8eeb..d84cd2f435 100644
--- a/crawl-ref/source/mstuff2.h
+++ b/crawl-ref/source/mstuff2.h
@@ -22,79 +22,17 @@
 
 struct bolt;
 
-/*
-   beam_colour = _pass[0];
-   beam_range = _pass[1];
-   beam_damage = _pass[2];
-   beam_hit = _pass[3];
-   beam_type = _pass[4];
-   beam_flavour = _pass[5];
-   thing_thrown = _pass[6];
- */
-
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: monstuff - mstuff2
- * *********************************************************************** */
 bolt mons_spells(monsters *mons, spell_type spell_cast, int power);
-
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
-void setup_dragon(monsters *monster, struct bolt &pbolt);
-
-
-// last updated 13feb2001 {gdl}
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
+void setup_dragon(monsters *monster, bolt &pbolt);
 void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast);
-
-// last updated 7jan2001 {gdl}
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
-void setup_mons_cast(monsters *monster, bolt &pbolt,
-                     spell_type spell_cast);
-
-// last updated 28july2000 (gdl)
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
-bool mons_throw(monsters *monster, struct bolt &pbolt, int hand_used);
-
-bool mons_thrown_object_destroyed( item_def *item, int x, int y,
+void setup_mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast);
+bool mons_throw(monsters *monster, bolt &pbolt, int hand_used);
+bool mons_thrown_object_destroyed( item_def *item, const coord_def& where,
                                    bool returning, int midx );
-
-// last updated 07jan2001 (gdl)
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
-void setup_generic_throw(monsters *monster, struct bolt &pbolt);
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
+void setup_generic_throw(monsters *monster, bolt &pbolt);
 void mons_trap(monsters *monster);
-
-
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: beam - fight - files - monstuff - mstuff2 - spells4
- * *********************************************************************** */
 void monster_teleport(monsters *monster, bool instan, bool silent = false);
-
-
-// last updated Dec17,2000 -- gdl
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
 void spore_goes_pop(monsters *monster);
-
 bool orc_battle_cry(monsters *chief);
 bool orange_statue_effects(monsters *mons);
 bool silver_statue_effects(monsters *mons);