From 31d23a40fe1ac90e0e319ce9bab1fa3bb0a08bf3 Mon Sep 17 00:00:00 2001 From: haranp Date: Mon, 23 Apr 2007 10:19:28 +0000 Subject: Cleaned up a lot of code which was using info[] to use mprf() directly instead. Fixed a bug with affix_weapon_enchantment messaging (mea culpa.) Fixed shatter() messages getting surpressed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1347 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/effects.cc | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'crawl-ref/source/effects.cc') diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index cf25b6d3af..7e0ade7933 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -441,14 +441,11 @@ void random_uselessness(unsigned char ru, unsigned char sc_read_2) break; case 6: - strcpy(info, "Your "); - temp_rand = random2(3); - - strcat(info, (temp_rand == 0) ? "ears itch." : - (temp_rand == 1) ? "brain hurts!" - : "nose twitches suddenly!"); - mpr(info); + mprf("Your %s", + (temp_rand == 0) ? "ears itch." : + (temp_rand == 1) ? "brain hurts!" + : "nose twitches suddenly!"); break; case 7: @@ -827,11 +824,9 @@ bool acquirement(unsigned char force_class, int agent) which_book: #if DEBUG_DIAGNOSTICS - snprintf( info, INFO_SIZE, - "acquirement: iteration = %d, best_spell = %d", - iteration, best_spell ); - - mpr( info, MSGCH_DIAGNOSTICS ); + mprf(MSGCH_DIAGNOSTICS, + "acquirement: iteration = %d, best_spell = %d", + iteration, best_spell ); #endif //jmf: debugging switch (best_spell) -- cgit v1.2.3-54-g00ecf