Mercurial > mm7
diff GUIWindow.cpp @ 81:377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
| author | zipi |
|---|---|
| date | Sun, 03 Feb 2013 15:36:54 +0000 |
| parents | 2c0260e09693 |
| children | b7ff791b1333 |
line wrap: on
line diff
--- a/GUIWindow.cpp Sat Feb 02 16:56:01 2013 +0000 +++ b/GUIWindow.cpp Sun Feb 03 15:36:54 2013 +0000 @@ -20,6 +20,7 @@ #include "FactionTable.h" #include "StorylineTextTable.h" #include "Events2D.h" +#include "Autonotes.h" #include "mm7_data.h" @@ -477,7 +478,7 @@ dword_506524 = 0; dword_506528 = 0; dword_50651C = 0; - dword_506520 = 0; + dword_506520 = 0; if ( v1->ptr_1C == (void *)177 ) { byte_506360 = 0; @@ -562,11 +563,11 @@ memset(&pStru179, 0, 0xFA0u); for ( i = dword_506528; i < 512; ++i ) { - v14 = (&dword_722F10)[4 * i]; + v14 = (char *)pQuestTable[i-1];//(&dword_722F10)[4 * i]; if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, i) && v14 ) { v15 = dword_506520++; - pStru179->field_0[v15] = i; + pStru179.field_0[v15] = i; } } } @@ -613,15 +614,16 @@ dword_506520 = 0; while ( v10 < 196 ) { - if ( dword_506568 == dword_72371C[2 * v10] ) + if ( dword_506568 == pAutonoteTxt[v10-1].eType)//dword_72371C[2 * v10] ) { - v25 = (&dword_723718_autonote_related)[8 * (signed __int16)v10]; + //v25 = (&dword_723718_autonote_related)[8 * (signed __int16)v10]; + v25 = (char *)pAutonoteTxt[v10-1].pText; if ( (short)v10 ) { if ( (unsigned __int16)_449B57_test_bit(pParty->_autonote_bits, v10) && v25 ) { v11 = dword_506520++; - pStru179->field_0[v11] = (signed __int16)v10; + pStru179.field_0[v11] = (signed __int16)v10; } } }