libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 14:51:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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
Show Stats 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();
_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);

2
engines/fullpipe/gameloader.h
View File

@ -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;