Don't allow monsters wielding two-handed weapons to pick up shields.

Partial fix for [2508934]; the bug is still there because monster
nagas count as SIZE_BIG, not SIZE_LARGE. I'll let dolorous fix
the monster flags. :)


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

1 files changed, 2 insertions, 8 deletions

diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index bbcf16d52a..61894e43cb 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -5077,14 +5077,9 @@ bool _give_items_skills()
         {
             _print_character_info();
 
-            textcolor( CYAN );
+            textcolor(CYAN);
             cprintf(EOL "From where do you draw your power?" EOL);
-
-            if (_necromancy_okay())
-                textcolor(LIGHTGREY);
-            else
-                textcolor(DARKGREY);
-
+            textcolor(_necromancy_okay() ? LIGHTGREY : DARKGREY);
             cprintf("a - Necromantic magic" EOL);
 
             // Yredelemnul is an okay choice for everyone.
@@ -5191,7 +5186,6 @@ bool _give_items_skills()
             you.piety = 28;
             you.inv[0].plus  = 1 + random2(2);
             you.inv[0].plus2 = 3 - you.inv[0].plus;
-            you.inv[2].quantity = 0;
             you.skills[SK_INVOCATIONS] = 3;
             break;
         }