diff options
author | Strangerke | 2013-10-02 07:48:45 +0200 |
---|---|---|
committer | Strangerke | 2013-10-02 07:49:32 +0200 |
commit | 8652224e58ba462763e80efe7f93d484380dd64e (patch) | |
tree | 392c9101c6ef2d7eebd7188070690e3f87ecee42 /engines/avalanche/dialogs.cpp | |
parent | 4b93e2543548e994a2b8c25c6f1513d20b0beccf (diff) | |
download | scummvm-rg350-8652224e58ba462763e80efe7f93d484380dd64e.tar.gz scummvm-rg350-8652224e58ba462763e80efe7f93d484380dd64e.tar.bz2 scummvm-rg350-8652224e58ba462763e80efe7f93d484380dd64e.zip |
AVALANCHE: Move ControlCharacter enum to enums
Diffstat (limited to 'engines/avalanche/dialogs.cpp')
-rw-r--r-- | engines/avalanche/dialogs.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp index 926f6624b5..f3b2688600 100644 --- a/engines/avalanche/dialogs.cpp +++ b/engines/avalanche/dialogs.cpp @@ -836,7 +836,7 @@ void Dialogs::displayScrollChain(char block, byte point, bool report, bool bubbl if (error) { if (report) { - Common::String todisplay = Common::String::format("%cError accessing scroll %c%d", Dialogs::kControlBell, block, point); + Common::String todisplay = Common::String::format("%cError accessing scroll %c%d", kControlBell, block, point); displayText(todisplay); } return; @@ -928,7 +928,8 @@ void Dialogs::talkTo(byte whom) { case 1: // Fallthrough is intended. case 2: { Common::String objStr = _vm->getItem(AvalancheEngine::kSpludwicksOrder[_vm->_givenToSpludwick]); - Common::String tmpStr = Common::String::format("Can you get me %s, please?%c2%c", objStr.c_str(), Dialogs::kControlRegister, Dialogs::kControlSpeechBubble); + Common::String tmpStr = Common::String::format("Can you get me %s, please?%c2%c", + objStr.c_str(), kControlRegister, kControlSpeechBubble); displayText(tmpStr); } return; @@ -1002,7 +1003,7 @@ void Dialogs::talkTo(byte whom) { bool noMatches = true; for (int i = 0; i <= _vm->_animation->kSpriteNumbMax; i++) { if (_vm->_animation->_sprites[i]._stat._acciNum == whom) { - Common::String tmpStr = Common::String::format("%c%c%c", Dialogs::kControlRegister, i + 49, Dialogs::kControlToBuffer); + Common::String tmpStr = Common::String::format("%c%c%c", kControlRegister, i + 49, kControlToBuffer); displayText(tmpStr); noMatches = false; break; @@ -1010,7 +1011,7 @@ void Dialogs::talkTo(byte whom) { } if (noMatches) { - Common::String tmpStr = Common::String::format("%c%c%c", Dialogs::kControlRegister, Dialogs::kControlRegister, Dialogs::kControlToBuffer); + Common::String tmpStr = Common::String::format("%c%c%c", kControlRegister, kControlRegister, kControlToBuffer); displayText(tmpStr); } |