From 800ff80c52523fd044df3aa879caddb8a617134c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 3 May 2014 13:20:29 -0400
Subject: MADS: Default to first inventory item after loading a savegame

---
 engines/mads/game.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines/mads')

diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 862ecf9a54..65790d3c3d 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -491,12 +491,15 @@ void Game::loadGame(int slotNumber) {
 	synchronize(s, true);
 
 	// Set up section/scene and other initial states for post-load
-	_scene._userInterface._selectedInvIndex = -1;
 	_currentSectionNumber = -2;
 	_scene._currentSceneId = -2;
 	_sectionNumber = _scene._nextSceneId / 100;
 	_scene._frameStartTime = _vm->_events->getFrameCounter();
 
+	// Default the selected inventory item to the first one, if the player has any
+	_scene._userInterface._selectedInvIndex = _objects._inventoryList.size() > 0 ? 0 : -1;
+
+	// Set player sprites sets flags
 	_player._spritesLoaded = false;
 	_player._spritesChanged = true;
 }
-- 
cgit v1.2.3