diff options
| author | Strangerke | 2016-06-10 23:56:25 +0200 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:23:07 -0400 |
| commit | ab55958319e285781e086ad2edc28297fce65a3d (patch) | |
| tree | 52a01187371741ab701dbfc618fc6113be47c4f9 /engines/titanic | |
| parent | 8c237b3ee2c6b33edcc11ce9783f87e34f971508 (diff) | |
| download | scummvm-rg350-ab55958319e285781e086ad2edc28297fce65a3d.tar.gz scummvm-rg350-ab55958319e285781e086ad2edc28297fce65a3d.tar.bz2 scummvm-rg350-ab55958319e285781e086ad2edc28297fce65a3d.zip | |
TITANIC: Fix compilation on MSVC9
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/true_talk/true_talk_manager.cpp | 3 | ||||
| -rw-r--r-- | engines/titanic/true_talk/tt_string.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/true_talk/tt_string.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index 91e6c9e36b..5444cde5af 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -335,8 +335,7 @@ void CTrueTalkManager::processInput(CTrueTalkNPC *npc, CTextInputMsg *msg, CView if (npcScript && roomScript) { _currentNPC = npc; - _titleEngine._scriptHandler->processInput(roomScript, npcScript, - TTstring(msg->_input)); + _titleEngine._scriptHandler->processInput(roomScript, npcScript, TTstring(msg->_input)); _currentNPC = nullptr; loadAssets(npc, npcScript->charId()); diff --git a/engines/titanic/true_talk/tt_string.cpp b/engines/titanic/true_talk/tt_string.cpp index 589141303b..198a8c2e80 100644 --- a/engines/titanic/true_talk/tt_string.cpp +++ b/engines/titanic/true_talk/tt_string.cpp @@ -38,7 +38,7 @@ TTstring::TTstring(const CString &str) { _data = new TTstringData(str); } -TTstring::TTstring(TTstring &str) { +TTstring::TTstring(const TTstring &str) { if (str._status != SS_VALID) { _status = SS_5; _data = nullptr; diff --git a/engines/titanic/true_talk/tt_string.h b/engines/titanic/true_talk/tt_string.h index 12daa07a9d..5b12d93418 100644 --- a/engines/titanic/true_talk/tt_string.h +++ b/engines/titanic/true_talk/tt_string.h @@ -51,7 +51,7 @@ public: TTstring(); TTstring(const char *str); TTstring(const CString &str); - TTstring(TTstring &str); + TTstring(const TTstring &str); virtual ~TTstring(); void operator=(const TTstring &str); |