Mercurial > mm7

changeset 133:96f68985c64c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 11 Feb 2013 22:56:43 +0600
parents b8856f5d7149 (diff) 3ee983b8082b (current diff)
children 1c6d36681f7f
files Game.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Game.cpp	Mon Feb 11 19:42:28 2013 +0200
+++ b/Game.cpp	Mon Feb 11 22:56:43 2013 +0600
@@ -150,8 +150,8 @@
   pOtherOverlayList->field_3EC = 0;
   viewparams->bRedrawGameUI = v5;
   GameUI_DrawPartySpells();
-  //if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc )
-    //DrawHiredNPCs();//Ritor1: it's temporarily
+  if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc )
+    DrawHiredNPCs();//Ritor1: it's temporarily
   GameUI_DrawPortraits(v4);
   GameUI_DrawLifeManaBars();
   GameUI_DrawCharacterSelectionFrame();