[Scummvm-git-logs] scummvm master -> 7d04f816cf762fe9c65b2be9a8560edb2b880857

[digitall]

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:
f66ec9fe21 GROOVIE: Fix Spaces in Savegame Naming.
7d04f816cf GROOVIE: Fix Fallthrough Warning.


Commit: f66ec9fe21cbebdf651a65417519acb5dfca2ee4
    https://github.com/scummvm/scummvm/commit/f66ec9fe21cbebdf651a65417519acb5dfca2ee4
Author: D G Turner (digitall at scummvm.org)
Date: 2018-11-05T04:28:51Z

Commit Message:
GROOVIE: Fix Spaces in Savegame Naming.

This patch was originally from bug Trac #6276 and was submitted by
bluegr.

Changed paths:
    engines/groovie/saveload.cpp
    engines/groovie/script.cpp


diff --git a/engines/groovie/saveload.cpp b/engines/groovie/saveload.cpp
index fb4e365..3288798 100644
--- a/engines/groovie/saveload.cpp
+++ b/engines/groovie/saveload.cpp
@@ -128,6 +128,7 @@ Common::InSaveFile *SaveLoad::openForLoading(const Common::String &target, int s
 				case 0:
 					break;
 				case 16: // @
+				case 254: // . (generated when pressing space)
 					c = ' ';
 					break;
 				case 244: // $
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index b68c418..c66f0f5 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -439,9 +439,11 @@ void Script::savegame(uint slot) {
 	// Cache the saved name
 	for (int i = 0; i < 15; i++) {
 		newchar = _variables[i] + 0x30;
-		if ((newchar < 0x30 || newchar > 0x39) && (newchar < 0x41 || newchar > 0x7A)) {
+		if ((newchar < 0x30 || newchar > 0x39) && (newchar < 0x41 || newchar > 0x7A) && newchar != 0x2E) {
 			save[i] = '\0';
 			break;
+		} else if (newchar == 0x2E) { // '.', generated when space is pressed
+			save[i] = ' ';
 		} else {
 			save[i] = newchar;
 		}


Commit: 7d04f816cf762fe9c65b2be9a8560edb2b880857
    https://github.com/scummvm/scummvm/commit/7d04f816cf762fe9c65b2be9a8560edb2b880857
Author: D G Turner (digitall at scummvm.org)
Date: 2018-11-05T04:28:51Z

Commit Message:
GROOVIE: Fix Fallthrough Warning.

Changed paths:
    engines/groovie/saveload.cpp


diff --git a/engines/groovie/saveload.cpp b/engines/groovie/saveload.cpp
index 3288798..36d084d 100644
--- a/engines/groovie/saveload.cpp
+++ b/engines/groovie/saveload.cpp
@@ -128,6 +128,7 @@ Common::InSaveFile *SaveLoad::openForLoading(const Common::String &target, int s
 				case 0:
 					break;
 				case 16: // @
+				// fall through intended
 				case 254: // . (generated when pressing space)
 					c = ' ';
 					break;