[Scummvm-cvs-logs] SF.net SVN: scummvm:[43281] scummvm/branches/branch-1-0-0/engines/agos

[drmccoy at users.sourceforge.net]

Revision: 43281
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43281&view=rev
Author:   drmccoy
Date:     2009-08-11 17:21:06 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Backporting r43276 (Fix AGOS compilation) to make the 1.0.0-branch compile again too

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/agos/agos.h
    scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp

Modified: scummvm/branches/branch-1-0-0/engines/agos/agos.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/agos.h	2009-08-11 16:46:38 UTC (rev 43280)
+++ scummvm/branches/branch-1-0-0/engines/agos/agos.h	2009-08-11 17:21:06 UTC (rev 43281)
@@ -1364,9 +1364,6 @@
 	int _tagOfActiveDoline;	///< tag of the active doline "instance"
 	int _dolineReturnVal;
 
-	jmp_buf _loadfail;
-
-
 	byte *_dataBase, *_textBase;
 	uint32 _dataBaseSize, _textBaseSize;
 

Modified: scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp	2009-08-11 16:46:38 UTC (rev 43280)
+++ scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp	2009-08-11 17:21:06 UTC (rev 43281)
@@ -57,7 +57,9 @@
 	op[20] = &AGOSEngine::vc19_loop;
 	op[21] = &AGOSEngine::vc20_setRepeat;
 	op[22] = &AGOSEngine::vc21_endRepeat;
-	op[23] = &AGOSEngine::vc22_setPaletteOld;
+	// FIXME: This has been "vc22_setPaletteOld" before, but that does not seem to exist.
+	// Please check whether "vc22_setPalette" is fine to be used here.
+	op[23] = &AGOSEngine::vc22_setPalette;
 	op[24] = &AGOSEngine::vc23_setPriority;
 	op[25] = &AGOSEngine::vc24_setSpriteXY;
 	op[26] = &AGOSEngine::vc25_halt_sprite;


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