libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-26 06:18:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed more dead weight

Browse Source 
svn-id: r6277
This commit is contained in:
Max Horn 2002-12-30 13:55:36 +00:00
parent 85fe4018bc
commit 69dfba70eb
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/charset.cpp
View File

@ -403,8 +403,6 @@ CharsetRendererNut::CharsetRendererNut(Scumm *vm)
delete _fr[i];
_fr[i] = NULL;
}
_fr[i]->bindDisplay(_vm->virtscr[0].screenPtr, _vm->_realWidth, _vm->_realHeight, _vm->_realWidth);
}
}

20
scumm/nut_renderer.cpp
View File

@ -67,20 +67,6 @@ void NutRenderer::decodeCodec44(byte *dst, byte *src, uint32 length) {
} while (length > 1);
}
void NutRenderer::bindDisplay(byte *dst, int32 width, int32 height, int32 pitch) {
debug(2, "NutRenderer::init() called");
if (_initialized == true) {
debug(2, "NutRenderer::init() Already initialized, ok, changing...");
}
_dstPtr = dst;
_dstWidth = width;
_dstHeight = height;
_dstPitch = pitch;
_initialized = true;
}
bool NutRenderer::loadFont(const char *filename, const char *dir) {
debug(2, "NutRenderer::loadFont() called");
if (_loaded == true) {
@ -188,7 +174,7 @@ void NutRenderer::drawString(const char *string, int32 x, int32 y, byte color, i
int left = x;
int height = 0, tmp;
do {
if ((x < 0) || (y < 0) || (x > _dstWidth) || (y > _dstHeight)) {
if ((x < 0) || (y < 0) || (x > _vm->_realWidth) || (y > _vm->_realHeight)) {
debug(2, "NutRenderer::drawString() position x, y out of range");
return;
}
@ -212,7 +198,7 @@ void NutRenderer::drawChar(char c, int32 x, int32 y, byte color) {
}
byte * src = (byte*)(_dataSrc + _offsets[c] + 14);
byte * dst = _dstPtr + y * _dstPitch + x;
byte * dst = _vm->virtscr[0].screenPtr + y * _vm->_realWidth + x;
uint32 length = READ_BE_UINT32(_dataSrc + _offsets[c] - 4) - 14;
decodeCodec44(_tmpCodecBuffer, src, length);
@ -232,6 +218,6 @@ void NutRenderer::drawChar(char c, int32 x, int32 y, byte color) {
dst[tx] = pixel;
}
}
dst += _dstPitch;
dst += _vm->_realWidth;
}
}

3
scumm/nut_renderer.h
View File

@ -31,10 +31,8 @@ private:
int32 _offsets[256];
byte _tmpCodecBuffer[2000];
byte *_dataSrc;
byte *_dstPtr;
bool _initialized;
bool _loaded;
int32 _dstWidth, _dstHeight, _dstPitch;
void decodeCodec44(byte *dst, byte *src, uint32 length);
@ -42,7 +40,6 @@ public:
NutRenderer(Scumm *vm);
~NutRenderer();
void bindDisplay(byte *dst, int32 width, int32 height, int32 pitch);
bool loadFont(const char *filename, const char *dir);
void drawChar(char c, int32 x, int32 y, byte color);
void drawString(const char *string, int32 x, int32 y, byte color, int32 mode);