diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-28 08:47:30 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-28 08:47:30 +0000 |
| commit | 20a6609453ee2b51c388c296516c1abc1beab1d2 (patch) | |
| tree | 201d735a3a4d66471005cb763078a6c05056752c /crawl-ref/source/decks.cc | |
| parent | 7aed4c41d7fa0f9d70df56a82abbe69061e56269 (diff) | |
| download | crawl-ref-20a6609453ee2b51c388c296516c1abc1beab1d2.tar.gz crawl-ref-20a6609453ee2b51c388c296516c1abc1beab1d2.zip | |
Preliminary integration of Zooko's Xom patch (untested).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1489 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 3e995593ae..1015ae6594 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -144,7 +144,6 @@ static card_type deck_of_punishment[] = CARD_PANDEMONIUM }; -#define ARRAYSIZE(x) (sizeof(x) / sizeof(x[0])) #define DECK_WONDERS_SIZE ARRAYSIZE(deck_of_wonders) #define DECK_SUMMONING_SIZE ARRAYSIZE(deck_of_summoning) #define DECK_TRICKS_SIZE ARRAYSIZE(deck_of_tricks) @@ -889,7 +888,7 @@ void card_effect(card_type which_card) case CARD_TELEPORT_NOW: mpr( "You have drawn the Portal of Instantaneous Transposition." ); - you_teleport2( true, true ); // in abyss, always to new area + you_teleport_now( true, true ); // in abyss, always to new area break; case CARD_RAGE: @@ -913,7 +912,7 @@ void card_effect(card_type which_card) case CARD_XOM: mpr("You have drawn the card of Xom!"); - Xom_acts( true, 5 + random2( you.skills[SK_EVOCATIONS] ), true ); + xom_acts( true, 5 + random2( you.skills[SK_EVOCATIONS] )); break; case CARD_SLOW: |