1 files changed, 17 insertions, 17 deletions

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 146d65b56d..ade0304683 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -464,15 +464,15 @@ int gamestate_save(EngineState *s, Common::WriteStream *fh, const char* savename
 	meta.savegame_time = ((curTime.tm_hour & 0xFF) << 16) | (((curTime.tm_min) & 0xFF) << 8) | ((curTime.tm_sec) & 0xFF);
 
 	if (s->execution_stack_base) {
-		sciprintf("Cannot save from below kernel function\n");
+		warning("Cannot save from below kernel function");
 		return 1;
 	}
 
 /*
 	if (s->sound_server) {
 		if ((s->sound_server->save)(s, dirname)) {
-			sciprintf("Saving failed for the sound subsystem\n");
-			chdir("..");
+			warning("Saving failed for the sound subsystem");
+			//chdir("..");
 			return 1;
 		}
 	}
@@ -616,7 +616,7 @@ static void reconstruct_scripts(EngineState *s, SegManager *self) {
 						base_obj = obj_get(s, scr->_objects[j]._variables[SCRIPT_SPECIES_SELECTOR]);
 
 						if (!base_obj) {
-							sciprintf("Object without a base class: Script %d, index %d (reg address %04x:%04x\n",
+							warning("Object without a base class: Script %d, index %d (reg address %04x:%04x",
 								  scr->nr, j, PRINT_REG(scr->_objects[j]._variables[SCRIPT_SPECIES_SELECTOR]));
 							continue;
 						}
@@ -646,18 +646,18 @@ static void reconstruct_clones(EngineState *s, SegManager *self) {
 				CloneTable *ct = (CloneTable *)mobj;
 
 				/*
-				sciprintf("Free list: ");
+				printf("Free list: ");
 				for (uint j = ct->first_free; j != HEAPENTRY_INVALID; j = ct->_table[j].next_free) {
-					sciprintf("%d ", j);
+					printf("%d ", j);
 				}
-				sciprintf("\n");
+				printf("\n");
 
-				sciprintf("Entries w/zero vars: ");
+				printf("Entries w/zero vars: ");
 				for (uint j = 0; j < ct->_table.size(); j++) {
 					if (ct->_table[j].variables == NULL)
-						sciprintf("%d ", j);
+						printf("%d ", j);
 				}
-				sciprintf("\n");
+				printf("\n");
 				*/
 
 				for (uint j = 0; j < ct->_table.size(); j++) {
@@ -669,7 +669,7 @@ static void reconstruct_clones(EngineState *s, SegManager *self) {
 					CloneTable::Entry &seeker = ct->_table[j];
 					base_obj = obj_get(s, seeker._variables[SCRIPT_SPECIES_SELECTOR]);
 					if (!base_obj) {
-						sciprintf("Clone entry without a base class: %d\n", j);
+						printf("Clone entry without a base class: %d\n", j);
 						seeker.base = seeker.base_obj = NULL;
 						seeker.base_vars = seeker.base_method = NULL;
 					} else {
@@ -693,7 +693,7 @@ int _reset_graphics_input(EngineState *s);
 
 static void reconstruct_sounds(EngineState *s) {
 	Song *seeker;
-	SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
+	SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01_EGA ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
 
 	seeker = s->_sound._songlib._lib;
 
@@ -729,7 +729,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 /*
 	if (s->sound_server) {
 		if ((s->sound_server->restore)(s, dirname)) {
-			sciprintf("Restoring failed for the sound subsystem\n");
+			warning("Restoring failed for the sound subsystem");
 			return NULL;
 		}
 	}
@@ -746,9 +746,9 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	if ((meta.savegame_version < MINIMUM_SAVEGAME_VERSION) ||
 	    (meta.savegame_version > CURRENT_SAVEGAME_VERSION)) {
 		if (meta.savegame_version < MINIMUM_SAVEGAME_VERSION)
-			sciprintf("Old savegame version detected- can't load\n");
+			warning("Old savegame version detected- can't load");
 		else
-			sciprintf("Savegame version is %d- maximum supported is %0d\n", meta.savegame_version, CURRENT_SAVEGAME_VERSION);
+			warning("Savegame version is %d- maximum supported is %0d", meta.savegame_version, CURRENT_SAVEGAME_VERSION);
 
 		return NULL;
 	}
@@ -864,9 +864,9 @@ bool get_savegame_metadata(Common::SeekableReadStream *stream, SavegameMetadata
 	if ((meta->savegame_version < MINIMUM_SAVEGAME_VERSION) ||
 	    (meta->savegame_version > CURRENT_SAVEGAME_VERSION)) {
 		if (meta->savegame_version < MINIMUM_SAVEGAME_VERSION)
-			sciprintf("Old savegame version detected- can't load\n");
+			warning("Old savegame version detected- can't load");
 		else
-			sciprintf("Savegame version is %d- maximum supported is %0d\n", meta->savegame_version, CURRENT_SAVEGAME_VERSION);
+			warning("Savegame version is %d- maximum supported is %0d", meta->savegame_version, CURRENT_SAVEGAME_VERSION);
 
 		return false;
 	}