Mercurial > mm7

comparison GUIWindow.cpp @ 162:3a8e7802f241

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 13 Feb 2013 09:52:42 +0600
parents f4ebd13c2a8e
children 572d821561f3
comparison
equal deleted inserted replaced
161:49e74dee4eab 162:3a8e7802f241
2025 _4B4224_UpdateNPCTopics(0); 2025 _4B4224_UpdateNPCTopics(0);
2026 } 2026 }
2027 } 2027 }
2028 else 2028 else
2029 { 2029 {
2030 if (eWindowType == WINDOW_1A) 2030 if (eWindowType == WINDOW_Transition)
2031 { 2031 {
2032 pMainScreenNum = pCurrentScreen; 2032 pMainScreenNum = pCurrentScreen;
2033 pCurrentScreen = SCREEN_INPUT_BLV; 2033 pCurrentScreen = SCREEN_INPUT_BLV;
2034 pBtn_ExitCancel = pWindow->CreateButton(0x236u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, 0x19Cu, 0, 0x4Eu, pGlobalTXT_LocalizationStrings[34],// 2034 pBtn_ExitCancel = pWindow->CreateButton(0x236u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, 0x19Cu, 0, 0x4Eu, pGlobalTXT_LocalizationStrings[34],//
2035 (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); 2035 (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0);
2045 pAudioPlayer->StopChannels(-1, -1); 2045 pAudioPlayer->StopChannels(-1, -1);
2046 pMouse->SetCursorBitmap("MICON2"); 2046 pMouse->SetCursorBitmap("MICON2");
2047 ShowStatusBarString(pGlobalTXT_LocalizationStrings[39], 2u);// 2047 ShowStatusBarString(pGlobalTXT_LocalizationStrings[39], 2u);//
2048 return pWindow; 2048 return pWindow;
2049 } 2049 }
2050 if (eWindowType == WINDOW_1E) 2050 if (eWindowType == WINDOW_Scroll)
2051 //goto LABEL_62; 2051 //goto LABEL_62;
2052 { 2052 {
2053 pWindow->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); 2053 pWindow->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, "", 0);
2054 pWindow->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); 2054 pWindow->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, "", 0);
2055 pWindow->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); 2055 pWindow->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 3u, 0x33u, "", 0);