aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-07-22 13:40:03 +0000
committerMax Horn2002-07-22 13:40:03 +0000
commit150ed1b8c613b322162016f53bfca312aa00d4fe (patch)
tree134d787f43f43d1df3a38c1da121604f4dcd649b
parent75b48a04f67c53a910a69e4397e5b7b7b7ef1ac7 (diff)
downloadscummvm-rg350-150ed1b8c613b322162016f53bfca312aa00d4fe.tar.gz
scummvm-rg350-150ed1b8c613b322162016f53bfca312aa00d4fe.tar.bz2
scummvm-rg350-150ed1b8c613b322162016f53bfca312aa00d4fe.zip
no shaking while NewGUI is showing
svn-id: r4617
-rw-r--r--gfx.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/gfx.cpp b/gfx.cpp
index 962a570d8e..de371e17a4 100644
--- a/gfx.cpp
+++ b/gfx.cpp
@@ -23,6 +23,7 @@
#include "scumm.h"
#include "actor.h"
#include "gui.h"
+#include "newgui.h"
#include "resource.h"
void Scumm::getGraphicsPerformance()
@@ -156,7 +157,7 @@ void Scumm::drawDirtyScreenParts()
}
/* Handle shaking */
- if (_shakeEnabled && !_gui->isActive()) {
+ if (_shakeEnabled && !_gui->isActive() && !_newgui->isActive()) {
_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
_system->set_shake_pos(shake_positions[_shakeFrame]);
}