For FR 1934370

Add "classic_hud" option.  Defaults to false.  Removes hp bar, monster list.
Added some macros to reduce copy/paste in initfile.cc.
Renamed mlist_allow_inline to mlist_allow_alternate_layout so the sense is more accurate.



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

1 files changed, 17 insertions, 5 deletions

diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 409495132c..bc6f783b3d 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -4990,10 +4990,18 @@ class _inline_layout : public _layout
         if (leftover_y() < 0) { return false; }
         _increment(viewsz.y, leftover_leftcol_y(), Options.view_max_height);
         if ((viewsz.y % 2) != 1) --viewsz.y;
-        if (mlistsz.y < Options.mlist_min_height)
-            _increment(mlistsz.y, leftover_rightcol_y(), Options.mlist_min_height);
-        _increment(msgsz.y,  leftover_y(), MSG_MAX_HEIGHT);
-        _increment(mlistsz.y, leftover_rightcol_y(), INT_MAX);
+        if (Options.classic_hud)
+        {
+            mlistsz.y = 0;
+            _increment(msgsz.y,  leftover_y(), MSG_MAX_HEIGHT);
+        }
+        else
+        {
+            if (mlistsz.y < Options.mlist_min_height)
+                _increment(mlistsz.y, leftover_rightcol_y(), Options.mlist_min_height);
+            _increment(msgsz.y,  leftover_y(), MSG_MAX_HEIGHT);
+            _increment(mlistsz.y, leftover_rightcol_y(), INT_MAX);
+        }
 
         // Finish off by doing the positions
         viewp  = termp;
@@ -5168,8 +5176,12 @@ void crawl_view_geometry::init_geometry()
     }
 
     const _layout* winner = &lay_inline;
-    if (!Options.mlist_force_inline && lay_mlist.valid)
+    if (  !Options.mlist_allow_alternate_layout
+       && !Options.classic_hud
+       &&  lay_mlist.valid)
+    {
         winner = &lay_mlist;
+    }
 
     msgp  = winner->msgp;
     msgsz = winner->msgsz;