From d775567ab5dcdba8bb73b0f9771f84a0258e3405 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 4 Nov 2007 20:19:28 +0000 Subject: Renaming Portal Vaults to Bazaars. [FR 1824984] Fix 1825526: not stepping into deep water costing a turn Fix 1825352: ?torment only being unholy if it wasn't known git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2753 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/acr.cc | 3 ++- crawl-ref/source/item_use.cc | 2 +- crawl-ref/source/misc.cc | 7 ++++++- crawl-ref/source/place.cc | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index b868e61bee..020bc11f50 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3760,7 +3760,8 @@ static void move_player(int move_x, int move_y) { you.time_taken *= player_movement_speed(); you.time_taken /= 10; - move_player_to_grid(targ_x, targ_y, true, false, swap); + if (!move_player_to_grid(targ_x, targ_y, true, false, swap)) + return; if (you.mutation[MUT_DRIFTING] && (random2(100) <= you.mutation[MUT_DRIFTING] * 5) ) diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index b51767562d..0e058e912e 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3772,7 +3772,7 @@ void read_scroll(void) torment( TORMENT_SCROLL, you.x_pos, you.y_pos ); // is only naughty if you know you're doing it - if (!item_type_known(scroll)) + if (item_type_known(scroll)) did_god_conduct(DID_UNHOLY, 10); break; diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 3328530bd4..24e3d1737a 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1306,7 +1306,12 @@ std::string level_description_string() return "- a Labyrinth"; if (you.level_type == LEVEL_PORTAL_VAULT) - return "- a Portal Chamber"; + { + if (you.level_type_name == "bazaar") + return "- a Bazaar"; + + return "- a Portal Chamber"; + } // level_type == LEVEL_DUNGEON char buf[200]; diff --git a/crawl-ref/source/place.cc b/crawl-ref/source/place.cc index 7e469b4b28..fc89dbd60b 100644 --- a/crawl-ref/source/place.cc +++ b/crawl-ref/source/place.cc @@ -87,6 +87,9 @@ std::string place_name( unsigned short place, bool long_name, case LEVEL_LABYRINTH: return ( long_name ? "a Labyrinth" : "Lab" ); case LEVEL_PORTAL_VAULT: + if ( you.level_type_name == "bazaar" ) + return ( long_name ? "a Bazaar" : "Bazaar" ); + return ( long_name ? "a Portal Chamber" : "Port" ); default: return ( long_name ? "Buggy Badlands" : "Bug" ); -- cgit v1.2.3-54-g00ecf