Mercurial > mm7

comparison GUIWindow.cpp @ 81:377535d6e366

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
80:48f69ae3bc8d 81:377535d6e366
18 #include "stru179.h" 18 #include "stru179.h"
19 #include "SaveLoad.h" 19 #include "SaveLoad.h"
20 #include "FactionTable.h" 20 #include "FactionTable.h"
21 #include "StorylineTextTable.h" 21 #include "StorylineTextTable.h"
22 #include "Events2D.h" 22 #include "Events2D.h"
23 #include "Autonotes.h"
23 24
24 25
25 #include "mm7_data.h" 26 #include "mm7_data.h"
26 27
27 28
475 v1->CreateButton(0x1DBu, 0x1BDu, 0x9Eu, 0x22u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], 0); 476 v1->CreateButton(0x1DBu, 0x1BDu, 0x9Eu, 0x22u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], 0);
476 pCurrentScreen = 3; 477 pCurrentScreen = 3;
477 dword_506524 = 0; 478 dword_506524 = 0;
478 dword_506528 = 0; 479 dword_506528 = 0;
479 dword_50651C = 0; 480 dword_50651C = 0;
480 dword_506520 = 0; 481 dword_506520 = 0;
481 if ( v1->ptr_1C == (void *)177 ) 482 if ( v1->ptr_1C == (void *)177 )
482 { 483 {
483 byte_506360 = 0; 484 byte_506360 = 0;
484 pTexture_CurrentBook = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("lb_bordr", TEXTURE_16BIT_PALETTE)]; 485 pTexture_CurrentBook = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("lb_bordr", TEXTURE_16BIT_PALETTE)];
485 pTexture_LloydBeacons[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("sbmap", TEXTURE_16BIT_PALETTE)]; 486 pTexture_LloydBeacons[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("sbmap", TEXTURE_16BIT_PALETTE)];
560 pTex_tab_an_7b__zoot_on, 0); 561 pTex_tab_an_7b__zoot_on, 0);
561 dword_506520 = 0; 562 dword_506520 = 0;
562 memset(&pStru179, 0, 0xFA0u); 563 memset(&pStru179, 0, 0xFA0u);
563 for ( i = dword_506528; i < 512; ++i ) 564 for ( i = dword_506528; i < 512; ++i )
564 { 565 {
565 v14 = (&dword_722F10)[4 * i]; 566 v14 = (char *)pQuestTable[i-1];//(&dword_722F10)[4 * i];
566 if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, i) && v14 ) 567 if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, i) && v14 )
567 { 568 {
568 v15 = dword_506520++; 569 v15 = dword_506520++;
569 pStru179->field_0[v15] = i; 570 pStru179.field_0[v15] = i;
570 } 571 }
571 } 572 }
572 } 573 }
573 else 574 else
574 { 575 {
611 v10 = dword_506528; 612 v10 = dword_506528;
612 pBtn_Autonotes_Instructors = v9; 613 pBtn_Autonotes_Instructors = v9;
613 dword_506520 = 0; 614 dword_506520 = 0;
614 while ( v10 < 196 ) 615 while ( v10 < 196 )
615 { 616 {
616 if ( dword_506568 == dword_72371C[2 * v10] ) 617 if ( dword_506568 == pAutonoteTxt[v10-1].eType)//dword_72371C[2 * v10] )
617 { 618 {
618 v25 = (&dword_723718_autonote_related)[8 * (signed __int16)v10]; 619 //v25 = (&dword_723718_autonote_related)[8 * (signed __int16)v10];
620 v25 = (char *)pAutonoteTxt[v10-1].pText;
619 if ( (short)v10 ) 621 if ( (short)v10 )
620 { 622 {
621 if ( (unsigned __int16)_449B57_test_bit(pParty->_autonote_bits, v10) && v25 ) 623 if ( (unsigned __int16)_449B57_test_bit(pParty->_autonote_bits, v10) && v25 )
622 { 624 {
623 v11 = dword_506520++; 625 v11 = dword_506520++;
624 pStru179->field_0[v11] = (signed __int16)v10; 626 pStru179.field_0[v11] = (signed __int16)v10;
625 } 627 }
626 } 628 }
627 } 629 }
628 ++v10; 630 ++v10;
629 } 631 }