Mercurial > mm7

comparison mm7_4.cpp @ 184:428cbb33872c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 15 Feb 2013 18:34:53 +0600
parents c5bd7a825ef2
children 49728858c35e 038a4d09406f
comparison
equal deleted inserted replaced
183:27573ee0d434 184:428cbb33872c
5829 (Texture *)(uTextureID_BUTTMAKE != -1 ? &pIcons_LOD->pTextures[uTextureID_BUTTMAKE] : 0), 0); 5829 (Texture *)(uTextureID_BUTTMAKE != -1 ? &pIcons_LOD->pTextures[uTextureID_BUTTMAKE] : 0), 0);
5830 pPlayerCreationUI_BtnReset = pGUIWindow_CurrentMenu->CreateButton(527, 431, 51, 39, 1, 0, 0x43, 0, 0x43, "", 5830 pPlayerCreationUI_BtnReset = pGUIWindow_CurrentMenu->CreateButton(527, 431, 51, 39, 1, 0, 0x43, 0, 0x43, "",
5831 (Texture *)(uTextureID_BUTTMAKE2 != -1 ? &pIcons_LOD->pTextures[uTextureID_BUTTMAKE2] : 0), 0); 5831 (Texture *)(uTextureID_BUTTMAKE2 != -1 ? &pIcons_LOD->pTextures[uTextureID_BUTTMAKE2] : 0), 0);
5832 pPlayerCreationUI_BtnMinus = pGUIWindow_CurrentMenu->CreateButton(523, 393, 20, 35, 1, 0, 0x3F, 0, 0x2D, "", pTexture_buttminu, 0); 5832 pPlayerCreationUI_BtnMinus = pGUIWindow_CurrentMenu->CreateButton(523, 393, 20, 35, 1, 0, 0x3F, 0, 0x2D, "", pTexture_buttminu, 0);
5833 pPlayerCreationUI_BtnPlus = pGUIWindow_CurrentMenu->CreateButton(613, 393, 20, 35, 1, 0, 0x3E, 1, 0x2B, "", pTexture_buttplus, 0); 5833 pPlayerCreationUI_BtnPlus = pGUIWindow_CurrentMenu->CreateButton(613, 393, 20, 35, 1, 0, 0x3E, 1, 0x2B, "", pTexture_buttplus, 0);
5834 pFontCChar = LoadFont("cchar.fnt", "FONTPAL", 0); 5834 pFontCChar = LoadFont("cchar.fnt", "FONTPAL", NULL);
5835 } 5835 }
5836 // 4E28F8: using guessed type int pCurrentScreen; 5836 // 4E28F8: using guessed type int pCurrentScreen;
5837 5837
5838 //----- (0049750E) -------------------------------------------------------- 5838 //----- (0049750E) --------------------------------------------------------
5839 void __cdecl DeleteCCharFont() 5839 void __cdecl DeleteCCharFont()
6156 RGBTexture pTexture; // [sp+54h] [bp-E8h]@1 6156 RGBTexture pTexture; // [sp+54h] [bp-E8h]@1
6157 RGBTexture pTexture2; // [sp+100h] [bp-3Ch]@1 6157 RGBTexture pTexture2; // [sp+100h] [bp-3Ch]@1
6158 Texture pTexture3; // [sp+Ch] [bp-130h]@5 6158 Texture pTexture3; // [sp+Ch] [bp-130h]@5
6159 6159
6160 a5 = 0; 6160 a5 = 0;
6161 pFontQuick = LoadFont("quick.fnt", "FONTPAL", 0); 6161 pFontQuick = LoadFont("quick.fnt", "FONTPAL", NULL);
6162 pFontCChar = LoadFont("cchar.fnt", "FONTPAL", 0); 6162 pFontCChar = LoadFont("cchar.fnt", "FONTPAL", NULL);
6163 if ( pMessageQueue_50CBD0->uNumMessages ) 6163 if ( pMessageQueue_50CBD0->uNumMessages )
6164 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 6164 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
6165 ++pIcons_LOD->uTexturePacksCount; 6165 ++pIcons_LOD->uTexturePacksCount;
6166 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 6166 if ( !pIcons_LOD->uNumPrevLoadedFiles )
6167 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 6167 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;