aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/resource.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2013-08-03 00:00:35 +0200
committerJohannes Schickel2013-08-03 02:52:33 +0200
commit82b96d33ad4f6ca623aa84df3e14a95e5cc2a091 (patch)
treec86a507cf02b335313ca9b1d66041a2151fa820f /engines/neverhood/resource.cpp
parent6eb9c8da9e37e9afcb2c6d378c30d8ea88c0b8de (diff)
downloadscummvm-rg350-82b96d33ad4f6ca623aa84df3e14a95e5cc2a091.tar.gz
scummvm-rg350-82b96d33ad4f6ca623aa84df3e14a95e5cc2a091.tar.bz2
scummvm-rg350-82b96d33ad4f6ca623aa84df3e14a95e5cc2a091.zip
NEVERHOOD: Prefer getBasePtr over direct Surface::pixels access.
Diffstat (limited to 'engines/neverhood/resource.cpp')
-rw-r--r--engines/neverhood/resource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/neverhood/resource.cpp b/engines/neverhood/resource.cpp
index 5f7aea86f4..745f567ead 100644
--- a/engines/neverhood/resource.cpp
+++ b/engines/neverhood/resource.cpp
@@ -39,7 +39,7 @@ SpriteResource::~SpriteResource() {
void SpriteResource::draw(Graphics::Surface *destSurface, bool flipX, bool flipY) {
if (_pixels) {
- byte *dest = (byte*)destSurface->pixels;
+ byte *dest = (byte*)destSurface->getBasePtr(0, 0);
const int destPitch = destSurface->pitch;
if (_rle)
unpackSpriteRle(_pixels, _dimensions.width, _dimensions.height, dest, destPitch, flipX, flipY);
@@ -116,7 +116,7 @@ AnimResource::~AnimResource() {
void AnimResource::draw(uint frameIndex, Graphics::Surface *destSurface, bool flipX, bool flipY) {
const AnimFrameInfo frameInfo = _frames[frameIndex];
- byte *dest = (byte*)destSurface->pixels;
+ byte *dest = (byte*)destSurface->getBasePtr(0, 0);
const int destPitch = destSurface->pitch;
_currSpriteData = _spriteData + frameInfo.spriteDataOffs;
_width = frameInfo.drawOffset.width;
@@ -298,7 +298,7 @@ void MouseCursorResource::draw(int frameNum, Graphics::Surface *destSurface) {
const int sourcePitch = (_cursorSprite.getDimensions().width + 3) & 0xFFFC; // 4 byte alignment
const int destPitch = destSurface->pitch;
const byte *source = _cursorSprite.getPixels() + _cursorNum * (sourcePitch * 32) + frameNum * 32;
- byte *dest = (byte*)destSurface->pixels;
+ byte *dest = (byte*)destSurface->getBasePtr(0, 0);
for (int16 yc = 0; yc < 32; yc++) {
memcpy(dest, source, 32);
source += sourcePitch;