[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.125,2.126 scummvm.cpp,2.556,2.557

Max Horn fingolfin at users.sourceforge.net
Mon Jan 19 11:35:03 CET 2004


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

Modified Files:
	intern.h scummvm.cpp 
Log Message:
smush and insane only work with V6 (this will allow moving some stuff from ScummEngine to ScummEngine_v6)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.125
retrieving revision 2.126
diff -u -d -r2.125 -r2.126
--- intern.h	9 Jan 2004 13:14:58 -0000	2.125
+++ intern.h	19 Jan 2004 19:34:47 -0000	2.126
@@ -315,6 +315,8 @@
 };
 
 class ScummEngine_v6 : public ScummEngine {
+	friend class Insane;
+
 protected:
 	typedef void (ScummEngine_v6::*OpcodeProcV6)();
 	struct OpcodeEntryV6 {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.556
retrieving revision 2.557
diff -u -d -r2.556 -r2.557
--- scummvm.cpp	18 Jan 2004 20:47:17 -0000	2.556
+++ scummvm.cpp	19 Jan 2004 19:34:47 -0000	2.557
@@ -847,7 +847,7 @@
 
 	// Create FT INSANE object
 	if (_gameId == GID_FT)
-		_insane = new Insane(this);
+		_insane = new Insane((ScummEngine_v6 *)this);
 	else
 		_insane = 0;
 }





More information about the Scummvm-git-logs mailing list