diff options
author | reaverb <reaverb.Crawl@gmail.com> | 2014-05-29 02:40:33 -0400 |
---|---|---|
committer | reaverb <reaverb.Crawl@gmail.com> | 2014-05-29 03:15:29 -0400 |
commit | 9bbef2017baef8a608198b92a8633c8f1f241148 (patch) | |
tree | 686010bec79e3950b6db49dbdc1fa1647b7e27cf /crawl-ref/source/items.cc | |
parent | bb107bb37675f7058088ab92ea94e3e1fd83c13f (diff) | |
download | crawl-ref-9bbef2017baef8a608198b92a8633c8f1f241148.tar.gz crawl-ref-9bbef2017baef8a608198b92a8633c8f1f241148.zip |
Remove AQ_CARD_GENIE on TAG_MAJOR_VERSION bump
Now that the Genie card is gone it has no reason to exist.
Diffstat (limited to 'crawl-ref/source/items.cc')
-rw-r--r-- | crawl-ref/source/items.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index fb4280f955..779d32a0dd 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1088,8 +1088,16 @@ bool origin_is_acquirement(const item_def& item, item_source_type *type) *type = IT_SRC_NONE; const int iorig = -item.orig_monnum; - if (iorig == AQ_SCROLL || iorig == AQ_CARD_GENIE - || iorig == AQ_WIZMODE) +#if TAG_MAJOR_VERSION == 34 +// Copy pasting is bad but this will autoupdate on version bump + if (iorig == AQ_CARD_GENIE) + { + *type = static_cast<item_source_type>(iorig); + return true; + } + +#endif + if (iorig == AQ_SCROLL || iorig == AQ_WIZMODE) { *type = static_cast<item_source_type>(iorig); return true; @@ -1123,9 +1131,11 @@ string origin_desc(const item_def &item) case AQ_SCROLL: desc += "You acquired " + _article_it(item) + " "; break; +#if TAG_MAJOR_VERSION == 34 case AQ_CARD_GENIE: desc += "You drew the Genie "; break; +#endif case AQ_WIZMODE: desc += "Your wizardly powers created "+ _article_it(item)+ " "; break; |