aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-05-06 09:35:08 +0000
committerTravis Howell2007-05-06 09:35:08 +0000
commit0da4791128391f53618a454b7fd101eb9ae1cfbc (patch)
treee56bedc7b69fa9b291a7c43b22ff161a104447a0
parent79229cafabbf7f61c9a1043ffac8c5aee58a73d2 (diff)
downloadscummvm-rg350-0da4791128391f53618a454b7fd101eb9ae1cfbc.tar.gz
scummvm-rg350-0da4791128391f53618a454b7fd101eb9ae1cfbc.tar.bz2
scummvm-rg350-0da4791128391f53618a454b7fd101eb9ae1cfbc.zip
Fix regression due to sign issue, which could cause crashes.
svn-id: r26758
-rw-r--r--engines/agos/agos.h2
-rw-r--r--engines/agos/vga.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index c6a643d721..1c8542f60a 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1037,7 +1037,7 @@ public:
protected:
bool drawImage_clip(VC10_state *state);
- void drawImage_init(uint16 image, uint16 palette, uint16 x, uint16 y, uint16 flags);
+ void drawImage_init(int16 image, uint16 palette, uint16 x, uint16 y, uint16 flags);
void drawImage(VC10_state *state);
void drawImage_Amiga(VC10_state *state);
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index e0bd4f2e13..fafce61791 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -568,7 +568,8 @@ byte *AGOSEngine::vc10_flip(const byte *src, uint w, uint h) {
}
void AGOSEngine::vc10_draw() {
- uint16 image, palette, x, y, flags;
+ uint16 palette, x, y, flags;
+ int16 image;
image = (int16)vcReadNextWord();
@@ -593,7 +594,7 @@ void AGOSEngine::vc10_draw() {
drawImage_init(image, palette, x, y, flags);
}
-void AGOSEngine::drawImage_init(uint16 image, uint16 palette, uint16 x, uint16 y, uint16 flags) {
+void AGOSEngine::drawImage_init(int16 image, uint16 palette, uint16 x, uint16 y, uint16 flags) {
if (image == 0)
return;