# HG changeset patch
# User Nomad
# Date 1360607176 -7200
# Node ID 541f3df0aa557f083dea93b5524dc784323999b9
# Parent  9b0d651821f12ebf2bbd7e5156967e078b67715f# Parent  1c6d36681f7f4729057de2b604fe3a2dd0ca80c9
Merge

diff -r 9b0d651821f1 -r 541f3df0aa55 Game.cpp
--- a/Game.cpp	Mon Feb 11 20:23:55 2013 +0200
+++ b/Game.cpp	Mon Feb 11 20:26:16 2013 +0200
@@ -1,5 +1,3 @@
-#include <assert.h>
-
 #include "Game.h"
 #include "Party.h"
 #include "IndoorCamera.h"
@@ -106,7 +104,6 @@
         pIndoor->Draw();
       else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
         pOutdoor->Draw();
-      else assert(false);
 
       if (pRenderer->pRenderD3D)
       {
@@ -150,8 +147,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]._anim_end_time || pParty->pHirelings[1]._anim_end_time )
+    DrawHiredNPCs();
   GameUI_DrawPortraits(v4);
   GameUI_DrawLifeManaBars();
   GameUI_DrawCharacterSelectionFrame();
diff -r 9b0d651821f1 -r 541f3df0aa55 Party.cpp
--- a/Party.cpp	Mon Feb 11 20:23:55 2013 +0200
+++ b/Party.cpp	Mon Feb 11 20:26:16 2013 +0200
@@ -303,6 +303,7 @@
 
   pHireling1Name[0] = 0;
   pHireling2Name[0] = 0;
+  pParty->field_709 = 0;
   memset(pHirelings, 0, 2 * sizeof(*pHirelings));
 
   strcpy(this->pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]); //Zoltan
@@ -989,7 +990,7 @@
       memset(hireling, 0, sizeof(*hireling));
 
       pParty->field_709 = 0;
-      sub_44A56A();//Ritor1: it's temporarily
+      sub_44A56A();
       viewparams->bRedrawGameUI = 1;
     }
   }