Mercurial > mm7
changeset 338:1c681ad45653
history changes
| author | zipi |
|---|---|
| date | Wed, 20 Feb 2013 20:44:42 +0000 |
| parents | d27e30e0158a |
| children | 37b19ff5addd a8ee15a20bea |
| files | GUIWindow.cpp StorylineTextTable.cpp mm7_5.cpp |
| diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/GUIWindow.cpp Thu Feb 21 00:35:45 2013 +0400 +++ b/GUIWindow.cpp Wed Feb 20 20:44:42 2013 +0000 @@ -721,7 +721,8 @@ { 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].pPageTitle;//guess //field_4[3 * dword_506528 + 2]; + v22 = (char *)&pStorylineText->StoreLine[dword_506528+1].uTime; do { v4 = *(char **)v22; @@ -751,7 +752,8 @@ ++v24; //__debugbreak(); // fix condition } - while ( (signed int)v22 < (signed int)&pFactionTable->relations + 8 ); + //while ( (signed int)v22 < (signed int)&pFactionTable->relations + 8 ); + while ( (signed int)v22 <= (signed int)&pStorylineText->StoreLine[20].uTime ); } } }
--- a/StorylineTextTable.cpp Thu Feb 21 00:35:45 2013 +0400 +++ b/StorylineTextTable.cpp Wed Feb 20 20:44:42 2013 +0000 @@ -27,6 +27,13 @@ pHistoryTXT_Raw = (char *)pEvents_LOD->LoadRaw("history.txt", 0); strtok(pHistoryTXT_Raw, "\r"); + StoreLine[0].pText=nullptr; + StoreLine[0].pPageTitle=nullptr; + StoreLine[0].uTime=0; + StoreLine[0].f_9=0; + StoreLine[0].f_A=0; + StoreLine[0].f_B=0; + for (i=0;i<29;++i) { test_string = strtok(NULL, "\r") + 1;
--- a/mm7_5.cpp Thu Feb 21 00:35:45 2013 +0400 +++ b/mm7_5.cpp Wed Feb 20 20:44:42 2013 +0000 @@ -13899,7 +13899,8 @@ v6 = pStru179.field_0[dword_506528]; dword_506548 = 0; dword_506520 = 0; - v7 = *pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6); + //v7 = *pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6); + v7 = (int)pStorylineText->StoreLine[v6/2].pText;//*(&pStorylineText->field_0 + 3 * v6); v8 = BuilDialogueString( pStorylineText->StoreLine[v6].pText, uActiveCharacter - 1,