diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-09 15:30:30 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-09 15:30:30 +0000 |
| commit | 1798905e716ab714da4ec70262532988b58356cd (patch) | |
| tree | 12e1fa445562b6840492ae4f6acabed0199f3ab5 /crawl-ref/source/externs.h | |
| parent | 55826a15202764602ab3ad81cdeb3dd37ee9cb0b (diff) | |
| download | crawl-ref-1798905e716ab714da4ec70262532988b58356cd.tar.gz crawl-ref-1798905e716ab714da4ec70262532988b58356cd.zip | |
Added ice statues.
Monster spells now use spell_type instead of the old mon_spell_type.
Fixed buggy behaviour when banished from Labyrinth.
DGL_WHEREIS was not including current time, fixed.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1275 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/externs.h')
| -rw-r--r-- | crawl-ref/source/externs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index d1fe6e9107..df541c675f 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -599,7 +599,7 @@ public: int burden; burden_state_type burden_state; - FixedVector<unsigned char, 25> spells; + FixedVector<spell_type, 25> spells; char spell_no; unsigned char char_direction; // @@ -811,13 +811,13 @@ public: extern player you; -class monster_spells : public FixedVector<int, NUM_MONSTER_SPELL_SLOTS> +class monster_spells : public FixedVector<spell_type, NUM_MONSTER_SPELL_SLOTS> { public: monster_spells() - : FixedVector<int, NUM_MONSTER_SPELL_SLOTS>(MS_NO_SPELL) + : FixedVector<spell_type, NUM_MONSTER_SPELL_SLOTS>(SPELL_NO_SPELL) { } - void clear() { init(MS_NO_SPELL); } + void clear() { init(SPELL_NO_SPELL); } }; struct mon_attack_def |