diff GUIWindow.cpp @ 394:172f1f9f55f4

Слияние
author Ritor1
date Fri, 22 Feb 2013 18:32:47 +0600
parents 85edec9da96b
children 7f817679b60e
line wrap: on
line diff
--- a/GUIWindow.cpp	Fri Feb 22 18:32:34 2013 +0600
+++ b/GUIWindow.cpp	Fri Feb 22 18:32:47 2013 +0600
@@ -985,10 +985,10 @@
   {
     if (!chapter->bIsSpellAvailable[i])
       continue;
-
-      v4 = (12 * pPlayer->lastOpenedSpellbookPage + pSpellbookSpellIndices[pPlayer->lastOpenedSpellbookPage][i + 1]);
-      CreateButton(pViewport->uViewportX +  pIconPos[v4].Xpos,
-                   pViewport->uViewportY + pIconPos[v4].Ypos,  //dword_4E20D0
+		v4= pPlayer->lastOpenedSpellbookPage;
+      //v4 = (12 * pPlayer->lastOpenedSpellbookPage + pSpellbookSpellIndices[pPlayer->lastOpenedSpellbookPage][i + 1]);
+      CreateButton(pViewport->uViewportX +  pIconPos[v4][pSpellbookSpellIndices[v4][i+1]].Xpos,
+                   pViewport->uViewportY +  pIconPos[v4][pSpellbookSpellIndices[v4][i+1]].Ypos,  //dword_4E20D0
                    dword_506408[i + 1]->uTextureWidth,
                    dword_506408[i + 1]->uTextureHeight,
                    1, 79, 0x56u, i, 0, "", 0);
@@ -1171,7 +1171,7 @@
           sub_4B6478();
           break;
         case 1:
-          sub_4B910F();
+          _4B910F_shop_interaction();
           break;
         case 2:
           sub_4BA928();
@@ -1233,14 +1233,14 @@
 LABEL_58:
   if ( array_5913D8[6] == (NPCData *)uNumDialogueNPCPortraits && uHouse_ExitPic )
   {
-    pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u, (Texture *)(uTextureID_x_x_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
+    pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u, (Texture *)(uTextureID_x_x_u != -1 ? &pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
     v16 = (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0);
     v14 = 451;
     v12 = 476;
   }
   else
   {
-    v16 = (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0);
+    v16 = (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0);
     v14 = 445;
     v12 = 471;
   }