1 files changed, 32 insertions, 16 deletions

diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index c5edd34a01..a0ec12a7c4 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -36,6 +36,7 @@
 #include "backends/keymapper/keymapper.h"
 #include "base/plugins.h"
 #include "base/version.h"
+#include "gui/message.h"
 #include "gui/saveload.h"
 #include "video/theora_decoder.h"
 #include "video/qt_decoder.h"
@@ -379,20 +380,21 @@ Common::Error PegasusEngine::showSaveDialog() {
 
 	int slot = slc.runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
 
-	Common::Error result;
+	if (slot >= 0)
+		return saveGameState(slot, slc.getResultString());
 
-	if (slot >= 0) {
-		if (saveGameState(slot, slc.getResultString()).getCode() == Common::kNoError)
-			result = Common::kNoError;
-		else
-			result = Common::kUnknownError;
-	} else {
-		result = Common::kUserCanceled;
-	}
+	return Common::kUserCanceled;
+}
 
-	return result;
+void PegasusEngine::showSaveFailedDialog(const Common::Error &status) {
+	Common::String failMessage = Common::String::format(_("Gamestate save failed (%s)! "
+			"Please consult the README for basic information, and for "
+			"instructions on how to obtain further assistance."), status.getDesc().c_str());
+	GUI::MessageDialog dialog(failMessage);
+	dialog.runModal();
 }
 
+
 GUI::Debugger *PegasusEngine::getDebugger() {
 	return _console;
 }
@@ -834,6 +836,7 @@ void PegasusEngine::delayShell(TimeValue time, TimeScale scale) {
 	uint32 timeInMillis = time * 1000 / scale;
 
 	while (g_system->getMillis() < startTime + timeInMillis) {
+		InputDevice.pumpEvents();
 		checkCallBacks();
 		_gfx->updateDisplay();
 	}
@@ -969,8 +972,14 @@ void PegasusEngine::doGameMenuCommand(const GameMenuCommand command) {
 		resetIntroTimer();
 		break;
 	case kMenuCmdPauseSave:
-		if (showSaveDialog().getCode() != Common::kUserCanceled)
+		result = showSaveDialog();			
+
+		if (result.getCode() != Common::kUserCanceled) {
+			if (result.getCode() != Common::kNoError)
+				showSaveFailedDialog(result);
+
 			pauseMenu(false);
+		}
 		break;
 	case kMenuCmdPauseContinue:
 		pauseMenu(false);
@@ -1021,7 +1030,12 @@ void PegasusEngine::handleInput(const Input &input, const Hotspot *cursorSpot) {
 		// Can only save during a game and not in the demo
 		if (g_neighborhood && !isDemo()) {
 			pauseEngine(true);
-			showSaveDialog();
+
+			Common::Error result = showSaveDialog();
+
+			if (result.getCode() != Common::kNoError && result.getCode() != Common::kUserCanceled)
+				showSaveFailedDialog(result);
+
 			pauseEngine(false);
 		}
 	}
@@ -1669,6 +1683,9 @@ void PegasusEngine::startNewGame() {
 	removeAllItemsFromInventory();
 	removeAllItemsFromBiochips();
 
+	// Properly reset all items to their original state
+	g_allItems.resetAllItems();
+
 	BiochipItem *biochip = (BiochipItem *)_allItems.findItemByID(kAIBiochip);
 	addItemToBiochips(biochip);
 
@@ -2159,6 +2176,7 @@ void PegasusEngine::autoDragItemIntoRoom(Item *item, Sprite *draggingSprite) {
 	_autoDragger.autoDrag(draggingSprite, start, stop, time, kDefaultTimeScale);
 
 	while (_autoDragger.isDragging()) {
+		InputDevice.pumpEvents();
 		checkCallBacks();
 		refreshDisplay();
 		_system->delayMillis(10);
@@ -2192,6 +2210,7 @@ void PegasusEngine::autoDragItemIntoInventory(Item *, Sprite *draggingSprite) {
 	_autoDragger.autoDrag(draggingSprite, start, stop, time, kDefaultTimeScale);
 
 	while (_autoDragger.isDragging()) {
+		InputDevice.pumpEvents();
 		checkCallBacks();
 		refreshDisplay();
 		_system->delayMillis(10);
@@ -2268,10 +2287,7 @@ void PegasusEngine::doSubChase() {
 				drawScaledFrame(frame, 0, 0);
 		}
 
-		Common::Event event;
-		while (_eventMan->pollEvent(event))
-			;
-
+		InputDevice.pumpEvents();
 		_system->delayMillis(10);
 	}