diff options
author | Willem Jan Palenstijn | 2013-10-01 23:20:24 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-10-01 23:20:43 +0200 |
commit | a97907241051b493875950285f858c6e215238e3 (patch) | |
tree | 1c0223a2843cd141f4cfacf6c2ee9612a083cc18 /engines/wintermute/base/base_game.cpp | |
parent | e0dd19a21cb07ab4704991800e23bf4ac2dfb0ef (diff) | |
download | scummvm-rg350-a97907241051b493875950285f858c6e215238e3.tar.gz scummvm-rg350-a97907241051b493875950285f858c6e215238e3.tar.bz2 scummvm-rg350-a97907241051b493875950285f858c6e215238e3.zip |
WINTERMUTE: Clean up byte/char casts in loading/parsing
Diffstat (limited to 'engines/wintermute/base/base_game.cpp')
-rw-r--r-- | engines/wintermute/base/base_game.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index 38fb668f8e..0d8af0ce8a 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -620,7 +620,7 @@ void BaseGame::getOffset(int *offsetX, int *offsetY) const { ////////////////////////////////////////////////////////////////////////// bool BaseGame::loadFile(const char *filename) { - byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); + char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename); if (buffer == nullptr) { _gameRef->LOG(0, "BaseGame::LoadFile failed for file '%s'", filename); return STATUS_FAILED; @@ -690,7 +690,7 @@ TOKEN_DEF(GUID) TOKEN_DEF(COMPAT_KILL_METHOD_THREADS) TOKEN_DEF_END ////////////////////////////////////////////////////////////////////////// -bool BaseGame::loadBuffer(byte *buffer, bool complete) { +bool BaseGame::loadBuffer(char *buffer, bool complete) { TOKEN_TABLE_START(commands) TOKEN_TABLE(GAME) TOKEN_TABLE(TEMPLATE) @@ -740,32 +740,32 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { Common::String loadImageName = ""; Common::String saveImageName = ""; - byte *params; + char *params; int cmd; BaseParser parser; if (complete) { - if (parser.getCommand((char **)&buffer, commands, (char **)¶ms) != TOKEN_GAME) { + if (parser.getCommand(&buffer, commands, ¶ms) != TOKEN_GAME) { _gameRef->LOG(0, "'GAME' keyword expected."); return STATUS_FAILED; } buffer = params; } - while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { + while ((cmd = parser.getCommand(&buffer, commands, ¶ms)) > 0) { switch (cmd) { case TOKEN_TEMPLATE: - if (DID_FAIL(loadFile((char *)params))) { + if (DID_FAIL(loadFile(params))) { cmd = PARSERR_GENERIC; } break; case TOKEN_NAME: - setName((char *)params); + setName(params); break; case TOKEN_CAPTION: - setCaption((char *)params); + setCaption(params); break; case TOKEN_SYSTEM_FONT: @@ -774,7 +774,7 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { } _systemFont = nullptr; - _systemFont = _gameRef->_fontStorage->addFont((char *)params); + _systemFont = _gameRef->_fontStorage->addFont(params); break; case TOKEN_VIDEO_FONT: @@ -783,14 +783,14 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { } _videoFont = nullptr; - _videoFont = _gameRef->_fontStorage->addFont((char *)params); + _videoFont = _gameRef->_fontStorage->addFont(params); break; case TOKEN_CURSOR: delete _cursor; _cursor = new BaseSprite(_gameRef); - if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { + if (!_cursor || DID_FAIL(_cursor->loadFile(params))) { delete _cursor; _cursor = nullptr; cmd = PARSERR_GENERIC; @@ -801,7 +801,7 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { delete _activeCursor; _activeCursor = nullptr; _activeCursor = new BaseSprite(_gameRef); - if (!_activeCursor || DID_FAIL(_activeCursor->loadFile((char *)params))) { + if (!_activeCursor || DID_FAIL(_activeCursor->loadFile(params))) { delete _activeCursor; _activeCursor = nullptr; cmd = PARSERR_GENERIC; @@ -811,7 +811,7 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { case TOKEN_NONINTERACTIVE_CURSOR: delete _cursorNoninteractive; _cursorNoninteractive = new BaseSprite(_gameRef); - if (!_cursorNoninteractive || DID_FAIL(_cursorNoninteractive->loadFile((char *)params))) { + if (!_cursorNoninteractive || DID_FAIL(_cursorNoninteractive->loadFile(params))) { delete _cursorNoninteractive; _cursorNoninteractive = nullptr; cmd = PARSERR_GENERIC; @@ -819,23 +819,23 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { break; case TOKEN_SCRIPT: - addScript((char *)params); + addScript(params); break; case TOKEN_PERSONAL_SAVEGAMES: - parser.scanStr((char *)params, "%b", &_personalizedSave); + parser.scanStr(params, "%b", &_personalizedSave); break; case TOKEN_SUBTITLES: - parser.scanStr((char *)params, "%b", &_subtitles); + parser.scanStr(params, "%b", &_subtitles); break; case TOKEN_SUBTITLES_SPEED: - parser.scanStr((char *)params, "%d", &_subtitlesSpeed); + parser.scanStr(params, "%d", &_subtitlesSpeed); break; case TOKEN_VIDEO_SUBTITLES: - parser.scanStr((char *)params, "%b", &_videoSubtitles); + parser.scanStr(params, "%b", &_videoSubtitles); break; case TOKEN_PROPERTY: @@ -847,66 +847,66 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { break; case TOKEN_THUMBNAIL_WIDTH: - parser.scanStr((char *)params, "%d", &_thumbnailWidth); + parser.scanStr(params, "%d", &_thumbnailWidth); break; case TOKEN_THUMBNAIL_HEIGHT: - parser.scanStr((char *)params, "%d", &_thumbnailHeight); + parser.scanStr(params, "%d", &_thumbnailHeight); break; case TOKEN_INDICATOR_X: - parser.scanStr((char *)params, "%d", &indicatorX); + parser.scanStr(params, "%d", &indicatorX); break; case TOKEN_INDICATOR_Y: - parser.scanStr((char *)params, "%d", &indicatorY); + parser.scanStr(params, "%d", &indicatorY); break; case TOKEN_INDICATOR_COLOR: { int r, g, b, a; - parser.scanStr((char *)params, "%d,%d,%d,%d", &r, &g, &b, &a); + parser.scanStr(params, "%d,%d,%d,%d", &r, &g, &b, &a); indicatorColor = BYTETORGBA(r, g, b, a); } break; case TOKEN_INDICATOR_WIDTH: - parser.scanStr((char *)params, "%d", &indicatorWidth); + parser.scanStr(params, "%d", &indicatorWidth); break; case TOKEN_INDICATOR_HEIGHT: - parser.scanStr((char *)params, "%d", &indicatorHeight); + parser.scanStr(params, "%d", &indicatorHeight); break; case TOKEN_SAVE_IMAGE: - saveImageName = (char *) params; + saveImageName = params; break; case TOKEN_SAVE_IMAGE_X: - parser.scanStr((char *)params, "%d", &saveImageX); + parser.scanStr(params, "%d", &saveImageX); break; case TOKEN_SAVE_IMAGE_Y: - parser.scanStr((char *)params, "%d", &saveImageY); + parser.scanStr(params, "%d", &saveImageY); break; case TOKEN_LOAD_IMAGE: - loadImageName = (char *) params; + loadImageName = params; break; case TOKEN_LOAD_IMAGE_X: - parser.scanStr((char *)params, "%d", &loadImageX); + parser.scanStr(params, "%d", &loadImageX); break; case TOKEN_LOAD_IMAGE_Y: - parser.scanStr((char *)params, "%d", &loadImageY); + parser.scanStr(params, "%d", &loadImageY); break; case TOKEN_LOCAL_SAVE_DIR: - _localSaveDir = (char *)params; + _localSaveDir = params; break; case TOKEN_COMPAT_KILL_METHOD_THREADS: - parser.scanStr((char *)params, "%b", &_compatKillMethodThreads); + parser.scanStr(params, "%b", &_compatKillMethodThreads); break; } } |