thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source 
svn-id: r6153
This commit is contained in:
Max Horn 2002-12-25 23:18:30 +00:00
parent a782a22c4d
commit 91fc86eede
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scumm/nut_renderer.cpp
View file

@ -223,14 +223,8 @@ void NutRenderer::drawChar(char c, int32 x, int32 y, byte color) {
for (int32 tx = 0; tx < width; tx++) { for (int32 tx = 0; tx < width; tx++) {
byte pixel = *(_tmpCodecBuffer + ty * width + tx); byte pixel = *(_tmpCodecBuffer + ty * width + tx);
if (pixel != 0) { if (pixel != 0) {
if (color == 0) {
if (pixel == 0x01) if (pixel == 0x01)
pixel = 0xf; pixel = (color == 0) ? 0xf : color;
}
else {
if (pixel == 0x01)
pixel = color;
}
if (pixel == 0xff) if (pixel == 0xff)
pixel = 0x0; pixel = 0x0;
*(_dstPtr + ((ty + y) * _dstPitch + x + tx)) = pixel; *(_dstPtr + ((ty + y) * _dstPitch + x + tx)) = pixel;
@ -238,4 +232,3 @@ void NutRenderer::drawChar(char c, int32 x, int32 y, byte color) {
} }
} }
} }

10
scumm/scummvm.cpp
View file

@ -207,6 +207,11 @@ void Scumm::scummInit()
else else
_resourceHeaderSize = 8; _resourceHeaderSize = 8;
if (_features & GF_OLD256)
_charset = new CharsetRendererOld256(this);
else
_charset = new CharsetRendererClassic(this);
memset(_charsetData, 0, sizeof(_charsetData)); memset(_charsetData, 0, sizeof(_charsetData));
if (!(_features & GF_SMALL_NAMES) && !(_features & GF_AFTER_V8)) if (!(_features & GF_SMALL_NAMES) && !(_features & GF_AFTER_V8))
@ -1552,11 +1557,6 @@ void Scumm::mainRun()
void Scumm::launch() void Scumm::launch()
{ {
if (_features & GF_OLD256)
_charset = new CharsetRendererOld256(this);
else
_charset = new CharsetRendererClassic(this);
gdi._vm = this; gdi._vm = this;
_maxHeapThreshold = 450000; _maxHeapThreshold = 450000;