diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/kyra_v1.h | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/kyra_v1.h')
| -rw-r--r-- | engines/kyra/kyra_v1.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 5a9feb0054..0033969047 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -28,8 +28,9 @@ #include "common/array.h" #include "common/error.h" #include "common/events.h" -#include "common/random.h" #include "common/hashmap.h" +#include "common/random.h" +#include "common/rendermode.h" #include "audio/mixer.h" @@ -118,7 +119,7 @@ struct GameFlags { bool useAltShapeHeader : 1; // alternative shape header (uses 2 bytes more, those are unused though) bool isTalkie : 1; bool isOldFloppy : 1; - bool useHiResOverlay : 1; + bool useHiRes : 1; bool use16ColorMode : 1; bool useDigSound : 1; bool useInstallerPackage : 1; @@ -134,7 +135,9 @@ enum { GI_KYRA1 = 0, GI_KYRA2 = 1, GI_KYRA3 = 2, - GI_LOL = 4 + GI_LOL = 4, + GI_EOB1 = 5, + GI_EOB2 = 6 }; struct AudioDataStruct { @@ -182,7 +185,10 @@ class KyraEngine_v1 : public Engine { friend class Debugger; friend class ::KyraMetaEngine; friend class GUI; +friend class GUI_v1; +friend class GUI_EoB; friend class SoundMidiPC; // For _eventMan +friend class TransferPartyWiz; // For save state API public: KyraEngine_v1(OSystem *system, const GameFlags &flags); virtual ~KyraEngine_v1(); @@ -205,7 +211,7 @@ public: // input void setMousePos(int x, int y); - Common::Point getMousePos() const; + Common::Point getMousePos(); // config specific bool speechEnabled(); @@ -301,6 +307,8 @@ protected: bool _configSounds; uint8 _configVoice; + Common::RenderMode _configRenderMode; + // game speed virtual bool skipFlag() const; virtual void resetSkipFlag(bool removeEvent = true); @@ -421,7 +429,7 @@ protected: Common::Error saveGameState(int slot, const Common::String &desc) { return saveGameStateIntern(slot, desc.c_str(), 0); } virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0; - Common::SeekableReadStream *openSaveForReading(const char *filename, SaveHeader &header); + Common::SeekableReadStream *openSaveForReading(const char *filename, SaveHeader &header, bool checkID = true); Common::WriteStream *openSaveForWriting(const char *filename, const char *saveName, const Graphics::Surface *thumbnail) const; // TODO: Consider moving this to Screen |