diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-31 18:41:16 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-31 18:41:16 +0000 |
| commit | 0ca19d27dea350d314c9aa6d6c733bc6d15b5af6 (patch) | |
| tree | a5e76b1c45e527471c54ea788ba98b7c58cf426a /crawl-ref/source/view.cc | |
| parent | 522d82aa2e3f30bba891843b44904741ab790659 (diff) | |
| download | crawl-ref-0ca19d27dea350d314c9aa6d6c733bc6d15b5af6.tar.gz crawl-ref-0ca19d27dea350d314c9aa6d6c733bc6d15b5af6.zip | |
Code cleanups, mainly in clouds.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8865 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/view.cc')
| -rw-r--r-- | crawl-ref/source/view.cc | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index dce2984de8..6bd9e82b11 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -5180,36 +5180,12 @@ void viewwindow(bool draw_it, bool do_updates) #endif // Print tutorial messages for features in LOS. - if (Options.tutorial_left && in_bounds(gc) - && crawl_view.in_grid_los(gc)) + if (Options.tutorial_left + && in_bounds(gc) + && crawl_view.in_grid_los(gc) + && env.show(ep)) { - const int object = env.show(ep); - if (object && Options.tutorial_left) - { - if (grid_is_escape_hatch(grd(gc))) - { - learned_something_new(TUT_SEEN_ESCAPE_HATCH, gc); - } - else if (grid_is_branch_stairs(grd(gc))) - learned_something_new(TUT_SEEN_BRANCH, gc); - else if (is_feature('>', gc)) - { - learned_something_new(TUT_SEEN_STAIRS, gc); - } - else if (is_feature('_', gc)) - learned_something_new(TUT_SEEN_ALTAR, gc); - else if (grd(gc) == DNGN_CLOSED_DOOR) - learned_something_new(TUT_SEEN_DOOR, gc); - else if (grd(gc) == DNGN_ENTER_SHOP) - learned_something_new(TUT_SEEN_SHOP, gc); - - if (igrd(gc) != NON_ITEM - && Options.feature_item_brand != CHATTR_NORMAL - && (is_feature('>', gc) || is_feature('<', gc))) - { - learned_something_new(TUT_STAIR_BRAND, gc); - } - } + tutorial_observe_cell(gc); } // Order is important here. |