[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.214,1.215 vga.cpp,1.56,1.57

Travis Howell kirben at users.sourceforge.net
Sat May 24 20:04:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv31261

Modified Files:
	simon.cpp vga.cpp 
Log Message:

Add a few warnings and todos to simon1cd32


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- simon.cpp	24 May 2003 13:05:56 -0000	1.214
+++ simon.cpp	25 May 2003 03:03:40 -0000	1.215
@@ -1041,10 +1041,12 @@
 				readSubroutineBlock(in);
 				closeTablesFile(in);
 
-				memcpy(filename, "SFXXXX", 6);
-				if (_game == GAME_SIMON1WIN)
+				if (_game == GAME_SIMON1WIN) {
+					memcpy(filename, "SFXXXX", 6);
 					_sound->readSfxFile(filename, _gameDataPath);
-				else if (_game & GF_SIMON2) {
+				} else if (_game == GAME_SIMON1CD32) {
+					//TODO Add loading of simon1cd32 sound effects and voice files.
+				} else if (_game & GF_SIMON2) {
 					_sound->loadSfxTable(_game_file, _game_offsets_ptr[atoi(filename + 6) - 1 + gss->SOUND_INDEX_BASE]);
 				}
 
@@ -5296,6 +5298,7 @@
 				// TODO Add support for decruncher
 			}
 			// TODO Add Protracker support for simon1amiga/cd32
+			warning("playMusic - Load %dtune attempt", music);
 		} else if (_game & GF_DEMO) {
 			// TODO Add music support for simon1demo
 		} else {

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- vga.cpp	24 May 2003 12:26:28 -0000	1.56
+++ vga.cpp	25 May 2003 03:03:40 -0000	1.57
@@ -509,7 +509,8 @@
 }
 
 byte *vc_10_no_depack_swap(byte *src) {
-	error("vc_10_no_depack_swap unimpl");
+	// TODO Add vc_10_no_depack_swap support, should be very similar to 
+	// vc_10_depack_swap but without the depacking
 	return NULL;
 }
 
@@ -649,12 +650,14 @@
 		return;
 	}
 
-	if (state.e & 0x10)
+	if (state.e & 0x10) {
 		state.depack_src = vc_10_depack_swap(state.depack_src, width, height);
-	else if (state.e & 1)
-		// FIXME: vc_10_no_depack_swap support needs to be added.
+	} else if (state.e & 1) {
+		// FIXME: vc_10_no_depack_swap should be called but is currently not supported
 		//state.depack_src = vc_10_no_depack_swap(state.depack_src);
+		warning("vc_10_no_depack_swap unimpl");
 		state.depack_src = vc_10_depack_swap(state.depack_src, width, height);
+	}
 
 	vlut = &_video_windows[_video_palette_mode * 4];
 





More information about the Scummvm-git-logs mailing list