Mercurial > mm7
diff mm7_5.cpp @ 542:8e34868c8069
Слияние
author | Ritor1 |
---|---|
date | Sun, 03 Mar 2013 13:32:04 +0600 |
parents | cf5609edbc45 214d9d47cf1f |
children | 9d3d8091251b |
line wrap: on
line diff
--- a/mm7_5.cpp Sun Mar 03 13:30:24 2013 +0600 +++ b/mm7_5.cpp Sun Mar 03 13:32:04 2013 +0600 @@ -6276,7 +6276,7 @@ uTextureID_507B04 = uTextureID_right_panel; v30 = 0; uTextureID_BACKHAND = pIcons_LOD->LoadTexture("BACKHAND", TEXTURE_16BIT_PALETTE); - uTextureID_5118C8 = uTextureID_506438; + uTextureID_5118C8 = uExitCancelTextureId; do { v42 = v30 + 1; @@ -13124,7 +13124,7 @@ pRenderer->DrawTextureTransparent( 0x1D7u, 0x1BDu, - (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); + (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0)); v6.uFrameX = 8; v6.uFrameY = 8; v6.uFrameWidth = 460; @@ -14231,7 +14231,7 @@ enum WindowType pWindowType; // esi@1 pWindowType = (enum WindowType)uBook; - pRenderer->DrawTextureIndexed(471u, 445u, (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); + pRenderer->DrawTextureIndexed(471u, 445u, (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0)); switch ( pWindowType ) { case WINDOW_Lloyd: // 177 @@ -15497,7 +15497,7 @@ draw_leather(); CharacterUI_InventoryTab_Draw(uActiveCharacter, 1); pRenderer->DrawTextureIndexed(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, - (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); + (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0)); } } } @@ -16253,7 +16253,7 @@ { if ( pCurrentScreen == SCREEN_CHEST ) { - __debugbreak(); + // __debugbreak(); if ( !pPlayers[uActiveCharacter]->CanAct() ) { sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[427],//%s %s @@ -16273,7 +16273,7 @@ v9 = pX + pSRZBufferLineOffsets[pY]; if ( !(pRenderer->pActiveZBuffer[v9] & 0xFFFF) ) goto LABEL_132; - v8 = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)pChestWindow->ptr_1C + 18* *((short *)&pChests[0].mm7__vector_pItems[139].uExpireTime + v8 = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)pChestWindow->ptr_1C + 18* *((short *)&pChests[0].igChestItems[139].uExpireTime + (pRenderer->pActiveZBuffer[v9] & 0xFFFF) + 2662 * (unsigned int)pChestWindow->ptr_1C + 3)); } else