Mercurial > mm7
comparison mm7_1.cpp @ 184:428cbb33872c
Слияние
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 |
---|---|
1605 pSRZBufferLineOffsets[i] = 640 * i; | 1605 pSRZBufferLineOffsets[i] = 640 * i; |
1606 | 1606 |
1607 pRenderer->ResetClip(); | 1607 pRenderer->ResetClip(); |
1608 | 1608 |
1609 uTextureID_FONTPAL = pIcons_LOD->LoadTexture("FONTPAL", TEXTURE_16BIT_PALETTE); | 1609 uTextureID_FONTPAL = pIcons_LOD->LoadTexture("FONTPAL", TEXTURE_16BIT_PALETTE); |
1610 pFontArrus = LoadFont("arrus.fnt", "FONTPAL", 0); | 1610 pFontArrus = LoadFont("arrus.fnt", "FONTPAL", NULL); |
1611 pFontLucida = LoadFont("lucida.fnt", "FONTPAL", 0); | 1611 pFontLucida = LoadFont("lucida.fnt", "FONTPAL", NULL); |
1612 pFontCreate = LoadFont("create.fnt", "FONTPAL", 0); | 1612 pFontCreate = LoadFont("create.fnt", "FONTPAL", NULL); |
1613 pFontSmallnum = LoadFont("smallnum.fnt", "FONTPAL", 0); | 1613 pFontSmallnum = LoadFont("smallnum.fnt", "FONTPAL", NULL); |
1614 pFontComic = LoadFont("comic.fnt", "FONTPAL", 0); | 1614 pFontComic = LoadFont("comic.fnt", "FONTPAL", NULL); |
1615 pFontArrus->field_3 = 0; | 1615 pFontArrus->field_3 = 0; |
1616 pFontLucida->field_3 = 0; | 1616 pFontLucida->field_3 = 0; |
1617 pFontCreate->field_3 = 0; | 1617 pFontCreate->field_3 = 0; |
1618 | 1618 |
1619 for (uint i = 0; i < 20; ++i) | 1619 for (uint i = 0; i < 20; ++i) |