diff options
author | Filippos Karapetis | 2016-12-20 01:55:51 +0200 |
---|---|---|
committer | Filippos Karapetis | 2016-12-20 01:55:51 +0200 |
commit | c3a3d7ef9874a00ce860a700abd93ede0316b2bc (patch) | |
tree | ee3f4f79b914d6a62ad36cba75f35eb70d031acd /engines | |
parent | 704b4838bddf410cce09cf9df1f0cf6b8be13d8d (diff) | |
download | scummvm-rg350-c3a3d7ef9874a00ce860a700abd93ede0316b2bc.tar.gz scummvm-rg350-c3a3d7ef9874a00ce860a700abd93ede0316b2bc.tar.bz2 scummvm-rg350-c3a3d7ef9874a00ce860a700abd93ede0316b2bc.zip |
FULLPIPE: Change _gameName into a Common::String
Diffstat (limited to 'engines')
-rw-r--r-- | engines/fullpipe/gameloader.cpp | 6 | ||||
-rw-r--r-- | engines/fullpipe/gameloader.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp index aebf73dbe4..efa5f8c2c7 100644 --- a/engines/fullpipe/gameloader.cpp +++ b/engines/fullpipe/gameloader.cpp @@ -55,7 +55,6 @@ GameLoader::GameLoader() { _inputController = new InputController(); _gameProject = 0; - _gameName = 0; addMessageHandlerByIndex(global_messageHandler2, 0, 0); insertMessageHandler(global_messageHandler3, 0, 128); @@ -78,7 +77,6 @@ GameLoader::GameLoader() { } GameLoader::~GameLoader() { - free(_gameName); delete _gameProject; delete _interactionController; delete _inputController; @@ -112,7 +110,7 @@ bool GameLoader::load(MfcArchive &file) { debugC(1, kDebugLoading, "GameLoader::load()"); _gameName = file.readPascalString(); - debugC(1, kDebugLoading, "_gameName: %s", _gameName); + debugC(1, kDebugLoading, "_gameName: %s", _gameName.c_str()); _gameProject = new GameProject(); @@ -125,7 +123,7 @@ bool GameLoader::load(MfcArchive &file) { } _gameName = file.readPascalString(); - debugC(1, kDebugLoading, "_gameName: %s", _gameName); + debugC(1, kDebugLoading, "_gameName: %s", _gameName.c_str()); _inventory.load(file); diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h index a6c2416aae..6180ab0347 100644 --- a/engines/fullpipe/gameloader.h +++ b/engines/fullpipe/gameloader.h @@ -133,7 +133,7 @@ class GameLoader : public CObject { int16 _field_FA; PreloadItems _preloadItems; GameVar *_gameVar; - char *_gameName; + Common::String _gameName; ExCommand _exCommand; int _updateCounter; int _preloadSceneId; |