Add a few warnings and todos to simon1cd32

svn-id: r7926

2 files changed, 13 insertions, 7 deletions

diff --git a/simon/simon.cpp b/simon/simon.cpp
index 36db7f22a2..970cb3454c 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1041,10 +1041,12 @@ void SimonState::loadTablesIntoMem(uint subr_id) {
 				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 @@ void SimonState::loadMusic (uint music) {
 				// 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 {
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 7108c2a82b..8f0883903e 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -509,7 +509,8 @@ byte *SimonState::vc_10_depack_swap(byte *src, uint w, uint h) {
 }
 
 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 @@ void SimonState::vc_10_draw() {
 		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];