4 files changed, 30 insertions, 32 deletions

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index cb9113fe65..b590bba65e 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -364,37 +364,32 @@ void SaveLoadChooser::reflowLayout() {
 
 void SaveLoadChooser::updateInfos(bool redraw) {
 	int selItem = _list->getSelected();
-	Graphics::Surface *thumb;
-	thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
+	Graphics::Surface *thumb = 0;
+	if (selItem >= 0 && !_list->getSelectedString().empty())
+		thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
 
 	if (thumb) {
 		_gfxWidget->setGfx(thumb);
 		_gfxWidget->useAlpha(256);
 		thumb->free();
+		delete thumb;
 	} else {
 		_gfxWidget->setGfx(-1, -1, _fillR, _fillG, _fillB);
 	}
 
-	delete thumb;
-	if (redraw)
-		_gfxWidget->draw();
-
 	InfoStuff infos;
 	memset(&infos, 0, sizeof(InfoStuff));
-	char buffer[32];
-	if (_vm->loadInfosFromSlot(_saveMode ? selItem + 1 : selItem, &infos)) {
+	if (selItem >= 0 && !_list->getSelectedString().empty() 
+		   && _vm->loadInfosFromSlot(_saveMode ? selItem + 1 : selItem, &infos)) {
+		char buffer[32];
 		snprintf(buffer, 32, "Date: %.2d.%.2d.%.4d",
 			(infos.date >> 24) & 0xFF, (infos.date >> 16) & 0xFF,
 			infos.date & 0xFFFF);
 		_date->setLabel(buffer);
-		if (redraw)
-			_date->draw();
 
 		snprintf(buffer, 32, "Time: %.2d:%.2d",
 			(infos.time >> 8) & 0xFF, infos.time & 0xFF);
 		_time->setLabel(buffer);
-		if (redraw)
-			_time->draw();
 
 		int minutes = infos.playtime / 60;
 		int hours = minutes / 60;
@@ -403,23 +398,17 @@ void SaveLoadChooser::updateInfos(bool redraw) {
 		snprintf(buffer, 32, "Playtime: %.2d:%.2d",
 			hours & 0xFF, minutes & 0xFF);
 		_playtime->setLabel(buffer);
-		if (redraw)
-			_playtime->draw();
 	} else {
-		snprintf(buffer, 32, "No date saved");
-		_date->setLabel(buffer);
-		if (redraw)
-			_date->draw();
-
-		snprintf(buffer, 32, "No time saved");
-		_time->setLabel(buffer);
-		if (redraw)
-			_time->draw();
+		_date->setLabel("No date saved");
+		_time->setLabel("No time saved");
+		_playtime->setLabel("No playtime saved");
+	}
 
-		snprintf(buffer, 32, "No playtime saved");
-		_playtime->setLabel(buffer);
-		if (redraw)
-			_playtime->draw();
+	if (redraw) {
+		_gfxWidget->draw();
+		_date->draw();
+		_time->draw();
+		_playtime->draw();
 	}
 }
 
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 9268768f2e..c727b59c64 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -769,14 +769,14 @@ void ScummEngine::runInventoryScript(int i) {
 	args[0] = i;
 	if (VAR(VAR_INVENTORY_SCRIPT)) {
 		if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) {
-			inventoryScript();
+			inventoryScriptIndy3Mac();
 		} else {
 			runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, args);
 		}
 	}
 }
 
-void ScummEngine::inventoryScript() {
+void ScummEngine::inventoryScriptIndy3Mac() {
 	VerbSlot *vs;
 	int args[24];
 	int j, slot;
@@ -1201,11 +1201,11 @@ void ScummEngine::runInputScript(int clickArea, int val, int mode) {
 		if (clickArea == kVerbClickArea && (val >= 101 && val <= 108)) {
 			if (val == 107) {
 				VAR(67) -= 2;
-				inventoryScript();
+				inventoryScriptIndy3Mac();
 				return;
 			} else if (val == 108) {
 				VAR(67) += 2;
-				inventoryScript();
+				inventoryScriptIndy3Mac();
 				return;
 			} else {
 				args[0] = 3;
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index f8502cbbe7..245dca883a 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2390,6 +2390,15 @@ void ScummEngine_v6::o6_talkActor() {
 
 	_actorToPrintStrFor = pop();
 
+	// WORKAROUND for bug #2016521: "DOTT: Bernard impersonating LaVerne"
+	// Original script did not check for VAR_EGO == 2 before executing
+	// a talkActor opcode.
+	if (_game.id == GID_TENTACLE && vm.slot[_currentScript].number == 307
+			&& VAR(VAR_EGO) != 2 && _actorToPrintStrFor == 2) {
+		_scriptPointer += resStrLen(_scriptPointer) + 1;
+		return;
+	}
+
 	_string[0].loadDefault();
 	actorTalk(_scriptPointer);
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index b839d37b08..054a1f59b9 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -669,7 +669,7 @@ protected:
 	void executeScript();
 	void updateScriptPtr();
 	virtual void runInventoryScript(int i);
-	void inventoryScript();
+	void inventoryScriptIndy3Mac();
 	void checkAndRunSentenceScript();
 	void runExitScript();
 	void runEntryScript();