[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.20,2.21 script_v8.cpp,2.50,2.51

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8340

Modified Files:
	intern.h script_v8.cpp 
Log Message:
dummy o8_startVideo implementation

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -d -r2.20 -r2.21
--- intern.h	26 Dec 2002 01:47:40 -0000	2.20
+++ intern.h	26 Dec 2002 02:18:44 -0000	2.21
@@ -406,11 +406,6 @@
 
 	void decodeParseString(int m, int n);
 
-	/* Version 8 Font Stuff */
-/*
-	void loadCharset(int charset);
-	NutRenderer *_fr[4];
-*/
 	/* Version 8 script opcodes */
 	void o8_mod();
 	void o8_wait();
@@ -433,6 +428,7 @@
 	
 	void o8_soundKludge();
 	void o8_system();
+	void o8_startVideo();
 	void o6_kernelSetFunctions();
 	void o6_kernelGetFunctions();
 

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -d -r2.50 -r2.51
--- script_v8.cpp	26 Dec 2002 02:02:46 -0000	2.50
+++ script_v8.cpp	26 Dec 2002 02:18:45 -0000	2.51
@@ -37,23 +37,6 @@
 
 #define OPCODE(x)	{ &Scumm_v8::x, #x }
 
-/*
-// FIXME: Move this somewhere better :)
-void Scumm_v8::loadCharset(int charset) {
-	char fontname[256];
-	sprintf(fontname, "resource/font%d.nut", charset);
-	warning("Loading charset %s\n", fontname);
-	_fr[charset] = new NutRenderer(this);
-	if (!(_fr[charset]->loadFont(fontname, getGameDataPath()))) {
-		delete _fr[charset];
-		_fr[charset] = NULL;
-		return;
-	}
-
-	_fr[charset]->bindDisplay(virtscr[0].screenPtr, _realWidth, _realHeight, _realWidth);
-}
-*/
-
 void Scumm_v8::setupOpcodes()
 {
 	// TODO: any of the o6_ entries are potentially wrong and pure guesses :-)
@@ -290,7 +273,7 @@
 		OPCODE(o6_drawBox),
 		/* B8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o8_startVideo),
 		OPCODE(o6_kernelSetFunctions),
 		OPCODE(o6_invalid),
 		/* BC */
@@ -1249,6 +1232,13 @@
 //	default:
 		error("o8_system: default case %d", subOp);
 //	}
+}
+
+void Scumm_v8::o8_startVideo()
+{
+	int len = resStrLen((char*)_scriptPointer);
+	warning("o8_startVideo(%s)", (char*)_scriptPointer);
+	_scriptPointer += len + 1;
 }
 
 void Scumm_v8::o6_kernelSetFunctions()