summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-03-07 23:51:48 -0500
committerNeil Moore <neil@s-z.org>2014-03-07 23:51:48 -0500
commitc3ea3b707afa11309dfc91b1f994ffc55041be02 (patch)
tree102e7f3a68bdfd465c568070b6822913e8b4d9c5
parentc20c04649c1b7a875aad18830b5ade77fa8dc339 (diff)
downloadcrawl-ref-c3ea3b707afa11309dfc91b1f994ffc55041be02.tar.gz
crawl-ref-c3ea3b707afa11309dfc91b1f994ffc55041be02.zip
Formatting fixes.
-rw-r--r--crawl-ref/source/dgl-message.cc2
-rw-r--r--crawl-ref/source/fight.cc4
-rw-r--r--crawl-ref/source/ghost.cc2
-rw-r--r--crawl-ref/source/mon-gear.cc2
-rw-r--r--crawl-ref/source/newgame.cc4
-rw-r--r--crawl-ref/source/spl-summoning.cc2
6 files changed, 3 insertions, 13 deletions
diff --git a/crawl-ref/source/dgl-message.cc b/crawl-ref/source/dgl-message.cc
index 6e3ddb3651..0f4e93432f 100644
--- a/crawl-ref/source/dgl-message.cc
+++ b/crawl-ref/source/dgl-message.cc
@@ -36,8 +36,10 @@ static void _show_message_line(string line)
fs.cprintf("%s", line.c_str());
formatted_mpr(fs, MSGCH_PLAIN, 0);
if (Options.note_dgl_messages)
+ {
take_note(Note(NOTE_MESSAGE, MSGCH_PLAIN, 0,
(sender + ": " + line).c_str()));
+ }
}
}
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 29e7c53bac..27689987fe 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -421,9 +421,7 @@ stab_type find_stab_type(const actor *attacker,
// the attacker can't see (either due to invisibility or being behind
// opaque clouds).
if (defender->cannot_fight() || (attacker && !attacker->can_see(defender)))
- {
return unchivalric;
- }
// Distracted (but not batty); this only applies to players.
if (attacker && attacker->is_player()
@@ -438,9 +436,7 @@ stab_type find_stab_type(const actor *attacker,
// allies
if (def && def->friendly())
- {
unchivalric = STAB_ALLY;
- }
// fleeing
if (def && mons_is_fleeing(def))
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 95b99aa6f7..0ee78f01f8 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -1141,7 +1141,7 @@ bool ghost_demon::populate_servitor_spells(spell_type* spell_list, bool primary,
}
}
- return (candidates.size() > 0);
+ return candidates.size() > 0;
}
void ghost_demon::init_spellforged_servitor()
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index fbee2abc43..9e6f2ad230 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -1887,9 +1887,7 @@ static void _give_shield(monster* mon, int level)
case MONS_DEEP_ELF_FIGHTER:
if (one_chance_in(6))
- {
make_item_for_monster(mon, OBJ_ARMOUR, ARM_BUCKLER, level);
- }
break;
case MONS_MINOTAUR:
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index fa2eaa931d..10f77fa89f 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1667,16 +1667,12 @@ static vector<weapon_choice> _get_weapons(const newgame_def* ng)
case WPN_SHORT_SWORD:
// Fighters and gladiators get cutlasses.
if (ng->job == JOB_GLADIATOR || ng->job == JOB_FIGHTER)
- {
wp.first = WPN_CUTLASS;
- }
break;
case WPN_MACE:
// Fighters and gladiators get flails.
if (ng->job == JOB_GLADIATOR || ng->job == JOB_FIGHTER)
- {
wp.first = WPN_FLAIL;
- }
break;
case WPN_HAND_AXE:
// Non-little fighters and gladiators get war axes.
diff --git a/crawl-ref/source/spl-summoning.cc b/crawl-ref/source/spl-summoning.cc
index 676e0bf119..57fb268351 100644
--- a/crawl-ref/source/spl-summoning.cc
+++ b/crawl-ref/source/spl-summoning.cc
@@ -463,9 +463,7 @@ spret_type cast_summon_ice_beast(int pow, god_type god, bool fail)
ice_beast.hd = (3 + div_rand_round(pow, 13));
if (create_monster(ice_beast))
- {
mpr("A chill wind blows around you.");
- }
else
canned_msg(MSG_NOTHING_HAPPENS);