diff Actor.cpp @ 248:37dcbe8f3cca

Dialogue stuff
author Nomad
date Mon, 18 Feb 2013 07:11:43 +0200
parents f070b49d40dd
children 0ea5fbd16edb
line wrap: on
line diff
--- a/Actor.cpp	Mon Feb 18 03:59:31 2013 +0200
+++ b/Actor.cpp	Mon Feb 18 07:11:43 2013 +0200
@@ -200,7 +200,7 @@
   pDialogueNPCPortraits[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)];
   dword_591084 = areWeLoadingTexture;
   uTextureID_507B04 = uTextureID_right_panel;
-  if ( !(v5->uFlags & 0x80) && v5->house >= 0 )
+  if ( !v5->Hired() && v5->house >= 0 )
   {
     if ( (signed int)pParty->GetPartyFame() <= v5->fame
       || (v10 = v5->uFlags & 0xFFFFFF7F, (v5->uFlags & 0xFFFFFF7F & 0x80000000u) != 0) )
@@ -241,7 +241,7 @@
     v9 = 4;
   v11 = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)10, v9, 0);
   pDialogueWindow = v11;
-  if ( v5->uFlags & 0x80 )
+  if (v5->Hired())
   {
     if ( !v5->bHasUsedTheAbility )
     {
@@ -271,7 +271,7 @@
   pDialogueWindow->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0);
   pDialogueWindow->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0);
   pDialogueWindow->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0);
-  if ( v17 && uActiveCharacter && !(v5->uFlags & 0x80) )
+  if (v17 && uActiveCharacter && !v5->Hired())
   {
     if (pParty->uCurrentHour < 5 || pParty->uCurrentHour > 21)
       pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodEvening, 0);