Mercurial > mm7

comparison mm7_4.cpp @ 450:9dc0dffaf7c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 24 Feb 2013 00:10:18 +0600
parents ee47cc585e1b ad1e9c0bf6da
children f56c98a2ab52
comparison
equal deleted inserted replaced
449:510fb376ef2f 450:9dc0dffaf7c6
11239 0x59u, 11239 0x59u,
11240 byte_591098, 11240 byte_591098,
11241 (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 11241 (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0),
11242 0); 11242 0);
11243 pDialogueWindow->CreateButton( 11243 pDialogueWindow->CreateButton(
11244 pNPCPortraits_x, 11244 pNPCPortraits_x[0][0],
11245 pNPCPortraits_y, 11245 pNPCPortraits_y[0][0],
11246 63u, 11246 63u,
11247 73u, 11247 73u,
11248 1, 11248 1,
11249 0, 11249 0,
11250 0xBFu, 11250 0xBFu,