--- a/GUIWindow.cpp	Tue Mar 26 23:19:12 2013 +0600
+++ b/GUIWindow.cpp	Wed Mar 27 01:39:54 2013 +0600
@@ -1075,15 +1075,15 @@
       JailDialog();
       goto LABEL_58;
     }
-    if ( ptr_F8B1E8 )
+    if ( current_npc_text )
     {
       w.uFrameWidth = 458;
       w.uFrameZ = 457;
-      v5 = pFontArrus->CalcTextHeight(ptr_F8B1E8, &w, 13, 0);
+      v5 = pFontArrus->CalcTextHeight(current_npc_text, &w, 13, 0);
       v6 = v5 + 7;
       pRenderer->_4A6A68(8, 352 - (v5 + 7), &pIcons_LOD->pTextures[uTextureID_Leather], pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight - (v5 + 7));
       pRenderer->DrawTextureIndexed(8u, 347 - v6, pTexture_591428);
-      v7 = FitTextInAWindow(ptr_F8B1E8, pFontArrus, &w, 0xDu, 0);
+      v7 = FitTextInAWindow(current_npc_text, pFontArrus, &w, 0xDu, 0);
       window_SpeakInHouse->DrawText(pFontArrus, 13, 354 - v6, 0, v7, 0, 0, 0);
     }
     v8 = 0;
@@ -1797,7 +1797,7 @@
             num_menu_buttons = 0;
             v11 = LOBYTE(pFontArrus->uFontHeight) - 3;
             speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID);
-            if ( sub_445C8B(sDialogue_SpeakingActorNPC_ID) == 1 )
+            if ( GetGreetType(sDialogue_SpeakingActorNPC_ID) == 1 )//QuestsNPC_greet
             {
               if ( speakingNPC->joins )
               {