diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
| commit | 1d0f57cbceb778139ca215cc4fcfd1584951f6dd (patch) | |
| tree | cafd60c944c51fcce778aa5d6912bc548c518339 /crawl-ref/source/mstuff2.h | |
| parent | 6f5e187a9e5cd348296dba2fd89d2e206e775a01 (diff) | |
| download | crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.tar.gz crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.zip | |
Merged stone_soup r15:451 into trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mstuff2.h')
| -rw-r--r-- | crawl-ref/source/mstuff2.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/crawl-ref/source/mstuff2.h b/crawl-ref/source/mstuff2.h index 1bdd23232f..aedb2cdcd0 100644 --- a/crawl-ref/source/mstuff2.h +++ b/crawl-ref/source/mstuff2.h @@ -3,6 +3,8 @@ * Summary: Misc monster related functions. * Written by: Linley Henzell * + * Modified for Crawl Reference by $Author$ on $Date$ + * * Change History (most recent first): * * <1> 4/24/99 JDJ mons_spells returns an @@ -19,22 +21,6 @@ #include "externs.h" -struct SBeam -{ - std::string name; - int colour; - int range; - int rangeMax; - int hit; - dice_def damage; - int ench_power; - int type; - int flavour; - int thrown; - bool isBeam; -}; - - /* beam_colour = _pass[0]; beam_range = _pass[1]; @@ -50,7 +36,7 @@ struct SBeam /* *********************************************************************** * called from: monstuff - mstuff2 * *********************************************************************** */ -struct SBeam mons_spells(int spell_cast, int power); +bolt mons_spells(int spell_cast, int power); // last updated 12may2000 {dlb} @@ -95,7 +81,8 @@ void mons_trap(struct monsters *monster); /* *********************************************************************** * called from: beam - fight - files - monstuff - mstuff2 - spells4 * *********************************************************************** */ -void monster_teleport(struct monsters *monster, bool instan); +void monster_teleport(struct monsters *monster, bool instan, + bool silent = false); // last updated Dec17,2000 -- gdl @@ -113,5 +100,7 @@ void throw_type(int lnchClass, int lnchType, int wepClass, int wepType, bool &launched, bool &thrown); +bool orange_statue_effects(monsters *mons); +bool silver_statue_effects(monsters *mons); #endif |