1 files changed, 31 insertions, 65 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index cd7261a4a5..e3c60647f6 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -391,79 +391,45 @@ void print_stats(void)
             break;
         }
 
-        if (Options.detailed_hunger)
+        switch (you.hunger_state)
         {
-            switch (you.hunger_state)
-            {
-            case HS_ENGORGED:
-                textcolor( LIGHTGREEN );
-                cprintf( "Engorged" );
-                break;
-
-            case HS_VERY_FULL:
-                textcolor( GREEN );
-                cprintf( "Very Full" );
-                break;
-
-            case HS_FULL:
-                textcolor( GREEN );
-                cprintf( "Full" );
-                break;
-
-            case HS_SATIATED:
-                break;
-
-            case HS_HUNGRY:
-                textcolor( YELLOW );
-                cprintf( "Hungry" );
-                break;
+        case HS_ENGORGED:
+            textcolor( LIGHTGREEN );
+            cprintf( "Engorged" );
+            break;
 
-            case HS_VERY_HUNGRY:
-                textcolor( YELLOW );
-                cprintf( "Very Hungry" );
-                break;
+        case HS_VERY_FULL:
+            textcolor( GREEN );
+            cprintf( "Very Full" );
+            break;
 
-            case HS_NEAR_STARVING:
-                textcolor( YELLOW );
-                cprintf( "Near Starving" );
-                break;
+        case HS_FULL:
+            textcolor( GREEN );
+            cprintf( "Full" );
+            break;
 
-            case HS_STARVING:
-                textcolor( RED );
-                cprintf( "Starving" );
-                break;
-            }
-        }
-        else
-        {
-            switch (you.hunger_state)
-            {
-            case HS_ENGORGED:
-                textcolor( LIGHTGREEN );
-                cprintf( "Engorged" );
-                break;
+        case HS_SATIATED:
+            break;
 
-            case HS_VERY_FULL:
-            case HS_FULL:
-                textcolor( GREEN );
-                cprintf( "Full" );
-                break;
+        case HS_HUNGRY:
+            textcolor( YELLOW );
+            cprintf( "Hungry" );
+            break;
 
-            case HS_SATIATED:
-                break;
+        case HS_VERY_HUNGRY:
+            textcolor( YELLOW );
+            cprintf( "Very Hungry" );
+            break;
 
-            case HS_HUNGRY:
-            case HS_VERY_HUNGRY:
-            case HS_NEAR_STARVING:
-                textcolor( YELLOW );
-                cprintf( "Hungry" );
-                break;
+        case HS_NEAR_STARVING:
+            textcolor( YELLOW );
+            cprintf( "Near Starving" );
+            break;
 
-            case HS_STARVING:
-                textcolor( RED );
-                cprintf( "Starving" );
-                break;
-            }
+        case HS_STARVING:
+            textcolor( RED );
+            cprintf( "Starving" );
+            break;
         }
 
         textcolor( LIGHTGREY );