[Scummvm-cvs-logs] scummvm master -> 25e977f81dacf4ad6465ba53bc7425532786109d

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
25e977f81d TITANIC: Compilation fix for CMissiveOMat


Commit: 25e977f81dacf4ad6465ba53bc7425532786109d
    https://github.com/scummvm/scummvm/commit/25e977f81dacf4ad6465ba53bc7425532786109d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-24T21:33:42-04:00

Commit Message:
TITANIC: Compilation fix for CMissiveOMat

Changed paths:
    engines/titanic/game/missiveomat.cpp



diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp
index b7eb3ed..6f47131 100644
--- a/engines/titanic/game/missiveomat.cpp
+++ b/engines/titanic/game/missiveomat.cpp
@@ -268,8 +268,8 @@ bool CMissiveOMat::MissiveOMatActionMsg(CMissiveOMatActionMsg *msg) {
 		if (welcome) {
 			CString str = CString::format(
 				"Missive %d of %d.\nFrom: %s\nTo: %s\n\n%s\n",
-				_messageNum + 1, _totalMessages, _from[_messageNum],
-				_to[_messageNum], _messages[_messageNum]);
+				_messageNum + 1, _totalMessages, _from[_messageNum].c_str(),
+				_to[_messageNum].c_str(), _messages[_messageNum].c_str());
 
 			setText(str);
 		}