Mercurial > mm7

comparison GUIWindow.cpp @ 394:172f1f9f55f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Feb 2013 18:32:47 +0600
parents 85edec9da96b
children 7f817679b60e
comparison
equal deleted inserted replaced
393:c1a45052d634 394:172f1f9f55f4
983 auto chapter = &pPlayer->spellbook.pChapters[pPlayer->lastOpenedSpellbookPage]; 983 auto chapter = &pPlayer->spellbook.pChapters[pPlayer->lastOpenedSpellbookPage];
984 for (uint i = 0; i < 11; ++i) 984 for (uint i = 0; i < 11; ++i)
985 { 985 {
986 if (!chapter->bIsSpellAvailable[i]) 986 if (!chapter->bIsSpellAvailable[i])
987 continue; 987 continue;
988 988 v4= pPlayer->lastOpenedSpellbookPage;
989 v4 = (12 * pPlayer->lastOpenedSpellbookPage + pSpellbookSpellIndices[pPlayer->lastOpenedSpellbookPage][i + 1]); 989 //v4 = (12 * pPlayer->lastOpenedSpellbookPage + pSpellbookSpellIndices[pPlayer->lastOpenedSpellbookPage][i + 1]);
990 CreateButton(pViewport->uViewportX + pIconPos[v4].Xpos, 990 CreateButton(pViewport->uViewportX + pIconPos[v4][pSpellbookSpellIndices[v4][i+1]].Xpos,
991 pViewport->uViewportY + pIconPos[v4].Ypos, //dword_4E20D0 991 pViewport->uViewportY + pIconPos[v4][pSpellbookSpellIndices[v4][i+1]].Ypos, //dword_4E20D0
992 dword_506408[i + 1]->uTextureWidth, 992 dword_506408[i + 1]->uTextureWidth,
993 dword_506408[i + 1]->uTextureHeight, 993 dword_506408[i + 1]->uTextureHeight,
994 1, 79, 0x56u, i, 0, "", 0); 994 1, 79, 0x56u, i, 0, "", 0);
995 ++a2; 995 ++a2;
996 //++v3; 996 //++v3;
1169 { 1169 {
1170 case 18: 1170 case 18:
1171 sub_4B6478(); 1171 sub_4B6478();
1172 break; 1172 break;
1173 case 1: 1173 case 1:
1174 sub_4B910F(); 1174 _4B910F_shop_interaction();
1175 break; 1175 break;
1176 case 2: 1176 case 2:
1177 sub_4BA928(); 1177 sub_4BA928();
1178 break; 1178 break;
1179 case 3: 1179 case 3:
1231 } 1231 }
1232 } 1232 }
1233 LABEL_58: 1233 LABEL_58:
1234 if ( array_5913D8[6] == (NPCData *)uNumDialogueNPCPortraits && uHouse_ExitPic ) 1234 if ( array_5913D8[6] == (NPCData *)uNumDialogueNPCPortraits && uHouse_ExitPic )
1235 { 1235 {
1236 pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u, (Texture *)(uTextureID_x_x_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_x_u] : 0)); 1236 pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u, (Texture *)(uTextureID_x_x_u != -1 ? &pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
1237 v16 = (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0); 1237 v16 = (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0);
1238 v14 = 451; 1238 v14 = 451;
1239 v12 = 476; 1239 v12 = 476;
1240 } 1240 }
1241 else 1241 else
1242 { 1242 {
1243 v16 = (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0); 1243 v16 = (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0);
1244 v14 = 445; 1244 v14 = 445;
1245 v12 = 471; 1245 v12 = 471;
1246 } 1246 }
1247 pRenderer->DrawTextureIndexed(v12, v14, v16); 1247 pRenderer->DrawTextureIndexed(v12, v14, v16);
1248 } 1248 }