Simplify.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5512 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 17 insertions, 16 deletions

diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 1fe62dd439..5af5bf96d3 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1540,22 +1540,31 @@ bool summon_general_creature(int pow, monster_type mon, beh_type beha,
 
     switch (mon)
     {
-    case MONS_ICE_BEAST:
-        mpr("A chill wind blows around you.");
-        break;
-
     case MONS_IMP:
-        mpr("A beastly little devil appears in a puff of flame.");
-        break;
-
     case MONS_WHITE_IMP:
-        mpr("A beastly little devil appears in a puff of frigid air.");
+    {
+        const char *suffix = (mon == MONS_WHITE_IMP) ? "frigid air" : "flame";
+
+        mprf("A beastly little devil appears in a puff of %s.", suffix);
         break;
+    }
 
     case MONS_SHADOW_IMP:
         mpr("A shadowy apparition takes form in the air.");
         break;
 
+    case MONS_ICE_BEAST:
+        mpr("A chill wind blows around you.");
+        break;
+
+    case MONS_ANGEL:
+        mpr("You open a gate to Zin's realm!");
+        break;
+
+    case MONS_DAEVA:
+        mpr("You are momentarily dazzled by a brilliant golden light.");
+        break;
+
     case MONS_UGLY_THING:
     case MONS_VERY_UGLY_THING:
     {
@@ -1573,14 +1582,6 @@ bool summon_general_creature(int pow, monster_type mon, beh_type beha,
         break;
     }
 
-    case MONS_ANGEL:
-        mpr("You open a gate to Zin's realm!");
-        break;
-
-    case MONS_DAEVA:
-        mpr("You are momentarily dazzled by a brilliant golden light.");
-        break;
-
     default:
     {
         bool friendly = (random2(pow) > 3);