diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-31 14:49:01 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-31 14:50:26 +0100 |
| commit | f8ab5653d8d2df09a719ff09ad51f2cf5294ec8c (patch) | |
| tree | 03e842701ef2919242ee4e680a0ae22ab0fc6b83 /crawl-ref/source/enum.h | |
| parent | 1b66d630c184ea4f9be104414c18773fc18cb72b (diff) | |
| parent | 9939a9514e001f19dc384d8ae8b27940327afbe8 (diff) | |
| download | crawl-ref-f8ab5653d8d2df09a719ff09ad51f2cf5294ec8c.tar.gz crawl-ref-f8ab5653d8d2df09a719ff09ad51f2cf5294ec8c.zip | |
Merge branch 'iood'
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 7dfc0255a7..58487ff6a9 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -431,6 +431,7 @@ enum cloud_type CLOUD_CHAOS, CLOUD_RAIN, CLOUD_MUTAGENIC, + CLOUD_MAGIC_TRAIL, CLOUD_RANDOM = 98, CLOUD_DEBUGGING = 99 // 99: used once as 'nonexistent cloud' {dlb} }; @@ -1663,8 +1664,8 @@ enum monster_type // (int) menv[].type MONS_KOBOLD_DEMONOLOGIST, MONS_ORC_WIZARD, MONS_ORC_KNIGHT, // 55 - //MONS_WORM_TAIL = 56, // deprecated and now officially removed {dlb} - MONS_WYVERN = 57, // 57 + MONS_ORB_OF_DESTRUCTION, // a projectile, not a real mon + MONS_WYVERN, MONS_BIG_KOBOLD, MONS_GIANT_EYEBALL, MONS_WIGHT, // 60 @@ -2921,6 +2922,7 @@ enum spell_type SPELL_SUMMON_PLAYER_GHOST, SPELL_PRIMAL_WAVE, SPELL_CALL_TIDE, + SPELL_IOOD, NUM_SPELLS }; @@ -3169,6 +3171,7 @@ enum zap_type ZAP_PORKALATOR, ZAP_SLEEP, ZAP_PRIMAL_WAVE, + ZAP_IOOD, NUM_ZAPS }; |