From e63d0ce25374303ed7a08f0993eecb7d509b5eac Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 24 Mar 2008 16:50:41 +0000 Subject: Add whitespace fixes again. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3859 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/enum.h | 4 ++-- crawl-ref/source/mgrow.cc | 4 ++-- crawl-ref/source/mon-data.h | 2 +- crawl-ref/source/mon-spll.h | 2 +- crawl-ref/source/mstuff2.cc | 14 +++++++------- crawl-ref/source/spl-cast.cc | 2 +- crawl-ref/source/spl-data.h | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 3cf7a32326..c46ac45ee3 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2543,7 +2543,7 @@ enum spell_type SPELL_ROTTING, // evil god power or necromantic transmigration SPELL_MAXWELLS_SILVER_HAMMER, // vorpal-brand maces etc. SPELL_CONDENSATION_SHIELD, // "shield" of icy vapour - SPELL_SEMI_CONTROLLED_BLINK, //jmf: to test effect + SPELL_SEMI_CONTROLLED_BLINK, //jmf: to test effect SPELL_STONESKIN, SPELL_SIMULACRUM, // 200 SPELL_CONJURE_BALL_LIGHTNING, @@ -2569,7 +2569,7 @@ enum spell_type SPELL_SUMMON_DRAKES, SPELL_BLINK_OTHER, // 220 SPELL_SUMMON_MUSHROOMS, - + NUM_SPELLS, SPELL_NO_SPELL = 250 // 255 - added 22jan2000 {dlb} }; diff --git a/crawl-ref/source/mgrow.cc b/crawl-ref/source/mgrow.cc index aacacfe3d1..3d3a59185d 100644 --- a/crawl-ref/source/mgrow.cc +++ b/crawl-ref/source/mgrow.cc @@ -154,7 +154,7 @@ bool monsters::level_up() int hpboost = (hit_dice > 3? max_hit_points / 8 : max_hit_points / 4) + random2(5); - + // Not less than 3 hp, not more than 25. hpboost = std::min(std::max(hpboost, 3), 25); @@ -167,7 +167,7 @@ bool monsters::level_up() hit_points += hpboost; hit_points = std::min(hit_points, max_hit_points); } - + level_up_change(); return (true); diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index e9d640b065..f3089c41c6 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -60,7 +60,7 @@ like this: experience = hp_max * HD * HD * exp_mod / 10 I think. - + Actually it is experience = (16 + maxhp) * HD * HD * exp_mod * (100 + diff) * speed / 100000 diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index 0e49b5ed2c..bf58ae88ac 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -11,7 +11,7 @@ Template Format: - { + { bolt spell, enchantment, self-enchantment, // 50% tried after others fail diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index e7349291e3..6aef1749d1 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -576,7 +576,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast) } } - create_monster( mons, 5, SAME_ATTITUDE(monster), + create_monster( mons, 5, SAME_ATTITUDE(monster), monster->x, monster->y, monster->foe, MONS_PROGRAM_BUG ); } @@ -601,8 +601,8 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast) for (sumcount = 0; sumcount < sumcount2; sumcount++) { - create_monster( MONS_RAKSHASA_FAKE, 3, - SAME_ATTITUDE(monster), monster->x, monster->y, + create_monster( MONS_RAKSHASA_FAKE, 3, + SAME_ATTITUDE(monster), monster->x, monster->y, monster->foe, MONS_PROGRAM_BUG ); } return; @@ -617,7 +617,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast) for (sumcount = 0; sumcount < sumcount2; sumcount++) { create_monster( summon_any_demon(DEMON_COMMON), duration, - SAME_ATTITUDE(monster), monster->x, monster->y, + SAME_ATTITUDE(monster), monster->x, monster->y, monster->foe, MONS_PROGRAM_BUG ); } return; @@ -635,7 +635,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast) for (sumcount = 0; sumcount < sumcount2; sumcount++) { create_monster( summon_any_demon(DEMON_LESSER), duration, - SAME_ATTITUDE(monster), monster->x, monster->y, + SAME_ATTITUDE(monster), monster->x, monster->y, monster->foe, MONS_PROGRAM_BUG ); } return; @@ -668,12 +668,12 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast) case SPELL_SUMMON_MUSHROOMS: // Summon swarms of icky crawling fungi. if (mons_abjured(monster, monsterNearby)) return; - + sumcount2 = 1 + random2(2) + random2( monster->hit_dice / 4 + 1 ); duration = std::min(2 + monster->hit_dice / 5, 6); for (int i = 0; i < sumcount2; ++i) - create_monster(MONS_WANDERING_MUSHROOM, duration, + create_monster(MONS_WANDERING_MUSHROOM, duration, SAME_ATTITUDE(monster), monster->x, monster->y, monster->foe, diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index f9e3deb738..876e9dbb45 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1478,7 +1478,7 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail ) dancing_weapon(powc, false); break; - case SPELL_HELLFIRE: + case SPELL_HELLFIRE: // should only be available from: // staff of Dispater & Sceptre of Asmodeus zapping(ZAP_HELLFIRE, powc, beam); diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index d7959fcefb..f93eeb5581 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -1184,7 +1184,7 @@ 9, 200, NULL, - true + true }, { -- cgit v1.2.3-54-g00ecf