# HG changeset patch
# User Ritor1
# Date 1360601803 -21600
# Node ID 96f68985c64ca8ae74ff7873ade2bb6aaedd1a3d
# Parent  b8856f5d7149d6e46894d1b5866e666c510bbc94# Parent  3ee983b8082b006c2d362d8023a9e89cb8985040
Слияние

diff -r 3ee983b8082b -r 96f68985c64c Game.cpp
--- 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();