summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-22 07:03:34 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-22 07:03:34 +0000
commit0a8713d0c321c42fea4886bc1ab6f7c2031d247b (patch)
treea429e236dd8cf086ab749fb6cdd5eb5094738a6a /crawl-ref/source
parent9e7cea2837c8d911cb41f5a62e47186dce6669ad (diff)
downloadcrawl-ref-0a8713d0c321c42fea4886bc1ab6f7c2031d247b.tar.gz
crawl-ref-0a8713d0c321c42fea4886bc1ab6f7c2031d247b.zip
Oops, used tabs instead of spaces for indentation in items.cc and mon-util.cc.
Fixed the same problem in initfile.cc and directn.cc while I was at it. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7533 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/directn.cc4
-rw-r--r--crawl-ref/source/initfile.cc2
-rw-r--r--crawl-ref/source/items.cc4
-rw-r--r--crawl-ref/source/mon-util.cc16
4 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 9002ca9f4b..6e86640ed7 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -1422,8 +1422,8 @@ void direction(dist& moves, targeting_type restricts,
break;
case CMD_TARGET_ALL_DESCRIBE:
- full_describe_view();
- break;
+ full_describe_view();
+ break;
case CMD_TARGET_HELP:
show_targeting_help();
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 4dc629e4a2..d256558f1d 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -1727,7 +1727,7 @@ static void _bindkey(std::string field)
const size_t end_bracket = field.find_last_of(']');
if (start_bracket == std::string::npos
- || end_bracket == std::string::npos
+ || end_bracket == std::string::npos
|| start_bracket > end_bracket)
{
mprf(MSGCH_ERROR, "Bad bindkey bracketing in '%s'",
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 498722a4a4..7e8a54503e 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2028,13 +2028,13 @@ mon_inv_type get_mon_equip_slot(const monsters* mon, const item_def &item)
if (slot == NUM_MONSTER_SLOTS)
return NUM_MONSTER_SLOTS;
- if (mon->mslot_item(slot) == &item)
+ if (mon->mslot_item(slot) == &item)
return slot;
if (slot == MSLOT_WEAPON && mon->mslot_item(MSLOT_ALT_WEAPON) == &item)
return MSLOT_ALT_WEAPON;
- return NUM_MONSTER_SLOTS;
+ return NUM_MONSTER_SLOTS;
}
static std::string _drop_selitem_text( const std::vector<MenuEntry*> *s )
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 8c6a98d6f8..83cfa54819 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -4136,23 +4136,23 @@ mon_inv_type item_to_mslot(const item_def &item)
switch(item.base_type)
{
case OBJ_WEAPONS:
- return MSLOT_WEAPON;
+ return MSLOT_WEAPON;
case OBJ_MISSILES:
- return MSLOT_MISSILE;
+ return MSLOT_MISSILE;
case OBJ_ARMOUR:
return equip_slot_to_mslot(get_armour_slot(item));
case OBJ_WANDS:
- return MSLOT_WAND;
+ return MSLOT_WAND;
case OBJ_SCROLLS:
- return MSLOT_SCROLL;
+ return MSLOT_SCROLL;
case OBJ_POTIONS:
- return MSLOT_POTION;
+ return MSLOT_POTION;
case OBJ_MISCELLANY:
- return MSLOT_MISCELLANY;
+ return MSLOT_MISCELLANY;
case OBJ_GOLD:
- return MSLOT_GOLD;
+ return MSLOT_GOLD;
default:
- return NUM_MONSTER_SLOTS;
+ return NUM_MONSTER_SLOTS;
}
}