From 7dab95158865a69a9dc3c79af4027c780507efb7 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Thu, 4 Jan 2007 18:38:39 +0000 Subject: Autoprayer should not activate in damaging clouds. Fixed '5' resting being broken. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@788 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/direct.cc | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'crawl-ref/source/direct.cc') diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index 706bee5edb..e1228305ba 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1517,34 +1517,9 @@ static void describe_cell(int mx, int my) { const char cloud_inspected = env.cgrid[mx][my]; - const char cloud_type = env.cloud[ cloud_inspected ].type; - - strcpy(info, "There is a cloud of "); - strcat(info, - (cloud_type == CLOUD_FIRE - || cloud_type == CLOUD_FIRE_MON) ? "flame" : - (cloud_type == CLOUD_STINK - || cloud_type == CLOUD_STINK_MON) ? "noxious fumes" : - (cloud_type == CLOUD_COLD - || cloud_type == CLOUD_COLD_MON) ? "freezing vapour" : - (cloud_type == CLOUD_POISON - || cloud_type == CLOUD_POISON_MON) ? "poison gases" : - (cloud_type == CLOUD_GREY_SMOKE - || cloud_type == CLOUD_GREY_SMOKE_MON) ? "grey smoke" : - (cloud_type == CLOUD_BLUE_SMOKE - || cloud_type == CLOUD_BLUE_SMOKE_MON) ? "blue smoke" : - (cloud_type == CLOUD_PURP_SMOKE - || cloud_type == CLOUD_PURP_SMOKE_MON) ? "purple smoke" : - (cloud_type == CLOUD_STEAM - || cloud_type == CLOUD_STEAM_MON) ? "steam" : - (cloud_type == CLOUD_MIASMA - || cloud_type == CLOUD_MIASMA_MON) ? "foul pestilence" : - (cloud_type == CLOUD_BLACK_SMOKE - || cloud_type == CLOUD_BLACK_SMOKE_MON) ? "black smoke" : - (cloud_type == CLOUD_MIST)? "thin mist" : - "buggy goodness"); - strcat(info, " here."); - mpr(info); + const cloud_type ctype = (cloud_type) env.cloud[ cloud_inspected ].type; + + mprf("There is a cloud of %s here.", cloud_name(ctype).c_str()); } int targ_item = igrd[ mx ][ my ]; -- cgit v1.2.3-54-g00ecf