diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-09 21:03:21 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-09 21:03:21 +0000 |
commit | 7caf5f3464c34fd80cc2d44e72078692167d71a3 (patch) | |
tree | b2b85163f4715438c590de30085017c1ab82a3ae /crawl-ref | |
parent | 802cc8bd43c073762ea2dd760af1598e828e53a0 (diff) | |
download | crawl-ref-7caf5f3464c34fd80cc2d44e72078692167d71a3.tar.gz crawl-ref-7caf5f3464c34fd80cc2d44e72078692167d71a3.zip |
Add more minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6812 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 28 | ||||
-rw-r--r-- | crawl-ref/source/spl-mis.h | 4 |
2 files changed, 16 insertions, 16 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index c9e0482dfc..0fa94da4dc 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -2186,7 +2186,7 @@ MiscastEffect::MiscastEffect(actor* _target, int _source, spell_type _spell, do_miscast(); } -MiscastEffect::MiscastEffect(actor *_target, int _source, +MiscastEffect::MiscastEffect(actor* _target, int _source, spschool_flag_type _school, int _level, std::string _cause, nothing_happens_when_type _nothing_happens) : @@ -2204,7 +2204,7 @@ MiscastEffect::MiscastEffect(actor *_target, int _source, do_miscast(); } -MiscastEffect::MiscastEffect(actor *_target, int _source, +MiscastEffect::MiscastEffect(actor* _target, int _source, spschool_flag_type _school, int _pow, int _fail, std::string _cause, nothing_happens_when_type _nothing_happens) : @@ -2248,7 +2248,7 @@ void MiscastEffect::init() } else target_known = true; - + kill_source = source; if (source == WIELD_MISCAST || source == MELEE_MISCAST) { @@ -2380,7 +2380,7 @@ std::string MiscastEffect::get_default_cause() return str; } else - return "something's spell miscasting"; + return "something's spell miscasting"; } bool MiscastEffect::neither_end_silenced() @@ -2535,7 +2535,7 @@ void MiscastEffect::do_msg(bool suppress_nothing_happnes) if (msg.empty()) { if (!suppress_nothing_happnes - && (nothing_happens_when == NH_ALWAYS + && (nothing_happens_when == NH_ALWAYS || (nothing_happens_when == NH_DEFAULT && source_known && target_known))) { @@ -2720,7 +2720,7 @@ void MiscastEffect::_conjuration(int severity) case 1: you_msg = "The air around you crackles with energy!"; mon_msg_seen = "The air around @the_monster@ crackles " - "with energy!"; + "with energy!"; break; case 2: you_msg = "Wisps of smoke drift from your @hands@."; @@ -3659,8 +3659,8 @@ void MiscastEffect::_transmigration(int severity) break; case 1: you_msg = "The air around you crackles with energy!"; - mon_msg_seen = "The air around @the_monster@ crackles with" - " energy!"; + mon_msg_seen = "The air around @the_monster@ crackles with " + "energy!"; mon_msg_unseen = "The thin air crackles with energy!"; break; case 2: @@ -3927,7 +3927,7 @@ void MiscastEffect::_fire(int severity) else mon_target->add_ench( mon_enchant(ENCH_STICKY_FLAME, dur, kc) ); break; - } + } } break; } @@ -3981,7 +3981,7 @@ void MiscastEffect::_ice(int severity) if (neither_end_silenced()) { all_msg = "You hear a crackling sound."; - msg_ch = MSGCH_SOUND; + msg_ch = MSGCH_SOUND; } else if (target->atype() == ACT_PLAYER) you_msg = "A snowflake lands on your nose."; @@ -4052,7 +4052,7 @@ void MiscastEffect::_ice(int severity) case 1: you_msg = "Freezing gasses pour from your @hands@!"; mon_msg_seen = "Freezing gasses pour from @the_monsters@'s " - " @hands@!"; + "@hands@!"; do_msg(); big_cloud(CLOUD_COLD, kc, kt, @@ -4092,7 +4092,7 @@ void MiscastEffect::_earth(int severity) if (neither_end_silenced()) { all_msg = "You hear a distant rumble."; - msg_ch = MSGCH_SOUND; + msg_ch = MSGCH_SOUND; } else if (target->atype() == ACT_PLAYER) you_msg = "You sympathise with the stones."; @@ -4257,7 +4257,7 @@ void MiscastEffect::_air(int severity) if (neither_end_silenced()) { all_msg = "You hear a crackling sound."; - msg_ch = MSGCH_SOUND; + msg_ch = MSGCH_SOUND; } else if (player_can_smell()) all_msg = "You smell something musty."; @@ -4279,7 +4279,7 @@ void MiscastEffect::_air(int severity) if (silenced(you.pos())) all_msg = "The wind whips around you!"; else - all_msg = "The wind howls around you!"; + all_msg = "The wind howls around you!"; break; } do_msg(); diff --git a/crawl-ref/source/spl-mis.h b/crawl-ref/source/spl-mis.h index ec6c06ff7e..0080616fe3 100644 --- a/crawl-ref/source/spl-mis.h +++ b/crawl-ref/source/spl-mis.h @@ -48,10 +48,10 @@ public: MiscastEffect(actor* _target, int _source, spell_type _spell, int _pow, int _fail, std::string _cause = "", nothing_happens_when_type _nothing_happens = NH_DEFAULT); - MiscastEffect(actor *_target, int _source, spschool_flag_type _school, + MiscastEffect(actor* _target, int _source, spschool_flag_type _school, int _level, std::string _cause, nothing_happens_when_type _nothing_happens = NH_DEFAULT); - MiscastEffect(actor *_target, int _source, spschool_flag_type _school, + MiscastEffect(actor* _target, int _source, spschool_flag_type _school, int _pow, int _fail, std::string _cause, nothing_happens_when_type _nothing_happens = NH_DEFAULT); |