summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg-inv.cc
diff options
context:
space:
mode:
authorRobert Burnham <burnhamrobertp@gmail.com>2011-10-25 15:38:46 -0500
committerRobert Burnham <burnhamrobertp@gmail.com>2011-10-25 15:38:46 -0500
commitce5cd1e9df7f220ee7d07b285b76473ec9fb928f (patch)
tree9f56ef300bc15746c2cde58dcbd09c2df1bdac95 /crawl-ref/source/tilereg-inv.cc
parent71b738e8b44d6dad14c29bc898eff2ac700e9e1e (diff)
parent5efc2ebb172e0046e26e8b4a5114359f2e217628 (diff)
downloadcrawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.tar.gz
crawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.zip
Merge branch 'master' into unified_combat_control
Conflicts: crawl-ref/source/Makefile.obj crawl-ref/source/dbg-scan.cc crawl-ref/source/decks.cc crawl-ref/source/describe.cc crawl-ref/source/directn.cc crawl-ref/source/evoke.cc crawl-ref/source/fight.cc crawl-ref/source/fight.h crawl-ref/source/ghost.cc crawl-ref/source/ghost.h crawl-ref/source/item_use.cc crawl-ref/source/items.cc crawl-ref/source/map_knowledge.cc crawl-ref/source/melee_attack.h crawl-ref/source/mon-abil.cc crawl-ref/source/mon-act.cc crawl-ref/source/mon-stuff.cc crawl-ref/source/monster.cc crawl-ref/source/monster.h crawl-ref/source/player.cc crawl-ref/source/player.h crawl-ref/source/shopping.cc crawl-ref/source/spl-damage.cc crawl-ref/source/spl-summoning.cc crawl-ref/source/spl-transloc.cc crawl-ref/source/stairs.cc crawl-ref/source/stuff.cc crawl-ref/source/tags.cc crawl-ref/source/traps.cc crawl-ref/source/xom.cc
Diffstat (limited to 'crawl-ref/source/tilereg-inv.cc')
-rw-r--r--crawl-ref/source/tilereg-inv.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/tilereg-inv.cc b/crawl-ref/source/tilereg-inv.cc
index 4fd17b8110..ef584db04a 100644
--- a/crawl-ref/source/tilereg-inv.cc
+++ b/crawl-ref/source/tilereg-inv.cc
@@ -1,6 +1,6 @@
#include "AppHdr.h"
-#ifdef USE_TILE
+#ifdef USE_TILE_LOCAL
#include "tilereg-inv.h"
@@ -360,7 +360,7 @@ bool InventoryRegion::update_tip_text(std::string& tip)
// first equipable categories
case OBJ_WEAPONS:
case OBJ_STAVES:
- if (you.species != SP_CAT)
+ if (you.species != SP_FELID)
{
_handle_wield_tip(tmp, cmd);
if (is_throwable(&you, item))
@@ -404,7 +404,7 @@ bool InventoryRegion::update_tip_text(std::string& tip)
_handle_wield_tip(tmp, cmd, "\n[Ctrl + L-Click] ", true);
break;
case OBJ_ARMOUR:
- if (you.species != SP_CAT)
+ if (you.species != SP_FELID)
{
tmp += "Wear (%)";
cmd.push_back(CMD_WEAR_ARMOUR);
@@ -423,7 +423,7 @@ bool InventoryRegion::update_tip_text(std::string& tip)
cmd.push_back(CMD_REMOVE_JEWELLERY);
break;
case OBJ_MISSILES:
- if (you.species != SP_CAT)
+ if (you.species != SP_FELID)
{
tmp += "Fire (%)";
cmd.push_back(CMD_FIRE);
@@ -433,7 +433,7 @@ bool InventoryRegion::update_tip_text(std::string& tip)
}
break;
case OBJ_WANDS:
- if (you.species != SP_CAT)
+ if (you.species != SP_FELID)
{
tmp += "Evoke (%)";
cmd.push_back(CMD_EVOKE);