--- a/Game.cpp	Tue Feb 12 09:11:03 2013 +0600
+++ b/Game.cpp	Tue Feb 12 09:11:19 2013 +0600
@@ -1,3 +1,5 @@
+#include <assert.h>
+
 #include "Game.h"
 #include "Party.h"
 #include "IndoorCamera.h"
@@ -104,6 +106,7 @@
         pIndoor->Draw();
       else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
         pOutdoor->Draw();
+      else assert(false);
 
       if (pRenderer->pRenderD3D)
       {
@@ -147,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]._anim_end_time || pParty->pHirelings[1]._anim_end_time )
+    DrawHiredNPCs();
   GameUI_DrawPortraits(v4);
   GameUI_DrawLifeManaBars();
   GameUI_DrawCharacterSelectionFrame();
@@ -161,7 +164,7 @@
     GameUI_DrawTorchlightAndWizardEye();
   }
   GUI_UpdateWindows();
-  pParty->_4909F4();
+  pParty->UpdatePlayersAndHirelingsEmotions();
   ++stru_51076C.field_8;
   dword_5B5924 = 0;
   if (v4)
@@ -1076,7 +1079,7 @@
 {
   if ( !pCurrentScreen && pVisInstance && pRenderer->pRenderD3D )
   {
-    bool r = pVisInstance->_4C05CC(&pVisInstance->stru1, a3, a4);
+    bool r = pVisInstance->PickKeyboard(&pVisInstance->stru1, a3, a4);
 
     if (bOutline)
       OutlineSelection();
@@ -1084,6 +1087,18 @@
   }
   return false;
 }
+/*
+Result::Code Game::PickKeyboard(bool bOutline, struct unnamed_F93E6C *a3, struct unnamed_F93E6C *a4)
+{
+ if (dword_4E28F8_PartyCantJumpIfTrue)
+   return Result::Generic;
+
+ pVis->PickKeyboard(a3, a4);
+ if (bOutline)
+   Game_outline_selection((int)this);
+ return Result::Success;
+}
+*/
 // 4E28F8: using guessed type int pCurrentScreen;
 
 //----- (0044EB5A) --------------------------------------------------------