aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
diff options
context:
space:
mode:
Diffstat (limited to 'engines/agos')
-rw-r--r--engines/agos/charset-fontdata.cpp2
-rw-r--r--engines/agos/charset.cpp14
-rw-r--r--engines/agos/detection_tables.h4
-rw-r--r--engines/agos/res_snd.cpp2
-rw-r--r--engines/agos/saveload.cpp16
-rw-r--r--engines/agos/script_s1.cpp4
-rw-r--r--engines/agos/script_s2.cpp2
-rw-r--r--engines/agos/verb.cpp6
-rw-r--r--engines/agos/vga_s2.cpp2
9 files changed, 26 insertions, 26 deletions
diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp
index dbd61a3b46..a477b3dedc 100644
--- a/engines/agos/charset-fontdata.cpp
+++ b/engines/agos/charset-fontdata.cpp
@@ -2370,7 +2370,7 @@ void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) {
case Common::PL_POL:
src = polish_simonFont + (chr - 32) * 8;
break;
- case Common::HB_ISR:
+ case Common::HE_ISR:
src = hebrew_simonFont + (chr - 32) * 8;
break;
case Common::ES_ESP:
diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp
index 7d93f26f7b..5e9279c491 100644
--- a/engines/agos/charset.cpp
+++ b/engines/agos/charset.cpp
@@ -319,7 +319,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei
if (count != 0)
memset(dst, 0, count);
- if (_language == Common::HB_ISR)
+ if (_language == Common::HE_ISR)
dst += width - 1; // For Hebrew, start at the right edge, not the left.
dst_org = dst;
@@ -328,7 +328,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei
dst_org += width * textHeight;
dst = dst_org;
} else if ((chr -= ' ') == 0) {
- dst += (_language == Common::HB_ISR ? -6 : 6); // Hebrew moves to the left, all others to the right
+ dst += (_language == Common::HE_ISR ? -6 : 6); // Hebrew moves to the left, all others to the right
} else {
byte *img_hdr, *img;
uint i, img_width, img_height;
@@ -345,7 +345,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei
img = src + READ_LE_UINT16(img_hdr);
}
- if (_language == Common::HB_ISR)
+ if (_language == Common::HE_ISR)
dst -= img_width - 1; // For Hebrew, move from right edge to left edge of image.
byte *cur_dst = dst;
@@ -371,7 +371,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei
cur_dst += width;
} while (--img_height);
- if (_language != Common::HB_ISR) // Hebrew character movement is done higher up
+ if (_language != Common::HE_ISR) // Hebrew character movement is done higher up
dst += img_width - 1;
}
}
@@ -499,8 +499,8 @@ void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) {
clearWindow(window);
} else if (c == 13 || c == 10) {
windowNewLine(window);
- } else if ((c == 1 && _language != Common::HB_ISR) || (c == 8)) {
- if (_language == Common::HB_ISR) {
+ } else if ((c == 1 && _language != Common::HE_ISR) || (c == 8)) {
+ if (_language == Common::HE_ISR) {
if (b >= 64 && b < 91)
width = _hebrewCharWidths [b - 64];
@@ -546,7 +546,7 @@ void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) {
window->textRow--;
}
- if (_language == Common::HB_ISR) {
+ if (_language == Common::HE_ISR) {
if (c >= 64 && c < 91)
width = _hebrewCharWidths [c - 64];
window->textColumnOffset -= width;
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index dc506346eb..e3709f8409 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -1672,7 +1672,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", 711},
{ NULL, 0, NULL, 0}
},
- Common::HB_ISR,
+ Common::HE_ISR,
Common::kPlatformPC,
ADGF_NO_FLAGS,
GUIO_NONE
@@ -2148,7 +2148,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9", 513},
{ NULL, 0, NULL, 0}
},
- Common::HB_ISR,
+ Common::HE_ISR,
Common::kPlatformPC,
ADGF_NO_FLAGS,
GUIO_NONE
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 06dfab1ecd..6e54d926c4 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -78,7 +78,7 @@ void AGOSEngine_Simon2::playSpeech(uint16 speech_id, uint16 vgaSpriteId) {
}
_skipVgaWait = true;
} else {
- if (getGameType() == GType_SIMON2 && _subtitles && _language != Common::HB_ISR) {
+ if (getGameType() == GType_SIMON2 && _subtitles && _language != Common::HE_ISR) {
loadVoice(speech_id);
return;
}
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 191e2fd4a0..e9fbaf3525 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -608,13 +608,13 @@ void AGOSEngine_Simon1::listSaveGames(char *dst) {
lastSlot = slot;
if (slot < 10) {
showMessageFormat(" ");
- } else if (_language == Common::HB_ISR) {
+ } else if (_language == Common::HE_ISR) {
lastSlot = (slot % 10) * 10;
lastSlot += slot / 10;
}
showMessageFormat("%d", lastSlot);
- if (_language == Common::HB_ISR && !(slot % 10))
+ if (_language == Common::HE_ISR && !(slot % 10))
showMessageFormat("0");
showMessageFormat(".%s\n", dst);
dst += 18;
@@ -672,7 +672,7 @@ void AGOSEngine_Simon1::userGame(bool load) {
char *name;
bool b;
char buf[108];
- int maxChar = (_language == Common::HB_ISR) ? 155: 128;
+ int maxChar = (_language == Common::HE_ISR) ? 155: 128;
_saveOrLoad = load;
@@ -711,7 +711,7 @@ restart:;
window->textRow = result;
// init x offset with a 2 character savegame number + a period (18 pix)
- if (_language == Common::HB_ISR) {
+ if (_language == Common::HE_ISR) {
window->textColumn = 3;
window->textColumnOffset = 6;
} else {
@@ -725,7 +725,7 @@ restart:;
// now process entire savegame name to get correct x offset for cursor
_saveGameNameLen = 0;
while (name[_saveGameNameLen]) {
- if (_language == Common::HB_ISR) {
+ if (_language == Common::HE_ISR) {
byte width = 6;
if (name[_saveGameNameLen] >= 64 && name[_saveGameNameLen] < 91)
width = _hebrewCharWidths [name[_saveGameNameLen] - 64];
@@ -770,7 +770,7 @@ restart:;
goto restart;
}
- if (_language == Common::HB_ISR) {
+ if (_language == Common::HE_ISR) {
if (i >= 128)
i -= 64;
else if (i >= 32)
@@ -788,7 +788,7 @@ restart:;
_saveGameNameLen--;
m = name[_saveGameNameLen];
- if (_language == Common::HB_ISR)
+ if (_language == Common::HE_ISR)
x = 8;
else
x = (name[_saveGameNameLen] == 'i' || name[_saveGameNameLen] == 'l') ? 1 : 8;
@@ -889,7 +889,7 @@ void AGOSEngine::userGameBackSpace(WindowBlock *window, int x, byte b) {
oldTextColor = window->textColor;
window->textColor = window->fillColor;
- if (_language == Common::HB_ISR) {
+ if (_language == Common::HE_ISR) {
x = 128;
} else {
x += 120;
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index 0db612a8c6..64d1cbba3f 100644
--- a/engines/agos/script_s1.cpp
+++ b/engines/agos/script_s1.cpp
@@ -319,7 +319,7 @@ void AGOSEngine_Simon1::os1_pauseGame() {
case Common::PL_POL:
keyYes = Common::KEYCODE_t;
break;
- case Common::HB_ISR:
+ case Common::HE_ISR:
keyYes = Common::KEYCODE_f;
break;
case Common::ES_ESP:
@@ -426,7 +426,7 @@ void AGOSEngine_Simon1::os1_screenTextPObj() {
int j, k;
if (subObject->objectFlags & kOFNumber) {
- if (_language == Common::HB_ISR) {
+ if (_language == Common::HE_ISR) {
j = subObject->objectFlagValue[getOffsetOfChild2Param(subObject, kOFNumber)];
k = (j % 10) * 10;
k += j / 10;
diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp
index 7d6b5e7a36..dd525163c7 100644
--- a/engines/agos/script_s2.cpp
+++ b/engines/agos/script_s2.cpp
@@ -417,7 +417,7 @@ void AGOSEngine_Simon2::os2_screenTextPObj() {
int j, k;
if (subObject->objectFlags & kOFNumber) {
- if (_language == Common::HB_ISR) {
+ if (_language == Common::HE_ISR) {
j = subObject->objectFlagValue[getOffsetOfChild2Param(subObject, kOFNumber)];
k = (j % 10) * 10;
k += j / 10;
diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp
index bdf23d5815..a85c1627bf 100644
--- a/engines/agos/verb.cpp
+++ b/engines/agos/verb.cpp
@@ -258,7 +258,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) {
case Common::RU_RUS:
verb_prep_names = russian_verb_prep_names;
break;
- case Common::HB_ISR:
+ case Common::HE_ISR:
verb_prep_names = hebrew_verb_prep_names;
break;
case Common::ES_ESP:
@@ -287,7 +287,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) {
case Common::RU_RUS:
verb_names = russian_verb_names;
break;
- case Common::HB_ISR:
+ case Common::HE_ISR:
verb_names = hebrew_verb_names;
break;
case Common::ES_ESP:
@@ -332,7 +332,7 @@ void AGOSEngine::showActionString(const byte *string) {
window->textColumn = x / 8;
window->textColumnOffset = x & 7;
- if (_language == Common::HB_ISR && window->textColumnOffset != 0) {
+ if (_language == Common::HE_ISR && window->textColumnOffset != 0) {
window->textColumnOffset = 8 - window->textColumnOffset;
window->textColumn++;
}
diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp
index e133427d76..4eb739e974 100644
--- a/engines/agos/vga_s2.cpp
+++ b/engines/agos/vga_s2.cpp
@@ -89,7 +89,7 @@ void AGOSEngine::vc59_stopAnimations() {
}
void AGOSEngine::vc64_ifSpeech() {
- if ((getGameType() == GType_SIMON2 && _subtitles && _language != Common::HB_ISR) ||
+ if ((getGameType() == GType_SIMON2 && _subtitles && _language != Common::HE_ISR) ||
!_sound->isVoiceActive()) {
vcSkipNextInstruction();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-09 14:52:28 +0000