diff options
author | Paul Gilbert | 2014-05-20 08:37:42 -0400 |
---|---|---|
committer | Paul Gilbert | 2014-05-20 08:37:42 -0400 |
commit | 8a08a19097b4338c73dc9456622b75233b9b0194 (patch) | |
tree | ecc7b90f90de253d33bba1a42fcfd7a766139cf6 /engines/fullpipe/fullpipe.h | |
parent | 555b4dfd6e076dd5ef5cfc982fb5dbf3e211d198 (diff) | |
parent | c1890cc739d94c4310ec8933b8fca3f43b8df294 (diff) | |
download | scummvm-rg350-8a08a19097b4338c73dc9456622b75233b9b0194.tar.gz scummvm-rg350-8a08a19097b4338c73dc9456622b75233b9b0194.tar.bz2 scummvm-rg350-8a08a19097b4338c73dc9456622b75233b9b0194.zip |
Merge branch 'master' into mads
Diffstat (limited to 'engines/fullpipe/fullpipe.h')
-rw-r--r-- | engines/fullpipe/fullpipe.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h index 17a771bd5d..afdc493258 100644 --- a/engines/fullpipe/fullpipe.h +++ b/engines/fullpipe/fullpipe.h @@ -91,6 +91,7 @@ public: GUI::Debugger *getDebugger() { return _console; } void initialize(); + void restartGame(); void setMusicAllowed(int val) { _musicAllowed = val; } @@ -98,7 +99,6 @@ public: const ADGameDescription *_gameDescription; const char *getGameId() const; Common::Platform getPlatform() const; - bool hasFeature(EngineFeature f) const; Common::RandomSource *_rnd; @@ -125,6 +125,7 @@ public: bool _flgGameIsRunning; bool _inputArFlag; bool _recordEvents; + bool _mainMenu_debugEnabled; Common::Rect _sceneRect; int _sceneWidth; @@ -149,18 +150,32 @@ public: int _currSoundListCount; bool _soundEnabled; bool _flgSoundList; + char _sceneTracks[10][260]; + int _numSceneTracks; + bool _sceneTrackHasSequence; + int _musicMinDelay; + int _musicMaxDelay; + int _musicLocal; + char _trackName[2600]; + int _trackStartDelay; + char _sceneTracksCurrentTrack[260]; + bool _sceneTrackIsPlaying; void stopAllSounds(); void toggleMute(); void playSound(int id, int flag); void playTrack(GameVar *sceneVar, const char *name, bool delayed); + int getSceneTrack(); void startSceneTrack(); + void startSoundStream1(char *trackName); void stopSoundStream2(); void stopAllSoundStreams(); void stopAllSoundInstances(int id); void updateSoundVolume(); + void setMusicVolume(int vol); int _sfxVolume; + int _musicVolume; GlobalMessageQueueList *_globalMessageQueueList; MessageHandler *_messageHandlers; @@ -296,6 +311,7 @@ public: GameVar *_musicGameVar; Audio::SoundHandle _sceneTrackHandle; + public: bool _isSaveAllowed; |