[Scummvm-git-logs] scummvm master -> 128031c6a6d35a8092dc83e707b9a59feda4efdf

csnover csnover at users.noreply.github.com
Sat Sep 30 18:43:13 CEST 2017


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

Summary:
128031c6a6 SCI32: Fix crash when dying in RAMA


Commit: 128031c6a6d35a8092dc83e707b9a59feda4efdf
    https://github.com/scummvm/scummvm/commit/128031c6a6d35a8092dc83e707b9a59feda4efdf
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-30T11:42:49-05:00

Commit Message:
SCI32: Fix crash when dying in RAMA

As it turns out, autorama.sg *is* actually used sometimes.

Fixes Trac#10253.

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


diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index baa088d..51a3cea 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -448,7 +448,7 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) {
 		}
 
 		int saveNo = -1;
-		if (name == "911.sg") {
+		if (name == "911.sg" || name == "autorama.sg") {
 			saveNo = kAutoSaveId;
 		} else if (sscanf(name.c_str(), "ramasg.%i", &saveNo) == 1) {
 			saveNo += kSaveIdShift;
@@ -673,7 +673,7 @@ reg_t kFileIOUnlink(EngineState *s, int argc, reg_t *argv) {
 			sscanf(name.c_str(), "ramasg.%i", &saveNo) == 1) {
 
 			name = g_sci->getSavegameName(saveNo + kSaveIdShift);
-		} else if (g_sci->getGameId() == GID_RAMA && name == "911.sg") {
+		} else if (g_sci->getGameId() == GID_RAMA && (name == "911.sg" || name == "autorama.sg")) {
 			name = g_sci->getSavegameName(kAutoSaveId);
 		}
 





More information about the Scummvm-git-logs mailing list