Mercurial > mm7

comparison mm7_5.cpp @ 542:8e34868c8069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 03 Mar 2013 13:32:04 +0600
parents cf5609edbc45 214d9d47cf1f
children 9d3d8091251b
comparison
equal deleted inserted replaced
541:cf5609edbc45 542:8e34868c8069
6274 //if ( !pParty->uAlignment || pParty->uAlignment == 1 || pParty->uAlignment == 2 ) 6274 //if ( !pParty->uAlignment || pParty->uAlignment == 1 || pParty->uAlignment == 2 )
6275 uTextureID_BACKDOLL = pIcons_LOD->LoadTexture("BACKDOLL", TEXTURE_16BIT_PALETTE); 6275 uTextureID_BACKDOLL = pIcons_LOD->LoadTexture("BACKDOLL", TEXTURE_16BIT_PALETTE);
6276 uTextureID_507B04 = uTextureID_right_panel; 6276 uTextureID_507B04 = uTextureID_right_panel;
6277 v30 = 0; 6277 v30 = 0;
6278 uTextureID_BACKHAND = pIcons_LOD->LoadTexture("BACKHAND", TEXTURE_16BIT_PALETTE); 6278 uTextureID_BACKHAND = pIcons_LOD->LoadTexture("BACKHAND", TEXTURE_16BIT_PALETTE);
6279 uTextureID_5118C8 = uTextureID_506438; 6279 uTextureID_5118C8 = uExitCancelTextureId;
6280 do 6280 do
6281 { 6281 {
6282 v42 = v30 + 1; 6282 v42 = v30 + 1;
6283 if ( sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(v30 + 1) ) 6283 if ( sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(v30 + 1) )
6284 { 6284 {
13122 pRenderer->ClearZBuffer(0, 479); 13122 pRenderer->ClearZBuffer(0, 479);
13123 pRenderer->DrawTextureTransparent(8u, 8u, pTexture_CurrentBook); 13123 pRenderer->DrawTextureTransparent(8u, 8u, pTexture_CurrentBook);
13124 pRenderer->DrawTextureTransparent( 13124 pRenderer->DrawTextureTransparent(
13125 0x1D7u, 13125 0x1D7u,
13126 0x1BDu, 13126 0x1BDu,
13127 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); 13127 (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0));
13128 v6.uFrameX = 8; 13128 v6.uFrameX = 8;
13129 v6.uFrameY = 8; 13129 v6.uFrameY = 8;
13130 v6.uFrameWidth = 460; 13130 v6.uFrameWidth = 460;
13131 v6.uFrameHeight = 344; 13131 v6.uFrameHeight = 344;
13132 v6.uFrameZ = 467; 13132 v6.uFrameZ = 467;
14229 void __thiscall SellectDrawBook(unsigned int uBook) 14229 void __thiscall SellectDrawBook(unsigned int uBook)
14230 { 14230 {
14231 enum WindowType pWindowType; // esi@1 14231 enum WindowType pWindowType; // esi@1
14232 14232
14233 pWindowType = (enum WindowType)uBook; 14233 pWindowType = (enum WindowType)uBook;
14234 pRenderer->DrawTextureIndexed(471u, 445u, (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); 14234 pRenderer->DrawTextureIndexed(471u, 445u, (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0));
14235 switch ( pWindowType ) 14235 switch ( pWindowType )
14236 { 14236 {
14237 case WINDOW_Lloyd: // 177 14237 case WINDOW_Lloyd: // 177
14238 DrawLloydBeaconsScreen(); 14238 DrawLloydBeaconsScreen();
14239 break; 14239 break;
15495 { 15495 {
15496 pRenderer->ClearZBuffer(0, 479); 15496 pRenderer->ClearZBuffer(0, 479);
15497 draw_leather(); 15497 draw_leather();
15498 CharacterUI_InventoryTab_Draw(uActiveCharacter, 1); 15498 CharacterUI_InventoryTab_Draw(uActiveCharacter, 1);
15499 pRenderer->DrawTextureIndexed(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, 15499 pRenderer->DrawTextureIndexed(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY,
15500 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); 15500 (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0));
15501 } 15501 }
15502 } 15502 }
15503 } 15503 }
15504 } 15504 }
15505 else if (pWindowType == WINDOW_GreetingNPC ) 15505 else if (pWindowType == WINDOW_GreetingNPC )
16251 pEventTimer->Pause(); 16251 pEventTimer->Pause();
16252 if ( pCurrentScreen <= SCREEN_CHEST ) 16252 if ( pCurrentScreen <= SCREEN_CHEST )
16253 { 16253 {
16254 if ( pCurrentScreen == SCREEN_CHEST ) 16254 if ( pCurrentScreen == SCREEN_CHEST )
16255 { 16255 {
16256 __debugbreak(); 16256 // __debugbreak();
16257 if ( !pPlayers[uActiveCharacter]->CanAct() ) 16257 if ( !pPlayers[uActiveCharacter]->CanAct() )
16258 { 16258 {
16259 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[427],//%s %s 16259 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[427],//%s %s
16260 pPlayers[uActiveCharacter]->pName, pGlobalTXT_LocalizationStrings[541]);// 16260 pPlayers[uActiveCharacter]->pName, pGlobalTXT_LocalizationStrings[541]);//
16261 pWindow.Hint = pTmpBuf; 16261 pWindow.Hint = pTmpBuf;
16271 goto LABEL_132; 16271 goto LABEL_132;
16272 } 16272 }
16273 v9 = pX + pSRZBufferLineOffsets[pY]; 16273 v9 = pX + pSRZBufferLineOffsets[pY];
16274 if ( !(pRenderer->pActiveZBuffer[v9] & 0xFFFF) ) 16274 if ( !(pRenderer->pActiveZBuffer[v9] & 0xFFFF) )
16275 goto LABEL_132; 16275 goto LABEL_132;
16276 v8 = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)pChestWindow->ptr_1C + 18* *((short *)&pChests[0].mm7__vector_pItems[139].uExpireTime 16276 v8 = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)pChestWindow->ptr_1C + 18* *((short *)&pChests[0].igChestItems[139].uExpireTime
16277 + (pRenderer->pActiveZBuffer[v9] & 0xFFFF) + 2662 * (unsigned int)pChestWindow->ptr_1C + 3)); 16277 + (pRenderer->pActiveZBuffer[v9] & 0xFFFF) + 2662 * (unsigned int)pChestWindow->ptr_1C + 3));
16278 } 16278 }
16279 else 16279 else
16280 { 16280 {
16281 if ( pCurrentScreen ) 16281 if ( pCurrentScreen )