[Scummvm-cvs-logs] CVS: scummvm/simon cursor.cpp,1.1,1.2 icons.cpp,1.1,1.2 saveload.cpp,1.1,1.2 module.mk,1.9,1.10 simon.cpp,1.473,1.474

Travis Howell kirben at users.sourceforge.net
Thu Dec 16 04:50:04 CET 2004


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

Modified Files:
	module.mk simon.cpp 
Added Files:
	cursor.cpp icons.cpp saveload.cpp 
Log Message:

Split simon.cpp more for PalmOS port.






Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/module.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- module.mk	30 Jan 2004 21:54:28 -0000	1.9
+++ module.mk	16 Dec 2004 12:49:25 -0000	1.10
@@ -2,12 +2,15 @@
 
 MODULE_OBJS := \
 	simon/charset.o \
+	simon/cursor.o \
 	simon/debug.o \
 	simon/debugger.o \
+	simon/icons.o \
 	simon/items.o \
 	simon/midi.o \
 	simon/midiparser_s1d.o \
 	simon/res.o \
+	simon/saveload.o \
 	simon/sound.o \
 	simon/simon.o \
 	simon/verb.o \

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -d -r1.473 -r1.474
--- simon.cpp	15 Dec 2004 20:25:50 -0000	1.473
+++ simon.cpp	16 Dec 2004 12:49:25 -0000	1.474
@@ -1933,60 +1933,6 @@
 	return child->array[offs];
 }
 
-void SimonEngine::loadIconFile() {
-	File in;
-	if (_game & GF_ACORN)
-		in.open("ICONDATA");
-	else if (_game & GF_AMIGA)
-		in.open("icon.pkd");
-	else
-		in.open("ICON.DAT");
[...986 lines suppressed...]
-	for (i = 0; i != 32; i++)
-		_bit_array[i] = f->readUint16BE();
-
-	delete f;
-
-	_no_parent_notify = false;
-
-	_lock_word &= ~0x100;
-
-#ifndef _WIN32_WCE
-	if (errno != 0)
-		error("load failed");
-#endif
-
-	return true;
-}
-
 void SimonEngine::loadMusic (uint music) {
 	if (_game & GF_SIMON2) {        // Simon 2 music
 		midi.stop();





More information about the Scummvm-git-logs mailing list