diff options
| author | Norbert Lange | 2009-07-01 14:45:24 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-07-01 14:45:24 +0000 |
| commit | abef70f4e14f495b20097cb46411d1fafbafdd53 (patch) | |
| tree | 27462f82f352b303ac059dd275466930c88b2de6 /engines/kyra/kyra_v1.h | |
| parent | 3b94e2488df9a699a899727515ac69af6a0a1a6e (diff) | |
| parent | f9298ff40310149779b37ccdecc873afba7adf2f (diff) | |
| download | scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.tar.gz scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.tar.bz2 scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.zip | |
Merging in changes from trunk
svn-id: r41989
Diffstat (limited to 'engines/kyra/kyra_v1.h')
| -rw-r--r-- | engines/kyra/kyra_v1.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index b45f21dd89..5ece70e3f1 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -153,7 +153,7 @@ public: kVolumeSpeech = 2 }; - // volume reaches from 2 to 97 + // volume reaches per default from 2 to 97 void setVolume(kVolumeEntry vol, uint8 value); uint8 getVolume(kVolumeEntry vol); @@ -181,13 +181,16 @@ protected: // Engine APIs virtual Common::Error init(); virtual Common::Error go() = 0; + virtual Common::Error run() { Common::Error err; + registerDefaultSettings(); err = init(); if (err != Common::kNoError) return err; return go(); } + virtual ::GUI::Debugger *getDebugger(); virtual bool hasFeature(EngineFeature f) const; virtual void pauseEngineIntern(bool pause); @@ -289,6 +292,9 @@ protected: const int8 *_trackMap; int _trackMapSize; + virtual int convertVolumeToMixer(int value); + virtual int convertVolumeFromMixer(int value); + // pathfinder virtual int findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize); int findSubPath(int x, int y, int toX, int toY, int *moveTable, int start, int end); |