Merge pull request #14 from flend/feature/show_monster_inventories

Showing monster inventories on the monster status listing
flend · Dec 1, 2019 · 2d94471 · 2d94471
2 parents 436e75e + 8c71ec1
commit 2d94471
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 unreleased
 ==========
 
+-
+  The sidebar now displays whether a monster is carrying an item
 -
   Fixed incorrect percentage health change info in sidebar
 -

diff --git a/src/brogue/IO.c b/src/brogue/IO.c
@@ -4184,6 +4184,9 @@ short printMonsterInfo(creature *monst, short y, boolean dim, boolean highlight)
             applyColorAugment(&monstBackColor, &black, 100);
         }
         plotCharWithColor(monstChar, 0, y, &monstForeColor, &monstBackColor);
+        if(monst->carriedItem) {
+            plotCharWithColor(monst->carriedItem->displayChar, 1, y, &itemColor, &black);
+        }
         monsterName(monstName, monst, false);
         upperCase(monstName);
 
@@ -4206,9 +4209,7 @@ short printMonsterInfo(creature *monst, short y, boolean dim, boolean highlight)
         }
 
         sprintf(buf, ": %s", monstName);
-
-        printString("                   ", 1, y, &white, &black, 0);
-        printString(buf, 1, y++, (dim ? &gray : &white), &black, 0);
+        printString(buf, monst->carriedItem?2:1, y++, (dim ? &gray : &white), &black, 0);
     }
 
     // mutation, if any