Merge branch 'master' of github.com:scummvm/scummvm into mortevielle

Conflicts:
	base/plugins.cpp
	configure

1 files changed, 5 insertions, 6 deletions

diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index f1a8bebe94..c48e55bb55 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -30,6 +30,7 @@
 
 #include "lastexpress/fight/fight.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/savegame.h"
@@ -41,10 +42,8 @@
 #include "lastexpress/menu/trainline.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -865,7 +864,7 @@ void Menu::init(bool doSavegame, SavegameType type, uint32 value) {
 
 		doSavegame = false;
 	} else {
-		// TODO rename saves?
+		warning("[Menu::initGame] Renaming saves not implemented");
 	}
 
 	// Create a new savegame if needed
@@ -876,7 +875,7 @@ void Menu::init(bool doSavegame, SavegameType type, uint32 value) {
 		getSaveLoad()->saveGame(kSavegameTypeEvent2, kEntityPlayer, kEventNone);
 
 	if (!getGlobalTimer()) {
-		// TODO: remove existing savegame temp file
+		warning("[Menu::initGame] Removing temporary saves not implemented");
 	}
 
 	// Init savegame & menu values
@@ -917,13 +916,13 @@ void Menu::startGame() {
 	if (_lastIndex == _index) {
 		setGlobalTimer(0);
 		if (_index) {
-			getSaveLoad()->loadGame(_gameId);
+			getSaveLoad()->loadLastGame();
 		} else {
 			getLogic()->resetState();
 			getEntities()->setup(true, kEntityPlayer);
 		}
 	} else {
-		getSaveLoad()->loadGame(_gameId, _index);
+		getSaveLoad()->loadGame(_index);
 	}
 }