[Scummvm-cvs-logs] CVS: scummvm/scumm costume.h,1.26,1.26.2.1 script_v6.cpp,1.293.2.20,1.293.2.21 verbs.cpp,1.93.2.2,1.93.2.3

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22937/scumm

Modified Files:
      Tag: branch-0-6-0
	costume.h script_v6.cpp verbs.cpp 
Log Message:

Missed a line
Revert verb change that left FT not completable.


Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.h,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -d -r1.26 -r1.26.2.1
--- costume.h	6 Jan 2004 12:45:30 -0000	1.26
+++ costume.h	13 Aug 2004 02:02:04 -0000	1.26.2.1
@@ -75,7 +75,6 @@
 	void proc3_ami();
 
 	void procC64(int actor);
-	void c64_ignorePakCols(int num);
 
 	byte mainRoutine(int xmoveCur, int ymoveCur);
 };

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.293.2.20
retrieving revision 1.293.2.21
diff -u -d -r1.293.2.20 -r1.293.2.21
--- script_v6.cpp	13 Aug 2004 01:52:06 -0000	1.293.2.20
+++ script_v6.cpp	13 Aug 2004 02:02:04 -0000	1.293.2.21
@@ -2548,13 +2548,8 @@
 		}
 	} else {
 		switch (args[0]) {
-		case 1:
-			// Used to restore images when decorating cake in
-			// Fatty Bear's Birthday Surprise
-			warning("o6_kernelSetFunctions: stub1()");
-			break;
 		case 3:
-			warning("o6_kernelSetFunctions: nothing in 3");
+			// Dummy case
 			break;
 		case 4:
 			grabCursor(args[1], args[2], args[3], args[4]);
@@ -2573,7 +2568,7 @@
 			startManiac();
 			break;
 		case 9:
-			error("o6_kernelSetFunctions: stub9()");
+			killAllScriptsExceptCurrent();
 			break;
 		case 104:									/* samnmax */
 			nukeFlObjects(args[2], args[3]);
@@ -2658,12 +2653,6 @@
 	getStackList(args, ARRAYSIZE(args));
 
 	switch (args[0]) {
-	case 1:
-		// Used to store images when decorating cake in
-		// Fatty Bear's Birthday Surprise
-		warning("o6_kernelGetFunctions: stub1()");
-		push(0);
-		break;
 	case 113:
 		// This is used for the Sam & Max paint-by-numbers mini-game
 		// to find out what color to change. I think that what we have

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.93.2.2
retrieving revision 1.93.2.3
diff -u -d -r1.93.2.2 -r1.93.2.3
--- verbs.cpp	18 Jul 2004 22:15:53 -0000	1.93.2.2
+++ verbs.cpp	13 Aug 2004 02:02:04 -0000	1.93.2.3
@@ -419,9 +419,6 @@
 }
 
 void ScummEngine::restoreVerbBG(int verb) {
-	if (_gameId == GID_FT)
-		return;
-
 	VerbSlot *vs;
 
 	vs = &_verbs[verb];