aboutsummaryrefslogtreecommitdiff
path: root/engines/adl/hires1.cpp
diff options
context:
space:
mode:
authorWalter van Niftrik2018-08-02 10:56:49 +0200
committerWalter van Niftrik2019-07-16 16:24:19 +0200
commitce8a8409332ff28a80de918a5771baa20d6980d1 (patch)
tree99ce86ba7c7d343b8951490c41644e9383f342fe /engines/adl/hires1.cpp
parent0cd761086a72e9fd83c23f1c6267fe79829f3f07 (diff)
downloadscummvm-rg350-ce8a8409332ff28a80de918a5771baa20d6980d1.tar.gz
scummvm-rg350-ce8a8409332ff28a80de918a5771baa20d6980d1.tar.bz2
scummvm-rg350-ce8a8409332ff28a80de918a5771baa20d6980d1.zip
ADL: Remove APPLECHAR macro
Diffstat (limited to 'engines/adl/hires1.cpp')
-rw-r--r--engines/adl/hires1.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index c045ce94ad..169a0ea7d9 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -214,10 +214,10 @@ void HiRes1Engine::runIntro() {
if (s.empty())
continue;
- if (s[0] == APPLECHAR('I')) {
+ if (s[0] == _display->asciiToNative('I')) {
instructions = true;
break;
- } else if (s[0] == APPLECHAR('G')) {
+ } else if (s[0] == _display->asciiToNative('G')) {
break;
}
}
@@ -397,8 +397,9 @@ void HiRes1Engine::printString(const Common::String &str) {
}
Common::String HiRes1Engine::loadMessage(uint idx) const {
+ const char returnChar = _display->asciiToNative('\r');
StreamPtr stream(_messages[idx]->createReadStream());
- return readString(*stream, APPLECHAR('\r')) + APPLECHAR('\r');
+ return readString(*stream, returnChar) + returnChar;
}
void HiRes1Engine::printMessage(uint idx) {
@@ -487,14 +488,17 @@ void HiRes1Engine::showRoom() {
void HiRes1Engine::wordWrap(Common::String &str) const {
uint end = 39;
+ const char spaceChar = _display->asciiToNative(' ');
+ const char returnChar = _display->asciiToNative('\r');
+
while (1) {
if (str.size() <= end)
return;
- while (str[end] != APPLECHAR(' '))
+ while (str[end] != spaceChar)
--end;
- str.setChar(APPLECHAR('\r'), end);
+ str.setChar(returnChar, end);
end += 40;
}
}