[Scummvm-git-logs] scummvm master -> e4a1a0e98079317da8cb1a8c5d221e61c18da698

[csnover]

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:
f43b2c66fe SCI32: Improve RESOURCE.SFX fallback for RAMA
e4a1a0e980 NEWS: Add new SCI32 games to NEWS and README


Commit: f43b2c66fe417035b56908e857304abe40518631
    https://github.com/scummvm/scummvm/commit/f43b2c66fe417035b56908e857304abe40518631
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-29T20:20:20-05:00

Commit Message:
SCI32: Improve RESOURCE.SFX fallback for RAMA

Since Datafiles says to rename any RESOURCE.SFX to RESSFX.00n,
and there is only a RESOURCE.SFX on CD 1, don't confuse users by
failing to use RESSFX.001 for CD2 and CD3.

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index ad6415d..97cec40 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1928,10 +1928,16 @@ int ResourceManager::readResourceMapSCI1(ResourceSource *map) {
 						volumeName = "RESAUD.001";
 					}
 				} else if (resId.getNumber() == 65535) {
-					if (g_sci->getGameId() == GID_RAMA && Common::File::exists("RESOURCE.SFX")) {
-						volumeName = "RESOURCE.SFX";
-					} else {
+					if (g_sci->getGameId() == GID_RAMA) {
 						volumeName = Common::String::format("RESSFX.%03d", mapVolumeNr);
+
+						if (g_sci->getGameId() == GID_RAMA && !Common::File::exists(volumeName)) {
+							if (Common::File::exists("RESOURCE.SFX")) {
+								volumeName = "RESOURCE.SFX";
+							} else if (Common::File::exists("RESSFX.001")) {
+								volumeName = "RESSFX.001";
+							}
+						}
 					}
 				} else {
 					volumeName = Common::String::format("RESAUD.%03d", mapVolumeNr);


Commit: e4a1a0e98079317da8cb1a8c5d221e61c18da698
    https://github.com/scummvm/scummvm/commit/e4a1a0e98079317da8cb1a8c5d221e61c18da698
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-29T20:20:20-05:00

Commit Message:
NEWS: Add new SCI32 games to NEWS and README

Changed paths:
    NEWS
    README


diff --git a/NEWS b/NEWS
index 7ed09c3..1bd9668 100644
--- a/NEWS
+++ b/NEWS
@@ -19,10 +19,12 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added support for King's Questions.
    - Added support for Leisure Suit Larry 6 (hires).
    - Added support for Leisure Suit Larry 7.
+   - Added support for Lighthouse.
    - Added support for Mixed-Up Mother Goose Deluxe.
    - Added support for Phantasmagoria.
    - Added support for Phantasmagoria 2.
    - Added support for Police Quest 4.
+   - Added support for RAMA.
    - Added support for Shivers.
    - Added support for Space Quest 6.
    - Added support for Torin's Passage.
diff --git a/README b/README
index 798f490..cd3cd76 100644
--- a/README
+++ b/README
@@ -329,10 +329,14 @@ Sierra (SCI) Games:
      Leisure Suit Larry 5                        [lsl5]
      Leisure Suit Larry 6                        [lsl6]
      Leisure Suit Larry 6 (hires)                [lsl6hires]
+     Leisure Suit Larry 7                        [lsl7]
+     Lighthouse: The Dark Being                  [lighthouse]
      Mixed-up Fairy Tales                        [fairytales]
      Mixed-up Mother Goose                       [mothergoose]
+     Mixed-up Mother Goose Deluxe                [mothergoosehires]
      Pepper's Adventures in Time                 [pepper]
      Phantasmagoria                              [phantasmagoria]
+     Phantasmagoria 2: A Puzzle of Flesh         [phantasmagoria2]
      Police Quest 1                              [pq1sci]
      Police Quest 2                              [pq2]
      Police Quest 3                              [pq3]
@@ -341,6 +345,7 @@ Sierra (SCI) Games:
      Quest for Glory 1                           [qfg1vga]
      Quest for Glory 2                           [qfg2]
      Quest for Glory 3                           [qfg3]
+     RAMA                                        [rama]
      Slater & Charlie Go Camping                 [slater]
      Shivers                                     [shivers]
      Space Quest I                               [sq1sci]