diff options
| author | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
| commit | ede418b67a0f14e4f17a2b03f5362741badd5532 (patch) | |
| tree | 07de039fac5c303f1b9fce372afe5fa19854f547 /engines/wintermute/base/base_game.h | |
| parent | 66d1f7a8de2ff5a21ad013f45924c406f4833e9a (diff) | |
| parent | 3e859768770a0b385e21c4528cd546b33ed9a55d (diff) | |
| download | scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.gz scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.bz2 scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.zip | |
VOYEUR: Merge of upstream
Diffstat (limited to 'engines/wintermute/base/base_game.h')
| -rw-r--r-- | engines/wintermute/base/base_game.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index d51255d013..742d6f548d 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -137,7 +137,7 @@ public: bool initialize2(); bool initialize3(); BaseTransitionMgr *_transMgr; - + // String Table void expandStringByStringTable(char **str) const; char *getKeyFromStringTable(const char *str) const; @@ -150,14 +150,14 @@ public: BaseScriptable *_mathClass; BaseSurfaceStorage *_surfaceStorage; BaseFontStorage *_fontStorage; - BaseGame(const Common::String &gameId); + BaseGame(const Common::String &targetName); virtual ~BaseGame(); bool _debugDebugMode; int32 _sequence; virtual bool loadFile(const char *filename); - virtual bool loadBuffer(byte *buffer, bool complete = true); + virtual bool loadBuffer(char *buffer, bool complete = true); int32 _viewportSP; @@ -173,8 +173,8 @@ public: // compatibility bits bool _compatKillMethodThreads; - const char* getGameId() const { return _gameId.c_str(); } - void setGameId(const Common::String& gameId) { _gameId = gameId; } + const char* getGameTargetName() const { return _targetName.c_str(); } + void setGameTargetName(const Common::String& targetName) { _targetName = targetName; } uint32 _surfaceGCCycleTime; bool _smartCache; // RO bool _subtitles; // RO @@ -275,7 +275,7 @@ private: bool _mouseRightDown; bool _mouseMidlleDown; - + BaseGameSettings *_settings; int32 _soundBufferSizeSec; @@ -295,7 +295,7 @@ private: uint32 _lastTime; uint32 _fpsTime; uint32 _framesRendered; - Common::String _gameId; + Common::String _targetName; void setEngineLogCallback(ENGINE_LOG_CALLBACK callback = nullptr, void *data = nullptr); ENGINE_LOG_CALLBACK _engineLogCallback; @@ -343,6 +343,8 @@ private: bool isDoubleClick(int32 buttonIndex); uint32 _usedMem; +// TODO: This should be expanded into a proper class eventually: + Common::String readRegistryString(const Common::String &key, const Common::String &initValue) const; protected: @@ -356,6 +358,6 @@ public: }; -} // end of namespace Wintermute +} // End of namespace Wintermute #endif |