thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FULLPIPE: Change _gameName into a Common::String

Browse source
This commit is contained in:
Filippos Karapetis 2016-12-20 01:55:51 +02:00
parent 704b4838bd
commit c3a3d7ef98
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/fullpipe/gameloader.cpp
View file

@ -55,7 +55,6 @@ GameLoader::GameLoader() {
_inputController = new InputController(); _inputController = new InputController();
_gameProject = 0; _gameProject = 0;
_gameName = 0;
addMessageHandlerByIndex(global_messageHandler2, 0, 0); addMessageHandlerByIndex(global_messageHandler2, 0, 0);
insertMessageHandler(global_messageHandler3, 0, 128); insertMessageHandler(global_messageHandler3, 0, 128);
@ -78,7 +77,6 @@ GameLoader::GameLoader() {
} }
GameLoader::~GameLoader() { GameLoader::~GameLoader() {
free(_gameName);
delete _gameProject; delete _gameProject;
delete _interactionController; delete _interactionController;
delete _inputController; delete _inputController;
@ -112,7 +110,7 @@ bool GameLoader::load(MfcArchive &file) {
debugC(1, kDebugLoading, "GameLoader::load()"); debugC(1, kDebugLoading, "GameLoader::load()");
_gameName = file.readPascalString(); _gameName = file.readPascalString();
debugC(1, kDebugLoading, "_gameName: %s", _gameName); debugC(1, kDebugLoading, "_gameName: %s", _gameName.c_str());
_gameProject = new GameProject(); _gameProject = new GameProject();
@ -125,7 +123,7 @@ bool GameLoader::load(MfcArchive &file) {
} }
_gameName = file.readPascalString(); _gameName = file.readPascalString();
debugC(1, kDebugLoading, "_gameName: %s", _gameName); debugC(1, kDebugLoading, "_gameName: %s", _gameName.c_str());
_inventory.load(file); _inventory.load(file);

2
engines/fullpipe/gameloader.h
View file

@ -133,7 +133,7 @@ class GameLoader : public CObject {
int16 _field_FA; int16 _field_FA;
PreloadItems _preloadItems; PreloadItems _preloadItems;
GameVar *_gameVar; GameVar *_gameVar;
char *_gameName; Common::String _gameName;
ExCommand _exCommand; ExCommand _exCommand;
int _updateCounter; int _updateCounter;
int _preloadSceneId; int _preloadSceneId;