Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/GUIWindow.cpp	Sat Jun 08 19:34:33 2013 +0200
+++ b/GUIWindow.cpp	Sat Jun 08 21:33:22 2013 +0200
@@ -34,7 +34,7 @@
 
 int pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[1]; // idb
 struct GUIWindow *pWindow_MainMenu;
-struct GUIWindow pWindowList[20];
+std::array<struct GUIWindow, 20> pWindowList;
 
 struct GUIMessageQueue *pMessageQueue_50CBD0 = new GUIMessageQueue;
 struct GUIMessageQueue *pMessageQueue_50C9E8 = new GUIMessageQueue;
@@ -558,7 +558,7 @@
                                      1, 0, UIMSG_ClickBooksBtn, 0xAu, 0, pGlobalTXT_LocalizationStrings[193],// "Scroll Down"
                                      pTex_tab_an_7b__zoot_on, 0);
       num_achieved_awards = 0;
-      memset(achieved_awards, 0, 4000);
+      memset(achieved_awards.data(), 0, 4000);
       for ( i = dword_506528; i < 512; ++i )
           {
           v14 = (char *)pQuestTable[i-1];//(&dword_722F10)[4 * i];