[Scummvm-git-logs] scummvm master -> a8b3b67d297407c1fa2d8a89893b6ee72caf488b
bluegr
bluegr at gmail.com
Sat May 27 13:34:14 CEST 2017
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:
03c1b3307c SCI: Remove a leftover SCI32 hack
a8b3b67d29 SCI32: Update some old comments related to virtual files
Commit: 03c1b3307c401ddb2f9ee3eaebf3b7456a62a59d
https://github.com/scummvm/scummvm/commit/03c1b3307c401ddb2f9ee3eaebf3b7456a62a59d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2017-05-27T13:32:02+03:00
Commit Message:
SCI: Remove a leftover SCI32 hack
Changed paths:
engines/sci/graphics/cursor.cpp
diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index c29e547..2a86009 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -199,18 +199,6 @@ void GfxCursor::kernelSetView(GuiResourceId viewNum, int loopNum, int celNum, Co
if (_useOriginalKQ6WinCursors)
viewNum += 2000; // Windows cursors
- if (g_sci->getGameId() == GID_PHANTASMAGORIA2) {
- // HACK: Ignore cursor views for Phantasmagoria 2. They've got
- // differences from other SCI32 views, thus we skip them for
- // now, otherwise our view decoding code will crash.
- // The view code will crash with *any* view in P2, but this hack
- // allows the game to start and show the menu.
- // TODO: Remove once the view code is updated to handle
- // Phantasmagoria 2 views.
- warning("TODO: Cursor views for Phantasmagoria 2");
- return;
- }
-
// Use the alternate silver cursors in SQ4 CD, if requested
if (_useSilverSQ4CDCursors) {
switch(viewNum) {
Commit: a8b3b67d297407c1fa2d8a89893b6ee72caf488b
https://github.com/scummvm/scummvm/commit/a8b3b67d297407c1fa2d8a89893b6ee72caf488b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2017-05-27T14:33:24+03:00
Commit Message:
SCI32: Update some old comments related to virtual files
Changed paths:
engines/sci/engine/kfile.cpp
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index fd6fab6..6c96607 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -325,7 +325,7 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) {
return SIGNAL_REG;
} else if (mode == _K_FILE_MODE_OPEN_OR_FAIL) {
// Create a virtual file containing the save game description
- // and slot number, as the game scripts expect.
+ // and current score progress, as the game scripts expect.
int saveNo;
sscanf(name.c_str(), "%d.SG", &saveNo);
saveNo += kSaveIdShift;
@@ -365,7 +365,7 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) {
return SIGNAL_REG;
} else if (mode == _K_FILE_MODE_OPEN_OR_FAIL) {
// Create a virtual file containing the save game description
- // and slot number, as the game scripts expect.
+ // and avatar ID, as the game scripts expect.
int saveNo;
sscanf(name.c_str(), "%d.DTA", &saveNo);
saveNo += kSaveIdShift;
More information about the Scummvm-git-logs
mailing list