Skip to content

Commit 4cef269

Browse files
committed
Fix Compile Error in LoadState
1 parent 178fd47 commit 4cef269

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

src/Menu/LoadState.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,24 @@ void LoadState::lstSavesPress(Action *action)
8383
catch (Exception &e)
8484
{
8585
Log(LOG_ERROR) << e.what();
86-
std::wstring error = _game->getLanguage()->getString("STR_LOAD_UNSUCCESSFUL") + L'\x02' + Language::utf8ToWstr(e.what());
86+
std::wstringstream error;
87+
error << _game->getLanguage()->getString("STR_LOAD_UNSUCCESSFUL") << L'\x02' << Language::utf8ToWstr(e.what());
8788
if (_geo)
88-
_game->pushState(new ErrorMessageState(_game, error, Palette::blockOffset(8)+10, "BACK01.SCR", 6));
89+
_game->pushState(new ErrorMessageState(_game, error.str(), Palette::blockOffset(8)+10, "BACK01.SCR", 6));
8990
else
90-
_game->pushState(new ErrorMessageState(_game, error, Palette::blockOffset(0), "TAC00.SCR", -1));
91+
_game->pushState(new ErrorMessageState(_game, error.str(), Palette::blockOffset(0), "TAC00.SCR", -1));
9192
delete s;
9293
_game->setSavedGame(0);
9394
}
9495
catch (YAML::Exception &e)
9596
{
9697
Log(LOG_ERROR) << e.what();
97-
std::wstring error = _game->getLanguage()->getString("STR_LOAD_UNSUCCESSFUL") + L'\x02' + Language::utf8ToWstr(e.what());
98+
std::wstringstream error;
99+
error << _game->getLanguage()->getString("STR_LOAD_UNSUCCESSFUL") << L'\x02' << Language::utf8ToWstr(e.what());
98100
if (_geo)
99-
_game->pushState(new ErrorMessageState(_game, error, Palette::blockOffset(8)+10, "BACK01.SCR", 6));
101+
_game->pushState(new ErrorMessageState(_game, error.str(), Palette::blockOffset(8)+10, "BACK01.SCR", 6));
100102
else
101-
_game->pushState(new ErrorMessageState(_game, error, Palette::blockOffset(0), "TAC00.SCR", -1));
103+
_game->pushState(new ErrorMessageState(_game, error.str(), Palette::blockOffset(0), "TAC00.SCR", -1));
102104
delete s;
103105
_game->setSavedGame(0);
104106
}

0 commit comments

Comments
 (0)