Mercurial > mm7

comparison mm7_2.cpp @ 945:0d96349d8c87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restoring inlined methods
author Nomad
date Wed, 01 May 2013 14:09:49 +0200
parents 4dd4184d4248
children eb3bb0f2e1b9
comparison
equal deleted inserted replaced
940:4dd4184d4248 945:0d96349d8c87
288 288
289 uDialogueType = 83; 289 uDialogueType = 83;
290 pDialogueWindow->Release(); 290 pDialogueWindow->Release();
291 pDialogueWindow = GUIWindow::Create(0, 0, 640, 350, WINDOW_MainMenu, 0, 0); 291 pDialogueWindow = GUIWindow::Create(0, 0, 640, 350, WINDOW_MainMenu, 0, 0);
292 pBtn_ExitCancel = pDialogueWindow->CreateButton(471u, 445u, 169u, 35u, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[34],// "Cancel" 292 pBtn_ExitCancel = pDialogueWindow->CreateButton(471u, 445u, 169u, 35u, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[34],// "Cancel"
293 (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0); 293 pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
294 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0); 294 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
295 pDialogueWindow->CreateButton(480u, 160u, 140u, 30u, 1, 0, UIMSG_0, 0x53u, 0, "", 0); 295 pDialogueWindow->CreateButton(480u, 160u, 140u, 30u, 1, 0, UIMSG_0, 0x53u, 0, "", 0);
296 pDialogueWindow->_41D08F(1, 1, 0, 2); 296 pDialogueWindow->_41D08F(1, 1, 0, 2);
297 dialog_menu_id = HOUSE_DIALOGUE_OTHER; 297 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
298 v0 = (int)((char *)window_SpeakInHouse->ptr_1C - 102); 298 v0 = (int)((char *)window_SpeakInHouse->ptr_1C - 102);
431 } 431 }
432 pDialogueWindow->pControlsHead = 0; 432 pDialogueWindow->pControlsHead = 0;
433 pDialogueWindow->pControlsTail = 0; 433 pDialogueWindow->pControlsTail = 0;
434 pDialogueWindow->uNumControls = 0; 434 pDialogueWindow->uNumControls = 0;
435 pBtn_ExitCancel = pDialogueWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[79], 435 pBtn_ExitCancel = pDialogueWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[79],
436 (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0); 436 pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
437 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x55u, 0, "", 0); 437 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x55u, 0, "", 0);
438 pDialogueWindow->CreateButton(0x1E0u, 0xBEu, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x56u, 0, "", 0); 438 pDialogueWindow->CreateButton(0x1E0u, 0xBEu, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x56u, 0, "", 0);
439 pDialogueWindow->CreateButton(0x1E0u, 0xDCu, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x57u, 0, "", 0); 439 pDialogueWindow->CreateButton(0x1E0u, 0xDCu, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x57u, 0, "", 0);
440 pDialogueWindow->CreateButton(0x1E0u, 0xFAu, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x58u, 0, "", 0); 440 pDialogueWindow->CreateButton(0x1E0u, 0xFAu, 0x8Cu, 0x1Eu, 1, 0, UIMSG_SelectNPCDialogueOption, 0x58u, 0, "", 0);
441 pDialogueWindow->_41D08F(4, 1, 0, 1); 441 pDialogueWindow->_41D08F(4, 1, 0, 1);
576 pViewport->uViewportTL_Y, 576 pViewport->uViewportTL_Y,
577 pViewport->uViewportBR_X - pViewport->uViewportTL_X, 577 pViewport->uViewportBR_X - pViewport->uViewportTL_X,
578 pViewport->uViewportBR_Y - pViewport->uViewportTL_Y + 1, 578 pViewport->uViewportBR_Y - pViewport->uViewportTL_Y + 1,
579 pRenderer->uTargetGMask | pRenderer->uTargetBMask); 579 pRenderer->uTargetGMask | pRenderer->uTargetBMask);
580 580
581 auto pTex = (uTextureID_Leather != -1 ? &pIcons_LOD->pTextures[uTextureID_Leather] : nullptr); 581 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather);
582 pRenderer->_4A6A68( 582 pRenderer->_4A6A68(8, 352 - v0, pTex, pTex->uTextureHeight - v0);
583 8u,
584 352 - v0,
585 pTex,
586 (pTex ? pTex->uTextureHeight : 26) - v0);
587 583
588 pRenderer->DrawTextureIndexed(8u, 347 - v0, pTexture_591428); 584 pRenderer->DrawTextureIndexed(8u, 347 - v0, pTexture_591428);
589 v1 = FitTextInAWindow(pGlobalTXT_LocalizationStrings[575], pFontArrus, &window, 0xDu, 0); 585 v1 = FitTextInAWindow(pGlobalTXT_LocalizationStrings[575], pFontArrus, &window, 0xDu, 0);
590 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v0, 0, v1, 0, 0, 0); 586 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v0, 0, v1, 0, 0, 0);
591 pRenderer->EndScene(); 587 pRenderer->EndScene();