Mercurial > mm7

comparison GUIWindow.cpp @ 735:6daaa2f18d0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed some house sounds & shop-related stuff
author Nomad
date Fri, 22 Mar 2013 20:01:46 +0200
parents 79ad0526166c
children cf2fbac6edc9
comparison
equal deleted inserted replaced
734:2f4e33c1ed24 735:6daaa2f18d0d
1783 break; 1783 break;
1784 case WINDOW_Dialogue: 1784 case WINDOW_Dialogue:
1785 pMainScreenNum = pCurrentScreen; 1785 pMainScreenNum = pCurrentScreen;
1786 pCurrentScreen = SCREEN_NPC_DIALOGUE; 1786 pCurrentScreen = SCREEN_NPC_DIALOGUE;
1787 pBtn_ExitCancel = pWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], //"Exit" 1787 pBtn_ExitCancel = pWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], //"Exit"
1788 (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0); 1788 pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
1789 if ( pWindow->par1C != 1 ) 1789 if ( pWindow->par1C != 1 )
1790 { 1790 {
1791 num_menu_buttons = 0; 1791 num_menu_buttons = 0;
1792 v11 = LOBYTE(pFontArrus->uFontHeight) - 3; 1792 v11 = LOBYTE(pFontArrus->uFontHeight) - 3;
1793 speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID); 1793 speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID);
1875 break; 1875 break;
1876 case WINDOW_ChangeLocation: 1876 case WINDOW_ChangeLocation:
1877 pMainScreenNum = pCurrentScreen; 1877 pMainScreenNum = pCurrentScreen;
1878 pCurrentScreen = SCREEN_CHANGE_LOCATION; 1878 pCurrentScreen = SCREEN_CHANGE_LOCATION;
1879 pBtn_ExitCancel = pWindow->CreateButton(0x236u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, 0x5Bu, 0, 0x4Eu, pGlobalTXT_LocalizationStrings[156],//Остаться в этой области 1879 pBtn_ExitCancel = pWindow->CreateButton(0x236u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, 0x5Bu, 0, 0x4Eu, pGlobalTXT_LocalizationStrings[156],//Остаться в этой области
1880 (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); 1880 pIcons_LOD->GetTexture(uTextureID_BUTTDESC2), 0);
1881 pBtn_YES = pWindow->CreateButton(0x1E6u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, 0x5Au, 0, 0x59u, pWindow->Hint, 1881 pBtn_YES = pWindow->CreateButton(0x1E6u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, 0x5Au, 0, 0x59u, pWindow->Hint,
1882 (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 0); 1882 pIcons_LOD->GetTexture(uTextureID_BUTTYES2), 0);
1883 pWindow->CreateButton(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], 0x3Fu, 0x49u, 1, 0, 0x5Au, 1u, 0x20u, pWindow->Hint, 0, 0, 0); 1883 pWindow->CreateButton(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], 0x3Fu, 0x49u, 1, 0, 0x5Au, 1u, 0x20u, pWindow->Hint, 0, 0, 0);
1884 pWindow->CreateButton(8u, 8u, 0x1CCu, 0x158u, 1, 0, 0x5Au, 1u, 0, pWindow->Hint, 0); 1884 pWindow->CreateButton(8u, 8u, 0x1CCu, 0x158u, 1, 0, 0x5Au, 1u, 0, pWindow->Hint, 0);
1885 break; 1885 break;
1886 case WINDOW_SpellBook: // окно книги заклов 1886 case WINDOW_SpellBook: // окно книги заклов
1887 InitializeBookTextures(); 1887 InitializeBookTextures();
1905 } 1905 }
1906 if (eWindowType == WINDOW_HouseInterior) 1906 if (eWindowType == WINDOW_HouseInterior)
1907 { 1907 {
1908 pCurrentScreen = SCREEN_HOUSE; 1908 pCurrentScreen = SCREEN_HOUSE;
1909 pBtn_ExitCancel = pWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[80],//Выйти из здания 1909 pBtn_ExitCancel = pWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[80],//Выйти из здания
1910 (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0); 1910 pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
1911 v25 = uNumDialogueNPCPortraits; 1911 v25 = uNumDialogueNPCPortraits;
1912 v26 = 0; 1912 v26 = 0;
1913 if ( uNumDialogueNPCPortraits > 0 ) 1913 if ( uNumDialogueNPCPortraits > 0 )
1914 { 1914 {
1915 do 1915 do
1928 //v27 = (char *)p2DEvents_minus1_::08[13 * a4]; 1928 //v27 = (char *)p2DEvents_minus1_::08[13 * a4];
1929 v27 = (char *)p2DEvents[pButton - 1].pProprieterName; 1929 v27 = (char *)p2DEvents[pButton - 1].pProprieterName;
1930 v30 = v27; 1930 v30 = v27;
1931 v29 = (char*)pGlobalTXT_LocalizationStrings[435];// "Converse with %s" Побеседовать с ^Pt[%s] 1931 v29 = (char*)pGlobalTXT_LocalizationStrings[435];// "Converse with %s" Побеседовать с ^Pt[%s]
1932 } 1932 }
1933 sprintf(&byte_591180[100 * v26], v29, v30); 1933 sprintfex(byte_591180[v26], v29, v30);
1934 HouseNPCData[v26 + 7] = (NPCData *)pWindow->CreateButton(pNPCPortraits_x[uNumDialogueNPCPortraits - 1][v26], 1934 HouseNPCData[v26 + 7] = (NPCData *)pWindow->CreateButton(pNPCPortraits_x[uNumDialogueNPCPortraits - 1][v26],
1935 pNPCPortraits_y[uNumDialogueNPCPortraits - 1][v26], 1935 pNPCPortraits_y[uNumDialogueNPCPortraits - 1][v26],
1936 0x3Fu, 0x49u, 1, 0, 0x19Au, v26, 0, &byte_591180[100 * v26], 0, 0, 0); 1936 0x3Fu, 0x49u, 1, 0, 0x19Au, v26, 0, byte_591180[v26], 0, 0, 0);
1937 ++v26; 1937 ++v26;
1938 v25 = uNumDialogueNPCPortraits; 1938 v25 = uNumDialogueNPCPortraits;
1939 } 1939 }
1940 while ( uWidtha < uNumDialogueNPCPortraits ); 1940 while ( uWidtha < uNumDialogueNPCPortraits );
1941 } 1941 }