aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2006-04-29 13:01:35 +0000
committerMax Horn2006-04-29 13:01:35 +0000
commit1735b0421bbbc1fcd2a6d0126a152ceef39b6b43 (patch)
treee8abcdb9a8c58b8014022284aee2f9e3ea6df32f /engines/scumm/scumm.h
parentcc3fac2ead745876f618a904d2029080730a2baf (diff)
downloadscummvm-rg350-1735b0421bbbc1fcd2a6d0126a152ceef39b6b43.tar.gz
scummvm-rg350-1735b0421bbbc1fcd2a6d0126a152ceef39b6b43.tar.bz2
scummvm-rg350-1735b0421bbbc1fcd2a6d0126a152ceef39b6b43.zip
Make use of the new scummLoop_* functions to move some SCUMM version specific stuff around
svn-id: r22219
Diffstat (limited to 'engines/scumm/scumm.h')
-rw-r--r--engines/scumm/scumm.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 8f9a7ec759..98db99fccf 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -475,7 +475,7 @@ protected:
virtual void scummLoop_updateScummVars();
virtual void scummLoop_handleSaveLoad();
virtual void scummLoop_handleDrawing();
- virtual void scummLoop_handleActors();
+ virtual void scummLoop_handleActors() = 0;
virtual void scummLoop_handleEffects();
virtual void scummLoop_handleSound();
@@ -997,13 +997,6 @@ protected:
byte *_scrollBuffer;
- struct {
- int x, y, w, h;
- byte *buffer;
- uint16 xStrips, yStrips;
- bool isDrawn;
- } _flashlight;
-
public:
bool isLightOn() const;
@@ -1088,8 +1081,6 @@ public:
byte *getMaskBuffer(int x, int y, int z);
protected:
- void drawFlashlight();
-
void fadeIn(int effect);
void fadeOut(int effect);