aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-03-17 12:32:46 +0000
committerPaweł Kołodziejski2003-03-17 12:32:46 +0000
commitd434b86ddb0e8a72489366a513b669179b61d316 (patch)
treea46a04ae67a4cccc0048f63fb71c3208f4a9b8be /scumm/scumm.h
parent06ef80fa6170bec33f9ac117400fa86f965c4aa7 (diff)
downloadscummvm-rg350-d434b86ddb0e8a72489366a513b669179b61d316.tar.gz
scummvm-rg350-d434b86ddb0e8a72489366a513b669179b61d316.tar.bz2
scummvm-rg350-d434b86ddb0e8a72489366a513b669179b61d316.zip
split waitForTimer func, update for smush,
btw, switching scalers while playing smush movies doesn't work or at least SDL backend, it hang on SDL_SetVideo func svn-id: r6818
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 3b035ed391..7d35b3c8e2 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -257,7 +257,7 @@ struct langIndexNode {
class Scumm : public Engine {
friend class ScummDebugger;
- friend class ScummRenderer; // FIXME - this is mostly for the destructor
+ friend class SmushPlayer;
void errorString(const char *buf_input, char *buf_output);
public:
/* Put often used variables at the top.
@@ -321,6 +321,7 @@ public:
int scummLoop(int delta);
// Event handling
+ void parseEvents();
void waitForTimer(int msec_delay);
void processKbd();
int checkKeyHit();
@@ -341,6 +342,7 @@ public:
int _smushFrameRate;
bool _insaneState;
bool _videoFinished;
+ bool _smushPlay;
void pauseGame(bool user);
void shutDown(int i);