[Scummvm-cvs-logs] SF.net SVN: scummvm: [26758] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 26758
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26758&view=rev
Author:   kirben
Date:     2007-05-06 02:35:08 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Fix regression due to sign issue, which could cause crashes.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2007-05-06 09:31:45 UTC (rev 26757)
+++ scummvm/trunk/engines/agos/agos.h	2007-05-06 09:35:08 UTC (rev 26758)
@@ -1037,7 +1037,7 @@
 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);

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2007-05-06 09:31:45 UTC (rev 26757)
+++ scummvm/trunk/engines/agos/vga.cpp	2007-05-06 09:35:08 UTC (rev 26758)
@@ -568,7 +568,8 @@
 }
 
 void AGOSEngine::vc10_draw() {
-	uint16 image, palette, x, y, flags;
+	uint16 palette, x, y, flags;
+	int16 image;
 
 	image = (int16)vcReadNextWord();
 
@@ -593,7 +594,7 @@
 	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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.