summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/command.cc15
-rw-r--r--crawl-ref/source/delay.cc2
-rw-r--r--crawl-ref/source/monstuff.cc13
-rw-r--r--crawl-ref/source/place.cc2
-rw-r--r--crawl-ref/source/shopping.cc5
-rw-r--r--crawl-ref/source/tile2.cc3
-rw-r--r--crawl-ref/source/tilepick.cc6
7 files changed, 19 insertions, 27 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 072fae928a..6dec8688a0 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -2056,6 +2056,7 @@ static void _add_formatted_keyhelp(column_composer &cols)
// Initialize colour to quiet some Valgrind warnings
unsigned short colour = BLACK;
std::string item_types =
+ "\n"
"<h>Item types (and common commands)\n"
"<cyan>)</cyan> : hand weapons (<w>w</w>ield)\n"
"<brown>(</brown> : missiles (<w>Q</w>uiver, <w>f</w>ire, <w>()</w> cycle)\n"
@@ -2168,7 +2169,8 @@ static void _add_formatted_keyhelp(column_composer &cols)
"<w>r</w> : Read a scroll or book\n"
"<w>M</w> : Memorise a spell from a book\n"
"<w>w</w> : Wield an item ( <w>-</w> for none)\n"
- "<w>'</w> : wield item a, or switch to b\n"
+ "<w>'</w> : wield item a, or switch to b \n"
+ " (use <w>=</w> to assign slots)\n"
"<w>v</w> : eVoke power of wielded item\n"
"<w>W</w>/<w>T</w> : Wear or Take off armour\n"
"<w>P</w>/<w>R</w> : Put on or Remove jewellery\n",
@@ -2180,16 +2182,17 @@ static void _add_formatted_keyhelp(column_composer &cols)
interact =
"<h>Item Interaction (floor):\n"
"<w>,</w> : pick up items (also <w>g</w>) \n"
- " (press twice for pick up menu) \n"
+ " (press twice for pick up menu)\n"
"<w>d</w> : Drop an item\n"
- "<w>d#</w>: Drop exact number of items \n"
- "<w>c</w> : Chop up a corpse ";
+ "<w>d#</w>: Drop exact number of items\n"
+ "<w>c</w> : Chop up a corpse";
if (you.species == SP_VAMPIRE && you.experience >= 6)
- interact += "or bottle its blood ";
+ interact += " or bottle its blood";
interact +=
- "\n<w>e</w> : Eat food from floor \n";
+ "\n"
+ "<w>e</w> : Eat food from floor\n";
cols.add_formatted(
1, interact,
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 1bb9808b55..ad79aca423 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -1335,7 +1335,7 @@ static void _finish_delay(const delay_queue_item &delay)
case DELAY_INTERRUPTIBLE:
case DELAY_UNINTERRUPTIBLE:
- // these are simple delays that have no effect when complete
+ // These are simple delays that have no effect when complete.
break;
default:
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index c625891ae4..51e6d292ac 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1889,9 +1889,7 @@ static bool _valid_morph( monsters *monster, int new_mclass )
// Other poly-unsuitable things.
|| new_mclass == MONS_ORB_GUARDIAN
- || new_mclass == MONS_ORANGE_STATUE
- || new_mclass == MONS_SILVER_STATUE
- || new_mclass == MONS_ICE_STATUE)
+ || mons_is_statue(new_mclass))
{
return (false);
}
@@ -4646,9 +4644,8 @@ static void _handle_movement(monsters *monster)
if (crawl_state.arena && Options.arena_force_ai
&& !mons_is_stationary(monster))
{
- const bool ranged =
- mons_has_ranged_attack(monster)
- || mons_has_ranged_spell(monster);
+ const bool ranged = (mons_has_ranged_attack(monster)
+ || mons_has_ranged_spell(monster));
// Smiters are happy if they have clear visibility through
// glass, but other monsters must go around.
@@ -4657,8 +4654,8 @@ static void _handle_movement(monsters *monster)
// Monsters in the arena are smarter than the norm and
// always pathfind to their targets.
if (delta.abs() > 2
- && (!ranged ||
- !monster->mon_see_grid(monster->target, !glass_ok)))
+ && (!ranged
+ || !monster->mon_see_grid(monster->target, !glass_ok)))
{
monster_pathfind mp;
if (mp.init_pathfind(monster, monster->target))
diff --git a/crawl-ref/source/place.cc b/crawl-ref/source/place.cc
index eff31d5aa5..c035e3f96e 100644
--- a/crawl-ref/source/place.cc
+++ b/crawl-ref/source/place.cc
@@ -156,7 +156,7 @@ std::string prep_branch_level_name()
int absdungeon_depth(branch_type branch, int subdepth)
{
- if (branch >= BRANCH_VESTIBULE_OF_HELL && branch <= BRANCH_THE_PIT)
+ if (branch >= BRANCH_VESTIBULE_OF_HELL && branch <= BRANCH_LAST_HELL)
return subdepth + 27 - (branch == BRANCH_VESTIBULE_OF_HELL);
else
{
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 18ea77e3d2..8b365b3885 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -120,10 +120,11 @@ static void _list_shop_keys(const std::string &purchasable, bool viewing)
cgotoxy(1, numlines, GOTO_CRT);
fs = formatted_string::parse_string(
- "[<w>?</w>/<w>*</w>] Inventory [<w>\\</w>] Known Items "
#ifdef USE_TILE
+ "[<w>?</w>/<w>*</w>] Inventory [<w>\\</w>] Known Items "
"[<w>Enter</w>/<w>L-Click</w>] Make Purchase");
#else
+ "[<w>?</w>/<w>*</w>] Inventory [<w>\\</w>] Known Items "
"[<w>Enter</w>] Make Purchase");
#endif
fs.cprintf("%*s", get_number_of_cols() - fs.length() - 1, "");
@@ -1742,12 +1743,12 @@ unsigned int item_value( item_def item, bool ident )
static void _delete_shop(int i)
{
grd(you.pos()) = DNGN_ABANDONED_SHOP;
-// env.shop.erase(i);
unnotice_feature(level_pos(level_id::current(), you.pos()));
}
void shop()
{
+ flush_prev_message();
int i;
for (i = 0; i < MAX_SHOPS; i++)
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index dc6eb07898..680daee858 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -176,9 +176,6 @@ void tile_default_flv(level_area_type lev, branch_type br, tile_flavour &flv)
flv.floor = TILE_FLOOR_TOMB;
return;
- case BRANCH_INFERNO:
- case BRANCH_THE_PIT:
- case BRANCH_CAVERNS:
case NUM_BRANCHES:
break;
}
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 1f7efcd22e..1f305c67f5 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2444,9 +2444,6 @@ int tileidx_feature(int object, int gx, int gy)
case DNGN_ENTER_TOMB:
case DNGN_ENTER_SWAMP:
case DNGN_ENTER_SHOALS:
- case DNGN_ENTER_RESERVED_2:
- case DNGN_ENTER_RESERVED_3:
- case DNGN_ENTER_RESERVED_4:
return TILE_DNGN_ENTER;
case DNGN_RETURN_FROM_ORCISH_MINES:
case DNGN_RETURN_FROM_HIVE:
@@ -2462,9 +2459,6 @@ int tileidx_feature(int object, int gx, int gy)
case DNGN_RETURN_FROM_TOMB:
case DNGN_RETURN_FROM_SWAMP:
case DNGN_RETURN_FROM_SHOALS:
- case DNGN_RETURN_RESERVED_2:
- case DNGN_RETURN_RESERVED_3:
- case DNGN_RETURN_RESERVED_4:
return TILE_DNGN_RETURN;
case DNGN_ENTER_PORTAL_VAULT:
case DNGN_EXIT_PORTAL_VAULT:
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-20 16:01:25 +0000