make sure to reset the shake position if shaking gets disabled (fixes a bug that occured if you loaded while shaking was on)

svn-id: r4673

1 files changed, 3 insertions, 0 deletions

diff --git a/gfx.cpp b/gfx.cpp
index 23d649d426..8b7897f060 100644
--- a/gfx.cpp
+++ b/gfx.cpp
@@ -160,6 +160,9 @@ void Scumm::drawDirtyScreenParts()
 	if (_shakeEnabled && !_gui->isActive() && !_newgui->isActive()) {
 		_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
 		_system->set_shake_pos(shake_positions[_shakeFrame]);
+	} else if (!_shakeEnabled &&_shakeFrame != 0) {
+		_shakeFrame = 0;
+		_system->set_shake_pos(shake_positions[_shakeFrame]);
 	}
 }