diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-21 04:25:09 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-21 04:25:09 +0000 |
| commit | 2fa3846021983d39a1eb1bdc1063b1678b6eae9e (patch) | |
| tree | a9147c8b1d9973f9a5ec11bf22cd7e8b2a023058 /crawl-ref/source | |
| parent | ebe5e29212f88a4db612ffe5707c08aaa01f818e (diff) | |
| download | crawl-ref-2fa3846021983d39a1eb1bdc1063b1678b6eae9e.tar.gz crawl-ref-2fa3846021983d39a1eb1bdc1063b1678b6eae9e.zip | |
Fixed buggy runes introduced by branch refactoring.
Breaks savefiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@683 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/enum.h | 22 | ||||
| -rw-r--r-- | crawl-ref/source/mon-pick.cc | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index b4ec68e2f8..51151c5d09 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2863,17 +2863,17 @@ enum run_mode_type enum rune_type { - // Note: that runes DIS-SWAMP have the same numberic value as the branch - RUNE_DIS = 1, - RUNE_GEHENNA, - RUNE_COCYTUS = 4, - RUNE_TARTARUS, - RUNE_SLIME_PITS = 13, - RUNE_VAULTS, - RUNE_SNAKE_PIT = 19, - RUNE_ELVEN_HALLS, // unused - RUNE_TOMB, - RUNE_SWAMP, + // Note: that runes DIS-SWAMP have the same numeric value as the branch + RUNE_DIS = BRANCH_DIS, + RUNE_GEHENNA = BRANCH_GEHENNA, + RUNE_COCYTUS = BRANCH_COCYTUS, + RUNE_TARTARUS = BRANCH_TARTARUS, + RUNE_SLIME_PITS = BRANCH_SLIME_PITS, + RUNE_VAULTS = BRANCH_VAULTS, + RUNE_SNAKE_PIT = BRANCH_SNAKE_PIT, + RUNE_ELVEN_HALLS = BRANCH_ELVEN_HALLS, // unused + RUNE_TOMB = BRANCH_TOMB, + RUNE_SWAMP = BRANCH_SWAMP, // Runes 50 and 51 are for Pandemonium (general demon) and the Abyss RUNE_DEMONIC = 50, diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 74455c17a1..73bda905e3 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -29,7 +29,7 @@ int mons_level(int mcls) else if (you.level_type == LEVEL_PANDEMONIUM) monster_level = ((mons_pan(mcls)) ? 52 : 0); else - monster_level = branches[you.where_are_you].mons_level_function(mcls); + monster_level=branches[(int)you.where_are_you].mons_level_function(mcls); return monster_level; } @@ -42,7 +42,7 @@ int mons_rarity(int mcls) if (you.level_type == LEVEL_ABYSS) return mons_rare_abyss(mcls); else - return branches[you.where_are_you].mons_rarity_function(mcls); + return branches[(int)you.where_are_you].mons_rarity_function(mcls); } bool mons_abyss(int mcls) |