Mercurial > mm7

diff UI/UiGame.cpp @ 1803:9f93b5700e2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 07 Oct 2013 11:55:35 +0200
parents 633f81bb3ae7 4dee76d79c78
children 24b70fa98474
line wrap: on
line diff
--- a/UI/UiGame.cpp	Mon Oct 07 11:52:33 2013 +0200
+++ b/UI/UiGame.cpp	Mon Oct 07 11:55:35 2013 +0200
@@ -187,9 +187,9 @@
         }
       }
     }
-    if ( (signed int)((char *)_this + (unsigned __int8)pParty->field_709) < v1 )
+    if ( (signed int)((char *)_this + pParty->hirelingScrollPosition) < v1 )
     {
-      sDialogue_SpeakingActorNPC_ID = -1 - (unsigned __int8)pParty->field_709 - (int)_this;
+      sDialogue_SpeakingActorNPC_ID = -1 - pParty->hirelingScrollPosition - (int)_this;
       pNPC = GetNewNPCData(sDialogue_SpeakingActorNPC_ID, &a2);
       if ( pNPC )
       {
@@ -2161,7 +2161,7 @@
       }
     }
 
-    for ( int i = (unsigned __int8)pParty->field_709; i < v22 && pNPC_limit_ID < 2; i++ )
+    for ( int i = pParty->hirelingScrollPosition; i < v22 && pNPC_limit_ID < 2; i++ )
     {
       if ( (unsigned __int8)pTmpBuf[i] >= 2 )
       {