diff options
| author | Paul Gilbert | 2015-06-29 08:23:50 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-29 08:23:50 -0400 |
| commit | 14a852d1a3b2189db59bbbc9b60b4b0097a82e23 (patch) | |
| tree | dffe8fedf80c7fee0d94863e015b04ce21421f95 | |
| parent | 753a810070b6b96d1a90cff399a41f21c31de885 (diff) | |
| download | scummvm-rg350-14a852d1a3b2189db59bbbc9b60b4b0097a82e23.tar.gz scummvm-rg350-14a852d1a3b2189db59bbbc9b60b4b0097a82e23.tar.bz2 scummvm-rg350-14a852d1a3b2189db59bbbc9b60b4b0097a82e23.zip | |
SHERLOCK: RT: Add in .c_str() calls to fix compilation
| -rw-r--r-- | engines/sherlock/tattoo/widget_inventory.cpp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index 67e227666b..bcf0c463ca 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -81,18 +81,18 @@ void WidgetInventoryTooltip::handleEvents() { if (_vm->getLanguage() == Common::GR_GRE) { if (!_owner->_swapItems) - str = Common::String::format("%s %s %s %s", ui._action, obj._description, - inv[_owner->_invSelect]._name, _owner->_invVerb); + str = Common::String::format("%s %s %s %s", ui._action.c_str(), obj._description.c_str(), + inv[_owner->_invSelect]._name.c_str(), _owner->_invVerb.c_str()); else - str = Common::String::format("%s %s %s %s", ui._action, inv[_owner->_invSelect]._name, - obj._description, _owner->_invVerb); + str = Common::String::format("%s %s %s %s", ui._action.c_str(), inv[_owner->_invSelect]._name.c_str(), + obj._description.c_str(), _owner->_invVerb.c_str()); } else { if (_owner->_swapItems) - str = Common::String::format("%s %s %s %s", _owner->_invVerb, obj._description, ui._action, - inv[_owner->_invSelect]._name); + str = Common::String::format("%s %s %s %s", _owner->_invVerb.c_str(), obj._description.c_str(), ui._action.c_str(), + inv[_owner->_invSelect]._name.c_str()); else - str = Common::String::format("%s %s %s %s", _owner->_invVerb, inv[_owner->_invSelect]._name, - ui._action, obj._description); + str = Common::String::format("%s %s %s %s", _owner->_invVerb.c_str(), inv[_owner->_invSelect]._name.c_str(), + ui._action.c_str(), obj._description.c_str()); } } } else { @@ -101,15 +101,19 @@ void WidgetInventoryTooltip::handleEvents() { if (!person._description.empty() && !person._description.hasPrefix(" ")) { if (_vm->getLanguage() == Common::GR_GRE) { if (!_owner->_swapItems) - str = Common::String::format("%s %s %s %s", ui._action, person._description, inv[_owner->_invSelect]._name, _owner->_invVerb); + str = Common::String::format("%s %s %s %s", ui._action.c_str(), person._description.c_str(), + inv[_owner->_invSelect]._name.c_str(), _owner->_invVerb.c_str()); else - str = Common::String::format("%s %s %s %s", ui._action, inv[_owner->_invSelect]._name, person._description, _owner->_invVerb); + str = Common::String::format("%s %s %s %s", ui._action.c_str(), inv[_owner->_invSelect]._name.c_str(), + person._description.c_str(), _owner->_invVerb.c_str()); } else { if (_owner->_swapItems) - str = Common::String::format("%s %s %s %s", _owner->_invVerb, person._description, ui._action, inv[_owner->_invSelect]._name); + str = Common::String::format("%s %s %s %s", _owner->_invVerb.c_str(), person._description.c_str(), + ui._action.c_str(), inv[_owner->_invSelect]._name.c_str()); else - str = Common::String::format("%s %s %s %s", _owner->_invVerb, inv[_owner->_invSelect]._name, ui._action, person._description); + str = Common::String::format("%s %s %s %s", _owner->_invVerb.c_str(), + inv[_owner->_invSelect]._name.c_str(), ui._action.c_str(), person._description.c_str()); } } } @@ -149,7 +153,7 @@ void WidgetInventoryTooltip::handleEvents() { str = Common::String::format("%s %s %s %s", strUse.c_str(), inv[_owner->_invSelect]._name.c_str(), strWith.c_str(), inv[select]._name.c_str()); else - str = inv[select]._description; + str = inv[select]._description.c_str(); } } } |