diff --git a/engines/sherlock/fixed_text.h b/engines/sherlock/fixed_text.h index 6542301b2a7..40444f40527 100644 --- a/engines/sherlock/fixed_text.h +++ b/engines/sherlock/fixed_text.h @@ -53,7 +53,7 @@ public: /** * Gets text */ - virtual const Common::String getText(int fixedTextId) = 0; + virtual const char *getText(int fixedTextId) = 0; /** * Get action message diff --git a/engines/sherlock/scalpel/scalpel_fixed_text.cpp b/engines/sherlock/scalpel/scalpel_fixed_text.cpp index c81896c913f..465940ce459 100644 --- a/engines/sherlock/scalpel/scalpel_fixed_text.cpp +++ b/engines/sherlock/scalpel/scalpel_fixed_text.cpp @@ -359,8 +359,8 @@ ScalpelFixedText::ScalpelFixedText(SherlockEngine *vm) : FixedText(vm) { _curLanguageEntry = curLanguageEntry; } -const Common::String ScalpelFixedText::getText(int fixedTextId) { - return Common::String(_curLanguageEntry->fixedTextArray[fixedTextId]); +const char *ScalpelFixedText::getText(int fixedTextId) { + return _curLanguageEntry->fixedTextArray[fixedTextId]; } const Common::String ScalpelFixedText::getActionMessage(FixedTextActionId actionId, int messageIndex) { diff --git a/engines/sherlock/scalpel/scalpel_fixed_text.h b/engines/sherlock/scalpel/scalpel_fixed_text.h index 499fe81cd56..eae86b8f274 100644 --- a/engines/sherlock/scalpel/scalpel_fixed_text.h +++ b/engines/sherlock/scalpel/scalpel_fixed_text.h @@ -93,7 +93,7 @@ public: /** * Gets text */ - virtual const Common::String getText(int fixedTextId); + virtual const char *getText(int fixedTextId); /** * Get action message diff --git a/engines/sherlock/tattoo/tattoo_fixed_text.cpp b/engines/sherlock/tattoo/tattoo_fixed_text.cpp index 1a40c704ee7..2be41c8e4ab 100644 --- a/engines/sherlock/tattoo/tattoo_fixed_text.cpp +++ b/engines/sherlock/tattoo/tattoo_fixed_text.cpp @@ -62,8 +62,8 @@ static const char *const FIXED_TEXT_ENGLISH[] = { TattooFixedText::TattooFixedText(SherlockEngine *vm) : FixedText(vm) { } -const Common::String TattooFixedText::getText(int fixedTextId) { - return Common::String(FIXED_TEXT_ENGLISH[fixedTextId]); +const char *TattooFixedText::getText(int fixedTextId) { + return FIXED_TEXT_ENGLISH[fixedTextId]; } const Common::String TattooFixedText::getActionMessage(FixedTextActionId actionId, int messageIndex) { diff --git a/engines/sherlock/tattoo/tattoo_fixed_text.h b/engines/sherlock/tattoo/tattoo_fixed_text.h index 06f6d765d96..a73f1a5326a 100644 --- a/engines/sherlock/tattoo/tattoo_fixed_text.h +++ b/engines/sherlock/tattoo/tattoo_fixed_text.h @@ -68,7 +68,7 @@ public: /** * Gets text */ - virtual const Common::String getText(int fixedTextId); + virtual const char *getText(int fixedTextId); /** * Get action message diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index 3d43dbe90fb..3274552f5e3 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -497,7 +497,7 @@ void WidgetInventory::handleEvents() { } if (!found) - ui.putMessage("%s", FIXED(NoEffect).c_str()); + ui.putMessage("%s", FIXED(NoEffect)); } } else if ((_outsideMenu && !_bounds.contains(mousePos)) || ui._keyState.keycode == Common::KEYCODE_ESCAPE) { // Want to close the window (clicked outside of it). So close the window and return to Standard @@ -540,7 +540,7 @@ void WidgetInventory::handleEvents() { } } if (!found) - ui.putMessage("%s",FIXED(NoEffect).c_str()); + ui.putMessage("%s", FIXED(NoEffect)); } else { // See if they right clicked on an item diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp index 2e2e3cf0757..6a3fd4575d1 100644 --- a/engines/sherlock/tattoo/widget_talk.cpp +++ b/engines/sherlock/tattoo/widget_talk.cpp @@ -406,7 +406,7 @@ void WidgetTalk::handleEvents() { if (select == -1) { talk.freeTalkVars(); - ui.putMessage("%s", FIXED(NothingToSay).c_str()); + ui.putMessage("%s", FIXED(NothingToSay)); return; }