[Scummvm-cvs-logs] scummvm master -> 08af1d9d3fcd8c288f04f0175f6cc6b1ead10dfa

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
18c0dae5fc SCI: Removed warning from kReadNumber
08af1d9d3f SCI: Don't patch save/restore dialogs in Phantasmagoria


Commit: 18c0dae5fcd0314a77cf30ac0bd7c6494961de24
    https://github.com/scummvm/scummvm/commit/18c0dae5fcd0314a77cf30ac0bd7c6494961de24
Author: md5 (md5 at scummvm.org)
Date: 2011-03-03T15:42:09-08:00

Commit Message:
SCI: Removed warning from kReadNumber

Changed paths:
    engines/sci/engine/kstring.cpp



diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 5c6ef06..df77b8e 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -159,17 +159,9 @@ reg_t kReadNumber(EngineState *s, int argc, reg_t *argv) {
 			source++;
 		}
 		while (*source) {
-			if ((*source < '0') || (*source > '9')) {
-				// Sierra's atoi stopped processing at anything which is not
-				// a digit. Sometimes the input has a trailing space, that's
-				// fine (example: lsl3)
-				if (*source != ' ') {
-					// TODO: this happens in lsl5 right in the intro -> we get '1' '3' 0xCD 0xCD 0xCD 0xCD 0xCD
-					//       find out why this happens and fix it
-					warning("Invalid character in kReadNumber input");
-				}
+			if ((*source < '0') || (*source > '9'))
+				// Stop if we encounter anything other than a digit (like atoi)
 				break;
-			}
 			result *= 10;
 			result += *source - 0x30;
 			source++;


Commit: 08af1d9d3fcd8c288f04f0175f6cc6b1ead10dfa
    https://github.com/scummvm/scummvm/commit/08af1d9d3fcd8c288f04f0175f6cc6b1ead10dfa
Author: md5 (md5 at scummvm.org)
Date: 2011-03-03T15:42:53-08:00

Commit Message:
SCI: Don't patch save/restore dialogs in Phantasmagoria

That game has its own custom made save/load system

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index de33a59..b590103 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -477,10 +477,11 @@ void SciEngine::patchGameSaveRestore() {
 	byte kernelIdSave = 0;
 
 	switch (_gameId) {
-	case GID_MOTHERGOOSE256: // mother goose saves/restores directly and has no save/restore dialogs
-	case GID_JONES: // gets confused, when we patch us in, the game is only able to save to 1 slot, so hooking is not required
 	case GID_HOYLE1: // gets confused, although the game doesnt support saving/restoring at all
 	case GID_HOYLE2: // gets confused, see hoyle1
+	case GID_JONES: // gets confused, when we patch us in, the game is only able to save to 1 slot, so hooking is not required
+	case GID_MOTHERGOOSE256: // mother goose saves/restores directly and has no save/restore dialogs
+	case GID_PHANTASMAGORIA: // has custom save/load code
 		return;
 	default:
 		break;