Mercurial > mm7

comparison GUIWindow.cpp @ 1202:0dbf6c4dd029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrays to std::arrays phase 1
author Grumpy7
date Sat, 08 Jun 2013 21:33:22 +0200
parents 29a8defbad9e
children 8c02e6f74b29
comparison
equal deleted inserted replaced
1196:44f37efc159c 1202:0dbf6c4dd029
32 32
33 33
34 34
35 int pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[1]; // idb 35 int pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[1]; // idb
36 struct GUIWindow *pWindow_MainMenu; 36 struct GUIWindow *pWindow_MainMenu;
37 struct GUIWindow pWindowList[20]; 37 std::array<struct GUIWindow, 20> pWindowList;
38 38
39 struct GUIMessageQueue *pMessageQueue_50CBD0 = new GUIMessageQueue; 39 struct GUIMessageQueue *pMessageQueue_50CBD0 = new GUIMessageQueue;
40 struct GUIMessageQueue *pMessageQueue_50C9E8 = new GUIMessageQueue; 40 struct GUIMessageQueue *pMessageQueue_50C9E8 = new GUIMessageQueue;
41 41
42 42
556 pBtn_Book_2 = v1->CreateButton(pViewport->uViewportTL_X + 398, pViewport->uViewportTL_Y + 38, 556 pBtn_Book_2 = v1->CreateButton(pViewport->uViewportTL_X + 398, pViewport->uViewportTL_Y + 38,
557 pTex_tab_an_7b__zoot_on->uTextureHeight, pTex_tab_an_7b__zoot_on->uTextureHeight, 557 pTex_tab_an_7b__zoot_on->uTextureHeight, pTex_tab_an_7b__zoot_on->uTextureHeight,
558 1, 0, UIMSG_ClickBooksBtn, 0xAu, 0, pGlobalTXT_LocalizationStrings[193],// "Scroll Down" 558 1, 0, UIMSG_ClickBooksBtn, 0xAu, 0, pGlobalTXT_LocalizationStrings[193],// "Scroll Down"
559 pTex_tab_an_7b__zoot_on, 0); 559 pTex_tab_an_7b__zoot_on, 0);
560 num_achieved_awards = 0; 560 num_achieved_awards = 0;
561 memset(achieved_awards, 0, 4000); 561 memset(achieved_awards.data(), 0, 4000);
562 for ( i = dword_506528; i < 512; ++i ) 562 for ( i = dword_506528; i < 512; ++i )
563 { 563 {
564 v14 = (char *)pQuestTable[i-1];//(&dword_722F10)[4 * i]; 564 v14 = (char *)pQuestTable[i-1];//(&dword_722F10)[4 * i];
565 if ( _449B57_test_bit(pParty->_quest_bits, i) && v14 ) 565 if ( _449B57_test_bit(pParty->_quest_bits, i) && v14 )
566 { 566 {