summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/debug.cc3
-rw-r--r--crawl-ref/source/spl-cast.cc11
2 files changed, 5 insertions, 9 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 36c329d349..7948367098 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -1882,7 +1882,8 @@ void wizard_tweak_object(void)
return;
char *end;
- int new_value = strtol( specs, &end, 0 );
+ const bool hex = (keyin == 'e');
+ int new_value = strtol(specs, &end, hex ? 16 : 0);
if (new_value == 0 && end == specs)
return;
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 1661a1f33a..31e06876bf 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -332,14 +332,9 @@ int spell_fail(spell_type spell)
// Dwarven armour hinders everyone.
switch (race_arm)
{
- case ISFLAG_ELVEN:
- armour -= 20;
- break;
- case ISFLAG_DWARVEN:
- armour += 10;
- break;
- default:
- break;
+ case ISFLAG_ELVEN: armour -= 20; break;
+ case ISFLAG_DWARVEN: armour += 10; break;
+ default: break;
}
// Armour of the same racial type reduces penalty.