From 6b01fefe35f81ddbb55cb02f887932646e8b86c0 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 7 Apr 2008 01:45:09 +0000 Subject: Add minor cosmetic fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4085 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 4 ++-- crawl-ref/source/abyss.cc | 2 +- crawl-ref/source/delay.cc | 4 ++-- crawl-ref/source/enum.h | 2 +- crawl-ref/source/fight.cc | 2 +- crawl-ref/source/religion.cc | 2 -- crawl-ref/source/spells1.cc | 14 +++++++------- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 02ec9b1103..0fa31e07e5 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1599,12 +1599,12 @@ static bool _do_ability(const ability_def& abil) break; case ABIL_TROG_REGENERATION: - // Trog abilities don't use or train invocations. + // Trog abilities don't use or train invocations. cast_regen(you.piety/2); break; case ABIL_TROG_BROTHERS_IN_ARMS: - // Trog abilities don't use or train invocations. + // Trog abilities don't use or train invocations. summon_berserker(you.piety + random2(you.piety/4) - random2(you.piety/4), true); diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 286f415a98..ba601bcb38 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -604,7 +604,7 @@ static bool spawn_corrupted_servant_near(const coord_def &pos) } return (false); } - + static void apply_corruption_effect( map_marker *marker, int duration) { diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index e3b1d677ac..1fc478fee5 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -73,7 +73,7 @@ static bool recite_mons_useless(const monsters *mon) static int recite_to_monsters(int x, int y, int pow, int unused) { UNUSED(unused); - + const int mon = mgrd[x][y]; if (mon == NON_MONSTER) return (0); @@ -109,7 +109,7 @@ static int recite_to_monsters(int x, int y, int pow, int unused) if (pow > 0) pow = random2avg(pow,2); - + if (pow <= 0) // Uh oh... { if (one_chance_in(resist+1)) diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index db23e15e8c..65d40e0af9 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1888,7 +1888,7 @@ enum monster_flag_type // and orcs (Beogh worshippers -> friendly) MF_WAS_IN_VIEW = 0x2000, // Was in view during previous turn MF_BAND_MEMBER = 0x4000, // Created as a member of a band - MF_GOT_HALF_XP = 0x8000 // player already got half xp value earlier + MF_GOT_HALF_XP = 0x8000 // Player already got half xp value earlier }; // Adding slots breaks saves. YHBW. diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index f6d5ae9471..e5b8d4c830 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3889,7 +3889,7 @@ static void mons_lose_attack_energy(monsters *attacker, int wpn_speed, // attacks; subsequent hits are free. if (which_attack > 1) return; - + // speed adjustment for weapon using monsters if (wpn_speed > 0) { diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 4b59debc13..15172b45c5 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3802,8 +3802,6 @@ static void _print_good_god_neutral_holy_being_speech(const std::string key, } } - - void good_god_holy_attitude_change(monsters *holy) { ASSERT(mons_is_holy(holy)); diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 62081acdbc..c45fc3cf97 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -612,7 +612,7 @@ static bool _can_pacify_monster(const monsters *mon, const int healed) : 1; // other const int random_factor = random2(you.skills[SK_INVOCATIONS] * healed/3); - + #ifdef DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "pacifying %s? max hp: %d, factor: %d, Inv: %d, healed: %d, rnd: %d", @@ -642,7 +642,7 @@ static int _healing_spell( int healed, int target_x = -1, int target_y = -1) bmove.ty = target_y; bmove.isValid = true; } - + if (!bmove.isValid || !in_bounds(bmove.tx, bmove.ty)) { canned_msg( MSG_OK ); @@ -657,7 +657,7 @@ static int _healing_spell( int healed, int target_x = -1, int target_y = -1) } const int mgr = mgrd[bmove.tx][bmove.ty]; - + if (mgr == NON_MONSTER) { mpr("There isn't anything there!"); @@ -665,7 +665,7 @@ static int _healing_spell( int healed, int target_x = -1, int target_y = -1) } monsters *monster = &menv[mgr]; - + // don't heal monster you can't pacify if (you.religion == GOD_ELYVILON && _mons_hostile(monster) && !_can_pacify_monster(monster, healed)) @@ -686,7 +686,7 @@ static int _healing_spell( int healed, int target_x = -1, int target_y = -1) const monsters *mons = static_cast(monster); print_wounds(mons); } - + if (you.religion == GOD_ELYVILON && !_mons_hostile(monster)) { simple_god_message(" appreciates the healing of a fellow creature."); @@ -696,7 +696,7 @@ static int _healing_spell( int healed, int target_x = -1, int target_y = -1) } nothing_happens = false; } - + if (you.religion == GOD_ELYVILON && _mons_hostile(monster)) { simple_god_message(" supports your offer of peace."); @@ -733,7 +733,7 @@ char cast_greatest_healing( int pow ) { return _healing_spell(50 + random2avg(49, 2)); } -#endif +#endif int cast_healing( int pow, int target_x, int target_y ) { -- cgit v1.2.3-54-g00ecf