Mercurial > mm7

comparison mm7_1.cpp @ 710:735dab8d3c9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Town portal screen + misc gui const replacements
author Nomad
date Thu, 21 Mar 2013 20:30:17 +0200
parents d6236f6a9882
children 9d13d2ec35a6
comparison
equal deleted inserted replaced
709:af08fc9e29c8 710:735dab8d3c9a
736 pEventTimer->Pause(); 736 pEventTimer->Pause();
737 pAudioPlayer->StopChannels(-1, -1); 737 pAudioPlayer->StopChannels(-1, -1);
738 bRingsShownInCharScreen = 0; 738 bRingsShownInCharScreen = 0;
739 CharacterUI_LoadPaperdollTextures(); 739 CharacterUI_LoadPaperdollTextures();
740 pCurrentScreen = SCREEN_CASTING; 740 pCurrentScreen = SCREEN_CASTING;
741 v2 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|WINDOW_Options), v1, 0); 741 v2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_1F, v1, 0);
742 pCharacterScreen_ExitBtn = v2->CreateButton( 742 pCharacterScreen_ExitBtn = v2->CreateButton(
743 394u, 743 394u,
744 318u, 744 318u,
745 75u, 745 75u,
746 33u, 746 33u,
747 1, 747 1,
748 0, 748 0,
749 0xA8u, 749 0xA8u,
750 0, 750 0,
751 0, 751 0,
752 pGlobalTXT_LocalizationStrings[79], 752 pGlobalTXT_LocalizationStrings[79], // Close
753 (Texture *)(papredoll_dbrds[2] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[2]] : 0), 753 (Texture *)(papredoll_dbrds[2] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[2]] : 0),
754 papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0, 754 papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0,
755 0); 755 0);
756 v2->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, 0x78u, 0, 0, "", 0); 756 v2->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, 0x78u, 0, 0, "", 0);
757 pCharacterScreen_DollBtn = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, 0x85u, 0, 0, "", 0); 757 pCharacterScreen_DollBtn = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, 0x85u, 0, 0, "", 0);