Mercurial > mm7

comparison GUIWindow.cpp @ 173:a8c700f3f5ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 15 Feb 2013 10:06:47 +0600
parents 91fa025e6ca6
children 05682713195c
comparison
equal deleted inserted replaced
172:e6db0995ac4b 173:a8c700f3f5ec
920 ++pIcons_LOD->uTexturePacksCount; 920 ++pIcons_LOD->uTexturePacksCount;
921 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 921 if ( !pIcons_LOD->uNumPrevLoadedFiles )
922 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 922 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
923 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0); 923 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0);
924 pTexture_mapbordr = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("mapbordr", TEXTURE_16BIT_PALETTE)]; 924 pTexture_mapbordr = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("mapbordr", TEXTURE_16BIT_PALETTE)];
925 pBookFont = LoadFont("book.fnt", "FONTPAL", 0); 925 pBookFont = LoadFont("book.fnt", "FONTPAL", NULL);
926 pBook2Font = LoadFont("book2.fnt", "FONTPAL", 0); 926 pBook2Font = LoadFont("book2.fnt", "FONTPAL", NULL);
927 pAutonoteFont = LoadFont("autonote.fnt", "FONTPAL", 0); 927 pAutonoteFont = LoadFont("autonote.fnt", "FONTPAL", NULL);
928 pSpellFont = LoadFont("spell.fnt", "FONTPAL", 0); 928 pSpellFont = LoadFont("spell.fnt", "FONTPAL", NULL);
929 } 929 }
930 930
931 //----- (00411B59) -------------------------------------------------------- 931 //----- (00411B59) --------------------------------------------------------
932 void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer) 932 void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer)
933 { 933 {