Mercurial > mm7

comparison mm7_1.cpp @ 726:9d13d2ec35a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Mar 2013 01:29:46 +0600
parents 70c5a87a1307 735dab8d3c9a
children 585490c29945
comparison
equal deleted inserted replaced
725:7037f22cd716 726:9d13d2ec35a6
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);