[Scummvm-cvs-logs] scummvm master -> af87fc7b65ebd56dbd2cb1a1484c9a9764aab1e6

[bluegr]

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:
923ee223d8 NEVERHOOD: Don't crash when loading savegames with a high slot ID
af87fc7b65 Merge pull request #620 from salty-horse/neverhood_save


Commit: 923ee223d82be96a3c2e0c4fbb79bb86e1947bd5
    https://github.com/scummvm/scummvm/commit/923ee223d82be96a3c2e0c4fbb79bb86e1947bd5
Author: Ori Avtalion (ori at avtalion.name)
Date: 2015-10-05T18:51:15+03:00

Commit Message:
NEVERHOOD: Don't crash when loading savegames with a high slot ID

Changed paths:
    engines/neverhood/menumodule.cpp
    engines/neverhood/menumodule.h



diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp
index 6911041..826f175 100644
--- a/engines/neverhood/menumodule.cpp
+++ b/engines/neverhood/menumodule.cpp
@@ -93,6 +93,10 @@ void MenuModule::setLoadgameInfo(uint index) {
 	_savegameSlot = (*_savegameList)[index].slotNum;
 }
 
+void MenuModule::setLoadgameSlot(int slot) {
+	_savegameSlot = slot;
+}
+
 void MenuModule::setSavegameInfo(const Common::String &description, uint index, bool newSavegame) {
 	_savegameDescription = description;
 	_savegameSlot = newSavegame ? -1 : (*_savegameList)[index].slotNum;
@@ -912,7 +916,7 @@ GameStateMenu::GameStateMenu(NeverhoodEngine *vm, Module *parentModule, Savegame
 
 		if (slot >= 0) {
 			if (!isSave) {
-				((MenuModule*)_parentModule)->setLoadgameInfo(slot);
+				((MenuModule*)_parentModule)->setLoadgameSlot(slot);
 			} else {
 				((MenuModule*)_parentModule)->setSavegameInfo(saveDesc,
 					slot, slot >= saveCount);
diff --git a/engines/neverhood/menumodule.h b/engines/neverhood/menumodule.h
index 6508ccb..1c4ade2 100644
--- a/engines/neverhood/menumodule.h
+++ b/engines/neverhood/menumodule.h
@@ -43,6 +43,7 @@ public:
 	MenuModule(NeverhoodEngine *vm, Module *parentModule, int which);
 	virtual ~MenuModule();
 	void setLoadgameInfo(uint index);
+	void setLoadgameSlot(int slot);
 	void setSavegameInfo(const Common::String &description, uint index, bool newSavegame);
 	void setDeletegameInfo(uint index);
 	void refreshSaveGameList();


Commit: af87fc7b65ebd56dbd2cb1a1484c9a9764aab1e6
    https://github.com/scummvm/scummvm/commit/af87fc7b65ebd56dbd2cb1a1484c9a9764aab1e6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-10-22T11:06:51+03:00

Commit Message:
Merge pull request #620 from salty-horse/neverhood_save

NEVERHOOD: Don't crash when loading savegames with a high slot ID

Changed paths:
    engines/neverhood/menumodule.cpp
    engines/neverhood/menumodule.h