aboutsummaryrefslogtreecommitdiff
path: root/scumm/gfx.cpp
diff options
context:
space:
mode:
authorMax Horn2002-10-23 00:24:54 +0000
committerMax Horn2002-10-23 00:24:54 +0000
commit4129aaf3cd58cc8fc1e3244e2f9732ec2b15b840 (patch)
treeeeabb4821eb406eb9ae896df7d4579b1867d7b05 /scumm/gfx.cpp
parentab13e67b0907fdb97b0dde3bb3344650d4d12946 (diff)
downloadscummvm-rg350-4129aaf3cd58cc8fc1e3244e2f9732ec2b15b840.tar.gz
scummvm-rg350-4129aaf3cd58cc8fc1e3244e2f9732ec2b15b840.tar.bz2
scummvm-rg350-4129aaf3cd58cc8fc1e3244e2f9732ec2b15b840.zip
removed old GUI code
svn-id: r5271
Diffstat (limited to 'scumm/gfx.cpp')
-rw-r--r--scumm/gfx.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index cd37ae83ee..62022077b9 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -22,7 +22,6 @@
#include "stdafx.h"
#include "scumm.h"
#include "actor.h"
-#include "gui/gui.h"
#include "gui/newgui.h"
#include "resource.h"
#include "util.h"
@@ -168,7 +167,7 @@ void Scumm::drawDirtyScreenParts()
}
/* Handle shaking */
- if (_shakeEnabled && !_gui->isActive() && !_newgui->isActive()) {
+ if (_shakeEnabled && !_newgui->isActive()) {
_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
_system->set_shake_pos(shake_positions[_shakeFrame]);
} else if (!_shakeEnabled &&_shakeFrame != 0) {