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

MORTEVIELLE: Use width and height provided by Graphics::Surface

Browse Source
This commit is contained in:
Strangerke 2013-07-19 11:31:19 +02:00
parent df7d181a60
commit 37a115e60b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/mortevielle/graphics.cpp
View File

@ -86,7 +86,7 @@ void PaletteManager::setDefaultPalette() {
#define BUFFER_SIZE 40000
void GfxSurface::decode(const byte *pSrc) {
_width = _height = 0;
w = h = 0;
// If no transparency, use invalid (for EGA) palette index of 16. Otherwise get index to use
_transparency = (*pSrc == 0) ? 16 : *(pSrc + 2);
bool offsetFlag = *pSrc++ == 0;
@ -413,27 +413,27 @@ void GfxSurface::decode(const byte *pSrc) {
pSrc = pSrcStart;
debugC(2, kMortevielleGraphics, "Decoding image block %d position %d,%d size %d,%d method %d",
entryIndex + 1, _xp, _yp, _width, _height, decomIndex);
entryIndex + 1, _xp, _yp, w, h, decomIndex);
}
// At this point, the outputBuffer has the data for the image. Initialize the surface
// with the calculated size, and copy the lines to the surface
create(_width, _height, Graphics::PixelFormat::createFormatCLUT8());
create(w, h, Graphics::PixelFormat::createFormatCLUT8());
for (int yCtr = 0; yCtr < _height; ++yCtr) {
for (int yCtr = 0; yCtr < h; ++yCtr) {
const byte *copySrc = &outputBuffer[yCtr * DEFAULT_WIDTH];
byte *copyDest = (byte *)getBasePtr(0, yCtr);
Common::copy(copySrc, copySrc + _width, copyDest);
Common::copy(copySrc, copySrc + w, copyDest);
}
}
void GfxSurface::majTtxTty() {
if (!_yp)
_width += _xSize;
w += _xSize;
if (!_xp)
_height += _ySize;
h += _ySize;
}
/**

1
engines/mortevielle/graphics.h
View File

@ -56,7 +56,6 @@ private:
bool _nibbleFlag;
int _thickness;
int _yInc, _yEnd, _xInc, _xEnd;
int _width, _height;
byte nextNibble(const byte *&pSrc);
byte nextByte(const byte *&pSrc, const byte *&pLookup);