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

MOHAWK: Do not access Surface::bytesPerPixel anymore.

Browse source
This commit is contained in:
Johannes Schickel 2011-04-17 17:28:16 +02:00
parent 663bb3e1e5
commit ca240b4936
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/mohawk/bitmap.cpp
View file

@ -573,7 +573,7 @@ void MohawkBitmap::drawRaw(Graphics::Surface *surface) {
byte b = _data->readByte(); byte b = _data->readByte();
byte g = _data->readByte(); byte g = _data->readByte();
byte r = _data->readByte(); byte r = _data->readByte();
if (surface->bytesPerPixel == 2) if (surface->format.bytesPerPixel == 2)
*((uint16 *)surface->getBasePtr(x, y)) = pixelFormat.RGBToColor(r, g, b); *((uint16 *)surface->getBasePtr(x, y)) = pixelFormat.RGBToColor(r, g, b);
else else
*((uint32 *)surface->getBasePtr(x, y)) = pixelFormat.RGBToColor(r, g, b); *((uint32 *)surface->getBasePtr(x, y)) = pixelFormat.RGBToColor(r, g, b);
@ -861,7 +861,7 @@ MohawkSurface *DOSBitmap::decodeImage(Common::SeekableReadStream *stream) {
} }
void DOSBitmap::expandMonochromePlane(Graphics::Surface *surface, Common::SeekableReadStream *rawStream) { void DOSBitmap::expandMonochromePlane(Graphics::Surface *surface, Common::SeekableReadStream *rawStream) {
assert(surface->bytesPerPixel == 1); assert(surface->format.bytesPerPixel == 1);
byte *dst = (byte *)surface->pixels; byte *dst = (byte *)surface->pixels;
@ -887,7 +887,7 @@ void DOSBitmap::expandMonochromePlane(Graphics::Surface *surface, Common::Seekab
*(dst + j * 4 + dstPixel) = (*(dst + j * 4 + dstPixel) >> 1) | (((temp >> srcBit) & 1) << 3) *(dst + j * 4 + dstPixel) = (*(dst + j * 4 + dstPixel) >> 1) | (((temp >> srcBit) & 1) << 3)
void DOSBitmap::expandEGAPlanes(Graphics::Surface *surface, Common::SeekableReadStream *rawStream) { void DOSBitmap::expandEGAPlanes(Graphics::Surface *surface, Common::SeekableReadStream *rawStream) {
assert(surface->bytesPerPixel == 1); assert(surface->format.bytesPerPixel == 1);
// Note that the image is in EGA planar form and not just standard 4bpp // Note that the image is in EGA planar form and not just standard 4bpp
// This seems to contradict the PoP specs which seem to do // This seems to contradict the PoP specs which seem to do

2
engines/mohawk/cursors.cpp
View file

@ -148,7 +148,7 @@ void MystCursorManager::setCursor(uint16 id) {
delete clrcStream; delete clrcStream;
// Myst ME stores some cursors as 24bpp images instead of 8bpp // Myst ME stores some cursors as 24bpp images instead of 8bpp
if (surface->bytesPerPixel == 1) { if (surface->format.bytesPerPixel == 1) {
CursorMan.replaceCursor((byte *)surface->pixels, surface->w, surface->h, hotspotX, hotspotY, 0); CursorMan.replaceCursor((byte *)surface->pixels, surface->w, surface->h, hotspotX, hotspotY, 0);
CursorMan.replaceCursorPalette(mhkSurface->getPalette(), 0, 256); CursorMan.replaceCursorPalette(mhkSurface->getPalette(), 0, 256);
} else { } else {

8
engines/mohawk/graphics.cpp
View file

@ -70,7 +70,7 @@ MohawkSurface::~MohawkSurface() {
void MohawkSurface::convertToTrueColor() { void MohawkSurface::convertToTrueColor() {
assert(_surface); assert(_surface);
if (_surface->bytesPerPixel > 1) if (_surface->format.bytesPerPixel > 1)
return; return;
assert(_palette); assert(_palette);
@ -486,7 +486,7 @@ void MystGraphics::copyImageSectionToBackBuffer(uint16 image, Common::Rect src,
debug(3, "\theight: %d", height); debug(3, "\theight: %d", height);
for (uint16 i = 0; i < height; i++) for (uint16 i = 0; i < height; i++)
memcpy(_backBuffer->getBasePtr(dest.left, i + dest.top), surface->getBasePtr(src.left, top + i), width * surface->bytesPerPixel); memcpy(_backBuffer->getBasePtr(dest.left, i + dest.top), surface->getBasePtr(src.left, top + i), width * surface->format.bytesPerPixel);
} }
void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) { void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) {
@ -677,7 +677,7 @@ void RivenGraphics::copyImageToScreen(uint16 image, uint32 left, uint32 top, uin
surface->w = 608 - left; surface->w = 608 - left;
for (uint16 i = 0; i < surface->h; i++) for (uint16 i = 0; i < surface->h; i++)
memcpy(_mainScreen->getBasePtr(left, i + top), surface->getBasePtr(0, i), surface->w * surface->bytesPerPixel); memcpy(_mainScreen->getBasePtr(left, i + top), surface->getBasePtr(0, i), surface->w * surface->format.bytesPerPixel);
_dirtyScreen = true; _dirtyScreen = true;
} }
@ -972,7 +972,7 @@ void RivenGraphics::drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect
assert(srcRect.width() == dstRect.width() && srcRect.height() == dstRect.height()); assert(srcRect.width() == dstRect.width() && srcRect.height() == dstRect.height());
for (uint16 i = 0; i < srcRect.height(); i++) for (uint16 i = 0; i < srcRect.height(); i++)
memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(srcRect.left, i + srcRect.top), srcRect.width() * surface->bytesPerPixel); memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(srcRect.left, i + srcRect.top), srcRect.width() * surface->format.bytesPerPixel);
_dirtyScreen = true; _dirtyScreen = true;
} }

2
engines/mohawk/video.cpp
View file

@ -219,7 +219,7 @@ bool VideoManager::updateMovies() {
// Convert from 8bpp to the current screen format if necessary // Convert from 8bpp to the current screen format if necessary
Graphics::PixelFormat pixelFormat = _vm->_system->getScreenFormat(); Graphics::PixelFormat pixelFormat = _vm->_system->getScreenFormat();
if (frame->bytesPerPixel == 1) { if (frame->format.bytesPerPixel == 1) {
if (pixelFormat.bytesPerPixel == 1) { if (pixelFormat.bytesPerPixel == 1) {
if (_videoStreams[i]->hasDirtyPalette()) if (_videoStreams[i]->hasDirtyPalette())
_videoStreams[i]->setSystemPalette(); _videoStreams[i]->setSystemPalette();