Mercurial > mm7

comparison mm7_1.cpp @ 948:5a2dbb00c399

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code cleaning.
author Nomad
date Wed, 01 May 2013 17:31:10 +0200
parents 0d96349d8c87
children c0d0656aa662
comparison
equal deleted inserted replaced
947:99aa9c8464cf 948:5a2dbb00c399
444 pTexture_RestUI_CurrentSkyFrame->Release(); 444 pTexture_RestUI_CurrentSkyFrame->Release();
445 if ( pTexture_RestUI_CurrentHourglassFrame ) 445 if ( pTexture_RestUI_CurrentHourglassFrame )
446 pTexture_RestUI_CurrentHourglassFrame->Release(); 446 pTexture_RestUI_CurrentHourglassFrame->Release();
447 pIcons_LOD->_40F9C5(); 447 pIcons_LOD->_40F9C5();
448 sprintf(pTmpBuf, "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour); 448 sprintf(pTmpBuf, "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour);
449 pTexture_RestUI_CurrentSkyFrame = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE)]; 449 pTexture_RestUI_CurrentSkyFrame = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE);
450 } 450 }
451 451
452 //----- (0041F5BE) -------------------------------------------------------- 452 //----- (0041F5BE) --------------------------------------------------------
453 void __cdecl Sleep6Hours() 453 void __cdecl Sleep6Hours()
454 { 454 {
696 pGlobalTXT_LocalizationStrings[79], // Close 696 pGlobalTXT_LocalizationStrings[79], // Close
697 pIcons_LOD->GetTexture(papredoll_dbrds[2]), 697 pIcons_LOD->GetTexture(papredoll_dbrds[2]),
698 pIcons_LOD->GetTexture(papredoll_dbrds[1]), 0); 698 pIcons_LOD->GetTexture(papredoll_dbrds[1]), 0);
699 v2->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, UIMSG_InventoryLeftClick, 0, 0, "", 0); 699 v2->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, UIMSG_InventoryLeftClick, 0, 0, "", 0);
700 pCharacterScreen_DollBtn = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, UIMSG_ClickPaperdoll, 0, 0, "", 0); 700 pCharacterScreen_DollBtn = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, UIMSG_ClickPaperdoll, 0, 0, "", 0);
701 v2->CreateButton(61u, 424u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 1u, 0x31u, "", 0); 701 v2->CreateButton( 61, 424, 31, 0, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
702 v2->CreateButton(177u, 424u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 2u, 0x32u, "", 0); 702 v2->CreateButton(177, 424, 31, 0, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
703 v2->CreateButton(292u, 424u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 3u, 0x33u, "", 0); 703 v2->CreateButton(292, 424, 31, 0, 2, 94, UIMSG_SelectCharacter, 3, '3', "", 0);
704 v2->CreateButton(407u, 424u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 4u, 0x34u, "", 0); 704 v2->CreateButton(407, 424, 31, 0, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
705 return v2; 705 return v2;
706 } 706 }
707 707
708 //----- (00421B2C) -------------------------------------------------------- 708 //----- (00421B2C) --------------------------------------------------------
709 bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem() 709 bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem()
1501 uTextureID_5076A8 = pIcons_LOD->LoadTexture("cornr_ur", TEXTURE_16BIT_PALETTE); 1501 uTextureID_5076A8 = pIcons_LOD->LoadTexture("cornr_ur", TEXTURE_16BIT_PALETTE);
1502 uTextureID_5076A4 = pIcons_LOD->LoadTexture("edge_btm", TEXTURE_16BIT_PALETTE); 1502 uTextureID_5076A4 = pIcons_LOD->LoadTexture("edge_btm", TEXTURE_16BIT_PALETTE);
1503 uTextureID_5076A0 = pIcons_LOD->LoadTexture("edge_lf", TEXTURE_16BIT_PALETTE); 1503 uTextureID_5076A0 = pIcons_LOD->LoadTexture("edge_lf", TEXTURE_16BIT_PALETTE);
1504 uTextureID_50769C = pIcons_LOD->LoadTexture("edge_rt", TEXTURE_16BIT_PALETTE); 1504 uTextureID_50769C = pIcons_LOD->LoadTexture("edge_rt", TEXTURE_16BIT_PALETTE);
1505 uTextureID_507698 = pIcons_LOD->LoadTexture("edge_top", TEXTURE_16BIT_PALETTE); 1505 uTextureID_507698 = pIcons_LOD->LoadTexture("edge_top", TEXTURE_16BIT_PALETTE);
1506 pTexture_591428 = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("endcap", TEXTURE_16BIT_PALETTE)]; 1506 pTexture_591428 = pIcons_LOD->LoadTexturePtr("endcap", TEXTURE_16BIT_PALETTE);
1507 1507
1508 } 1508 }
1509 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xAu, 0, 0); 1509 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xAu, 0, 0);
1510 v4 = 214; 1510 v4 = 214;
1511 v5 = 230; 1511 v5 = 230;