summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/dungeon.cc2
-rw-r--r--crawl-ref/source/food.cc2
-rw-r--r--crawl-ref/source/spl-cast.cc1
-rw-r--r--crawl-ref/source/xom.cc6
4 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 3f1d5c514a..f439fdd4b7 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -7373,7 +7373,7 @@ static void _roguey_level(int level_number, spec_room &sr, bool make_stairs)
} // end "for bp, for i"
// Is one of them a special room?
- const map_def *sroom;
+ const map_def *sroom = NULL;
#ifdef DEBUG_SPECIAL_ROOMS
if ((sroom = random_map_for_tag("special_room", true)) != NULL)
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index eebb9f5932..e71c73af4d 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1380,7 +1380,7 @@ bool eat_from_inventory()
int unusable_corpse = 0;
int inedible_food = 0;
- item_def *wonteat;
+ item_def *wonteat = NULL;
bool found_valid = false;
std::vector<item_def *> food_items;
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 0aa9b03bd6..8d66c7be89 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -2242,6 +2242,7 @@ MiscastEffect::MiscastEffect(actor* _target, int _source, spell_type _spell,
unsigned int schools = get_spell_disciplines(_spell);
ASSERT(schools != SPTYP_NONE);
ASSERT(!(schools & SPTYP_HOLY));
+ UNUSED(schools);
init();
do_miscast();
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 87db35f6de..73b2c2e14b 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1415,7 +1415,7 @@ static void _xom_zero_miscast()
if (_tran_get_eq(EQ_CLOAK) != NULL)
messages.push_back("Your cloak billows in an unfelt wind.");
- if (item = _tran_get_eq(EQ_HELMET))
+ if ((item = _tran_get_eq(EQ_HELMET)))
{
std::string str = "Your ";
str += item->name(DESC_BASENAME, false, false, false);
@@ -1438,7 +1438,7 @@ static void _xom_zero_miscast()
messages.push_back(str);
}
- if (item = _tran_get_eq(EQ_SHIELD))
+ if ((item = _tran_get_eq(EQ_SHIELD)))
{
std::string str = "Your ";
str += item->name(DESC_BASENAME, false, false, false);
@@ -1447,7 +1447,7 @@ static void _xom_zero_miscast()
messages.push_back(str);
}
- if (item = _tran_get_eq(EQ_BODY_ARMOUR))
+ if ((item = _tran_get_eq(EQ_BODY_ARMOUR)))
{
std::string str;
std::string name = item->name(DESC_BASENAME, false, false, false);