# HG changeset patch
# User Nomad
# Date 1361399987 -7200
# Node ID b7131c52cdd47f385df030223056a4ab380c0f5d
# Parent  6e152b7ec5819d940f6ee9fab20234392cf2f08f# Parent  ee4aa06b6d51c5c76ae6557b56fa1707d00adc31
Merge

diff -r 6e152b7ec581 -r b7131c52cdd4 GUIWindow.cpp
--- a/GUIWindow.cpp	Thu Feb 21 00:38:55 2013 +0200
+++ b/GUIWindow.cpp	Thu Feb 21 00:39:47 2013 +0200
@@ -722,7 +722,7 @@
             v3 = (__int64 *)&pParty->field_3C.field_4F0[2 * dword_506528];
             v24 = dword_506528 + 1;
             //v22 = (char *)&pStorylineText->StoreLine[dword_506528].pPageTitle;//guess //field_4[3 * dword_506528 + 2];
-			v22 = (char *)&pStorylineText->StoreLine[dword_506528+1].uTime;
+			v22 = (char *)&pStorylineText->StoreLine[dword_506528+1].pText;
             do
             {
               v4 = *(char **)v22;
@@ -753,7 +753,7 @@
               //__debugbreak(); // fix condition
             }
             //while ( (signed int)v22 < (signed int)&pFactionTable->relations + 8 );
-			while ( (signed int)v22 <= (signed int)&pStorylineText->StoreLine[20].uTime );
+			while ( (signed int)v22 <= (signed int)&pStorylineText->StoreLine[30].uTime );
           }
         }
       }
diff -r 6e152b7ec581 -r b7131c52cdd4 mm7_5.cpp
--- a/mm7_5.cpp	Thu Feb 21 00:38:55 2013 +0200
+++ b/mm7_5.cpp	Thu Feb 21 00:39:47 2013 +0200
@@ -13900,7 +13900,7 @@
   dword_506548 = 0;
   dword_506520 = 0;
   //v7 = *pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6);
-  v7 = (int)pStorylineText->StoreLine[v6/2].pText;//*(&pStorylineText->field_0 + 3 * v6);
+  v7 = (int)pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6);
   v8 = BuilDialogueString(
          pStorylineText->StoreLine[v6].pText,
          uActiveCharacter - 1,