diff options
| author | Sven Hesse | 2011-01-29 22:45:15 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-29 22:45:15 +0000 |
| commit | 0c3a33c354c027ee238186794d96c3047d0a4ce2 (patch) | |
| tree | c6c0a8a7bb8e5e3973c53574a9b30efa6b3df337 /engines/gob/game.h | |
| parent | 05d5d64d6c108bcf57e67ff3976c1cd0324a30ef (diff) | |
| download | scummvm-rg350-0c3a33c354c027ee238186794d96c3047d0a4ce2.tar.gz scummvm-rg350-0c3a33c354c027ee238186794d96c3047d0a4ce2.tar.bz2 scummvm-rg350-0c3a33c354c027ee238186794d96c3047d0a4ce2.zip | |
GOB: Change _curTotFile and _totToLoad into Common::String
svn-id: r55629
Diffstat (limited to 'engines/gob/game.h')
| -rw-r--r-- | engines/gob/game.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/engines/gob/game.h b/engines/gob/game.h index a6a3968435..8a67eb29fc 100644 --- a/engines/gob/game.h +++ b/engines/gob/game.h @@ -26,6 +26,8 @@ #ifndef GOB_GAME_H #define GOB_GAME_H +#include "common/str.h" + #include "gob/util.h" #include "gob/video.h" #include "gob/sound/sounddesc.h" @@ -47,7 +49,7 @@ public: void set(uint8 env); void get(uint8 env) const; - const char *getTotFile(uint8 env) const; + const Common::String &getTotFile(uint8 env) const; bool has(Variables *variables, uint8 startEnv = 0, int16 except = -1) const; bool has(Script *script , uint8 startEnv = 0, int16 except = -1) const; @@ -61,12 +63,12 @@ public: private: struct Environment { - int32 cursorHotspotX; - int32 cursorHotspotY; - char curTotFile[14]; - Variables *variables; - Script *script; - Resources *resources; + int32 cursorHotspotX; + int32 cursorHotspotY; + Common::String totFile; + Variables *variables; + Script *script; + Resources *resources; }; struct Media { @@ -87,8 +89,8 @@ public: Resources *_resources; Hotspots *_hotspots; - char _curTotFile[14]; - char _totToLoad[20]; + Common::String _curTotFile; + Common::String _totToLoad; int32 _startTimeKey; MouseButtons _mouseButtons; @@ -122,7 +124,7 @@ public: MouseButtons *pButtons = 0, char handleMouse = 0); void start(); - void totSub(int8 flags, const char *newTotFile); + void totSub(int8 flags, const Common::String &totFile); void switchTotSub(int16 index, int16 function); protected: |