diff GUIWindow.cpp @ 523:8f7f651311bc

Merge
author Nomad
date Sat, 02 Mar 2013 01:32:30 +0200
parents 663c4f618f56
children 5196a51cc9ec
line wrap: on
line diff
--- a/GUIWindow.cpp	Sat Mar 02 01:30:24 2013 +0200
+++ b/GUIWindow.cpp	Sat Mar 02 01:32:30 2013 +0200
@@ -474,10 +474,10 @@
   InitializeBookFonts();
   v1->CreateButton(0x1DBu, 0x1BDu, 0x9Eu, 0x22u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], 0);
   pCurrentScreen = SCREEN_BOOKS;
-  dword_506524 = 0;
+  awards_count2 = 0;
   dword_506528 = 0;
   dword_50651C = 0;
-  dword_506520 = 0;  
+  awards_count = 0;  
   if ( v1->ptr_1C == (void *)177 )
   {
     byte_506360 = 0;
@@ -558,15 +558,15 @@
         pBtn_Book_2 = v1->CreateButton(pViewport->uViewportX + 398, pViewport->uViewportY + 38, pTex_tab_an_7b__zoot_on->uTextureHeight,
                         pTex_tab_an_7b__zoot_on->uTextureHeight, 1, 0, 0x47u, 0xAu, 0, pGlobalTXT_LocalizationStrings[193],// "Scroll Down"
                         pTex_tab_an_7b__zoot_on, 0);
-        dword_506520 = 0;
-        memset(&pStru179, 0, 0xFA0u);
+        awards_count = 0;
+        memset(&achievedAwardsIndex, 0, 4000);
         for ( i = dword_506528; i < 512; ++i )
         {
           v14 = (char *)pQuestTable[i-1];//(&dword_722F10)[4 * i];
-          if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, i) && v14 )
+          if ( _449B57_test_bit(pParty->_quest_bits, i) && v14 )
           {
-            v15 = dword_506520++;
-            pStru179.field_0[v15] = i;
+            v15 = awards_count++;
+            achievedAwardsIndex[v15] = i;
           }
         }
       }
@@ -610,7 +610,7 @@
                  pGlobalTXT_LocalizationStrings[662], pTexture_50636C, 0);// "Instructors"
           v10 = dword_506528;
           pBtn_Autonotes_Instructors = v9;
-          dword_506520 = 0;
+          awards_count = 0;
           while ( v10 < 196 )
           {
 			if ( dword_506568 == pAutonoteTxt[v10-1].eType)//dword_72371C[2 * v10] )
@@ -619,10 +619,10 @@
 			  v25 = (char *)pAutonoteTxt[v10-1].pText;
               if ( (short)v10 )
               {
-                if ( (unsigned __int16)_449B57_test_bit(pParty->_autonote_bits, v10) && v25 )
+                if ( _449B57_test_bit(pParty->_autonote_bits, v10) && v25 )
                 {
-                  v11 = dword_506520++;
-                  pStru179.field_0[v11] = (signed __int16)v10;
+                  v11 = awards_count++;
+                  achievedAwardsIndex[v11] = (signed __int16)v10;
                 }
               }
             }
@@ -704,7 +704,7 @@
                           pGlobalTXT_LocalizationStrings[193],
                           pTex_tab_an_7b__zoot_on,
                           0);
-          dword_506520 = 0;
+          awards_count = 0;
           v26.uFrameX = 48;
           v26.uFrameY = 70;
           v26.uFrameWidth = 360;
@@ -713,7 +713,7 @@
           v26.uFrameZ = 407;
           v26.uFrameHeight = v2 * 264 / v2;
           v26.uFrameW = v26.uFrameHeight + 69;
-          memset(&pStru179, 0, 0xFA0u);
+          memset(&achievedAwardsIndex, 0, 4000);
           memset(byte_5C6D50, 0, 0x64u);
           if ( dword_506528 < 29 )
           {
@@ -731,10 +731,10 @@
                   v8 = v7 + 1;
                   if ( (signed int)v7 + 1 > 0 )
                   {
-                    memset32((char *)&pStru179 + 4 * dword_506520 , i, v8);
+                    memset32((char *)&achievedAwardsIndex + 4 * awards_count , i, v8);
                     do
                     {
-                      LODWORD(v7) = dword_506520++;
+                      LODWORD(v7) = awards_count++;
                       byte_5C6D50[(int)v7] = BYTE4(v7);
                       ++HIDWORD(v7);
                     }
@@ -748,9 +748,9 @@
           }
         }
       }
-      v12 = dword_506520;
-      dword_506520 = 0;
-      dword_506524 = v12;
+      v12 = awards_count;
+      awards_count = 0;
+      awards_count2 = v12;
     }
   }
 }