aboutsummaryrefslogtreecommitdiff
path: root/engines/macventure
diff options
context:
space:
mode:
authorBorja Lorente2016-07-17 02:06:35 +0200
committerBorja Lorente2016-08-14 18:55:17 +0200
commit33ed84ff74fabac68d0900223e82c2717927ef2f (patch)
tree5abda7759779a07e88f849bc085b36a392afc9fd /engines/macventure
parenta06f291280e0897beed18e63e269938dfa45ccef (diff)
downloadscummvm-rg350-33ed84ff74fabac68d0900223e82c2717927ef2f.tar.gz
scummvm-rg350-33ed84ff74fabac68d0900223e82c2717927ef2f.tar.bz2
scummvm-rg350-33ed84ff74fabac68d0900223e82c2717927ef2f.zip
MACVENTURE: Fix small render error
Diffstat (limited to 'engines/macventure')
-rw-r--r--engines/macventure/image.cpp6
-rw-r--r--engines/macventure/image.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/macventure/image.cpp b/engines/macventure/image.cpp
index fa281eb19a..feb4d2e78b 100644
--- a/engines/macventure/image.cpp
+++ b/engines/macventure/image.cpp
@@ -386,11 +386,13 @@ bool ImageAsset::isRectInside(Common::Rect rect) {
return false;
}
-uint ImageAsset::getWidth() {
+int ImageAsset::getWidth() {
+ if (_imgData.size() == 0) return 0;
return MAX(0, (int)_bitWidth);
}
-uint ImageAsset::getHeight() {
+int ImageAsset::getHeight() {
+ if (_imgData.size() == 0) return 0;
return MAX(0, (int)_bitHeight);
}
diff --git a/engines/macventure/image.h b/engines/macventure/image.h
index 5cbe146055..b529109442 100644
--- a/engines/macventure/image.h
+++ b/engines/macventure/image.h
@@ -55,7 +55,7 @@ struct PPICHuff {
class ImageAsset {
public:
- ImageAsset(ObjID original, Container *container);
+ ImageAsset(ObjID original, Container *container);
~ImageAsset();
void blitInto(Graphics::ManagedSurface *target, uint32 x, uint32 y, BlitMode mode);
@@ -63,8 +63,8 @@ public:
bool isPointInside(Common::Point point);
bool isRectInside(Common::Rect rect);
- uint getWidth();
- uint getHeight();
+ int getWidth();
+ int getHeight();
private:
void decodePPIC(ObjID id, Common::Array<byte> &data);