[Scummvm-cvs-logs] scummvm master -> 21a7e3d8e61c0bac072b8bd4f491a1cf2ef115ee

[bluegr]

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

Summary:
0998c64c20 DREAMWEB: Change selectSaveLoadPage()'s command type to be unique
c456d6d29a DREAMWEB: Rewrite a comment, since the old one could be misread
21a7e3d8e6 Merge pull request #146 from eriktorbjorn/master


Commit: 0998c64c20f5e1d24da28531b26f327114bcd57d
    https://github.com/scummvm/scummvm/commit/0998c64c20f5e1d24da28531b26f327114bcd57d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2012-01-11T14:38:37-08:00

Commit Message:
DREAMWEB: Change selectSaveLoadPage()'s command type to be unique

At Filippos's and wjp's suggestion. I don't really understand what
it does (other than printing the mouse over text), so I had simply
copied and pasted from another function.

Changed paths:
    engines/dreamweb/saveload.cpp



diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index b1d2b0a..3f2c922 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -774,7 +774,7 @@ void DreamWebEngine::checkInput() {
 }
 
 void DreamWebEngine::selectSaveLoadPage() {
-	commandOnlyCond(31, 244);
+	commandOnlyCond(31, 254);
 
 	if (_mouseButton != 1 || _mouseButton == _oldButton)
 		return;


Commit: c456d6d29a6c94d1b051456cb9b242b8eda756f7
    https://github.com/scummvm/scummvm/commit/c456d6d29a6c94d1b051456cb9b242b8eda756f7
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2012-01-11T15:00:26-08:00

Commit Message:
DREAMWEB: Rewrite a comment, since the old one could be misread

I read it as "this is how the original code expects save slots to
be initialized", but I guess it could be read as "the original
engine had 21 save slots". Which it didn't.

Changed paths:
    engines/dreamweb/saveload.cpp



diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 3f2c922..761ce76 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -646,7 +646,9 @@ void DreamWebEngine::loadPosition(unsigned int slot) {
 
 // Count number of save files, and load their descriptions into _saveNames
 uint DreamWebEngine::scanForNames() {
-	// Initialize the first 21 slots (like the original code expects)
+	// There are 21 save slots, each of which are 17 bytes. The first byte
+	// doesn't seem to be used. The name starts at the second byte. All the
+	// slots are initialized to be empty.
 	for (unsigned int slot = 0; slot < 21; ++slot) {
 		_saveNames[17 * slot + 0] = 2;
 		_saveNames[17 * slot + 1] = 0;


Commit: 21a7e3d8e61c0bac072b8bd4f491a1cf2ef115ee
    https://github.com/scummvm/scummvm/commit/21a7e3d8e61c0bac072b8bd4f491a1cf2ef115ee
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-01-12T01:51:55-08:00

Commit Message:
Merge pull request #146 from eriktorbjorn/master

DREAMWEB: Extend the original save/load dialogs from 7 to 21 slots.

Changed paths:
    engines/dreamweb/dreamweb.cpp
    engines/dreamweb/dreamweb.h
    engines/dreamweb/saveload.cpp