[Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.10,1.11

Robert G?ffringmann lavosspawn at users.sourceforge.net
Wed Dec 17 16:32:02 CET 2003


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv24720/sword1

Modified Files:
	logic.cpp 
Log Message:
fixed stupid palette bugs

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- logic.cpp	17 Dec 2003 23:49:26 -0000	1.10
+++ logic.cpp	18 Dec 2003 00:31:37 -0000	1.11
@@ -84,7 +84,7 @@
 }
 
 void SwordLogic::engine(void) {
-	debug(5, "\n\nNext logic cycle");
+	debug(8, "\n\nNext logic cycle");
 	_eventMan->serviceGlobalEventList();
 
 	for (uint16 sectCnt = 0; sectCnt < TOTAL_SECTIONS; sectCnt++) {
@@ -861,13 +861,12 @@
 }
 
 int SwordLogic::fnSetSpritePalette(BsObject *cpt, int32 id, int32 spritePal, int32 d, int32 e, int32 f, int32 z, int32 x) {
-	_screen->fnSetPalette(184, 72, id, false);
-	_resMan->resClose(spritePal);
+	_screen->fnSetPalette(184, 72, spritePal, false);
 	return SCRIPT_CONT;
 }
 
 int SwordLogic::fnSetWholePalette(BsObject *cpt, int32 id, int32 spritePal, int32 d, int32 e, int32 f, int32 z, int32 x) {
-	_screen->fnSetPalette(0, 256, id, false);
+	_screen->fnSetPalette(0, 256, spritePal, false);
 	return SCRIPT_CONT;
 }
 
@@ -875,16 +874,17 @@
 	uint8 *pal = (uint8*)_resMan->openFetchRes(spritePal);
 	pal[0] = pal[1] = pal[2] = 0;
 	_resMan->resClose(spritePal);
+	warning("fnSetFadeTargetPalette(xx, %d, %X, %d)", id, spritePal, d);
 	return SCRIPT_CONT;
 }
 
 int SwordLogic::fnSetPaletteToFade(BsObject *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
-	warning("called unknown routine: fnSetPaletteToFade()");
+	warning("fnSetPaletteToFade(xx, %d, %d, %d, %d)", id, c, d, e);
 	return SCRIPT_CONT;
 }
 
 int SwordLogic::fnSetPaletteToCut(BsObject *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
-	warning("Called unknown routine: fnSetPaletteToCut()");
+	warning("fnSetPaletteToCut(xx, %d, %d, %d, %d)", id, c, d, e);
 	return SCRIPT_CONT;
 }
 





More information about the Scummvm-git-logs mailing list