aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/hopkins/graphics.cpp46
-rw-r--r--engines/hopkins/hopkins.cpp10
-rw-r--r--engines/hopkins/objects.cpp56
-rw-r--r--engines/hopkins/script.cpp10
-rw-r--r--engines/hopkins/talk.cpp44
5 files changed, 84 insertions, 82 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index a6992c0b23..793d2fe96c 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -172,7 +172,7 @@ void GraphicsManager::loadVgaImage(const Common::String &file) {
unlockScreen();
_vm->_fileManager.constructFilename(_vm->_globals.HOPIMAGE, file);
A_PCX320(_vesaScreen, _vm->_globals.NFICHIER, Palette);
- memcpy(_vesaBuffer, _vesaScreen, 0xFA00u);
+ memcpy(_vesaBuffer, _vesaScreen, 64000);
SCANLINE(320);
max_x = 320;
@@ -358,15 +358,15 @@ void GraphicsManager::A_PCX320(byte *surface, const Common::String &file, byte *
filesize = f.size();
- f.read(surface, 0x80u);
+ f.read(surface, 128);
v4 = filesize - 896;
- ptr = _vm->_globals.allocMemory(0xFE00u);
- if (v4 >= 0xFA00) {
- v15 = v4 / 0xFA00 + 1;
- v17 = 64000 * (v4 / 0xFA00) - v4;
- if (((uint32)v17 & 0x80000000u) != 0)
+ ptr = _vm->_globals.allocMemory(65024);
+ if (v4 >= 64000) {
+ v15 = v4 / 64000 + 1;
+ v17 = 64000 * (v4 / 64000) - v4;
+ if (v17 < 0)
v17 = -v17;
- f.read(ptr, 0xFA00u);
+ f.read(ptr, 64000);
v5 = 64000;
} else {
v15 = 1;
@@ -388,7 +388,7 @@ void GraphicsManager::A_PCX320(byte *surface, const Common::String &file, byte *
// i = v8;
}
v9 = *(ptr + v7++);
- if (v9 > 0xC0u) {
+ if (v9 > 192) {
v10 = v9 - 192;
if (v7 == v5) {
v7 = 0;
@@ -835,7 +835,7 @@ void GraphicsManager::Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface)
srcP = srcData;
for (;;) {
srcByte = *srcP;
- if (*srcP < 0xDEu)
+ if (*srcP < 222)
goto Video_Cont3_wVbe;
if (srcByte == kByteStop)
return;
@@ -857,7 +857,7 @@ void GraphicsManager::Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface)
srcP += 5;
}
Video_Cont3_wVbe:
- if (srcByte > 0xD2u) {
+ if (srcByte > 210) {
if (srcByte == (byte)-45) {
destLen1 = *(srcP + 1);
rleValue = *(srcP + 2);
@@ -1571,7 +1571,7 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp
++spritePixelsP;
if (!Agr_Flag_x)
Agr_x = zoom2 + Agr_x;
- if ((uint16)Agr_x < 0x64u)
+ if ((uint16)Agr_x < 100)
break;
Agr_x = Agr_x - 100;
--spritePixelsP;
@@ -1588,7 +1588,7 @@ R_Aff_Zoom_Larg_Cont1:
++Compteur_y;
if (!Agr_Flag_y)
Agr_y = zoom2 + Agr_y;
- if ((uint16)Agr_y < 0x64u)
+ if ((uint16)Agr_y < 100)
break;
Agr_y = Agr_y - 100;
spritePixelsP = v46;
@@ -1652,7 +1652,7 @@ R_Aff_Zoom_Larg_Cont1:
++spritePixelsP;
if (!Agr_Flag_x)
Agr_x = zoom2 + Agr_x;
- if ((uint16)Agr_x < 0x64u)
+ if ((uint16)Agr_x < 100)
break;
Agr_x = Agr_x - 100;
--spritePixelsP;
@@ -1669,7 +1669,7 @@ Aff_Zoom_Larg_Cont1:
dest1P = _lineNbr2 + v51;
if (!Agr_Flag_y)
Agr_y = zoom2 + Agr_y;
- if ((uint16)Agr_y < 0x64u)
+ if ((uint16)Agr_y < 100)
break;
Agr_y = Agr_y - 100;
spritePixelsP = v45;
@@ -1696,12 +1696,12 @@ Aff_Zoom_Larg_Cont1:
int v65 = spriteHeight2;
byte *v55 = v40;
Red_y = Red + Red_y;
- if ((uint16)Red_y < 0x64u) {
+ if ((uint16)Red_y < 100) {
Red_x = 0;
int v42 = v37;
for (int v41 = _width; v41; v41--) {
Red_x = Red + Red_x;
- if ((uint16)Red_x < 0x64u) {
+ if ((uint16)Red_x < 100) {
if (v42 >= clip_x && v42 < clip_x1 && *spritePixelsP)
*v40 = *spritePixelsP;
--v40;
@@ -1725,12 +1725,12 @@ Aff_Zoom_Larg_Cont1:
int v64 = spriteHeight2;
byte *v54 = dest1P;
Red_y = Red + Red_y;
- if ((uint16)Red_y < 0x64u) {
+ if ((uint16)Red_y < 100) {
Red_x = 0;
int v39 = 0;
for (int v38 = _width; v38; v38--) {
Red_x = Red + Red_x;
- if ((uint16)Red_x < 0x64u) {
+ if ((uint16)Red_x < 100) {
if (v39 >= clip_x && v39 < clip_x1 && *spritePixelsP)
*dest1P = *spritePixelsP;
++dest1P;
@@ -2038,17 +2038,19 @@ void GraphicsManager::NB_SCREEN() {
if (!_vm->_globals.NECESSAIRE)
INIT_TABLE(50, 65, Palette);
+
if (_lineNbr == SCREEN_WIDTH)
- Trans_bloc2(_vesaBuffer, TABLE_COUL, 307200);
+ Trans_bloc2(_vesaBuffer, TABLE_COUL, SCREEN_WIDTH * SCREEN_HEIGHT);
else if (_lineNbr == (SCREEN_WIDTH * 2))
- Trans_bloc2(_vesaBuffer, TABLE_COUL, 614400);
+ Trans_bloc2(_vesaBuffer, TABLE_COUL, SCREEN_WIDTH * SCREEN_HEIGHT * 2);
+
lockScreen();
m_scroll16(_vesaBuffer, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
unlockScreen();
destP = _vesaScreen;
srcP = _vesaBuffer;
- memcpy(_vesaScreen, _vesaBuffer, 0x95FFCu);
+ memcpy(_vesaScreen, _vesaBuffer, 614396);
srcP = srcP + 614396;
destP = destP + 614396;
*destP = *srcP;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 68f0aa60a1..56b98ab950 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -747,8 +747,8 @@ bool HopkinsEngine::runLinuxDemo() {
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
_graphicsManager.DD_VBL();
- memset(_graphicsManager._vesaBuffer, 0, 0x4B000u);
- memset(_graphicsManager._vesaScreen, 0, 0x4B000u);
+ memset(_graphicsManager._vesaBuffer, 0, 307200);
+ memset(_graphicsManager._vesaScreen, 0, 307200);
_graphicsManager.Cls_Pal();
_graphicsManager.RESET_SEGMENT_VESA();
break;
@@ -848,7 +848,7 @@ bool HopkinsEngine::runBeOSFull() {
_globals.PERSO = _fileManager.loadFile(_globals.NFICHIER);
_globals.PERSO_TYPE = 0;
_globals.PLANX = _globals.PLANY = 0;
- memset(_globals.SAUVEGARDE, 0, 0x7CCu);
+ memset(_globals.SAUVEGARDE, 0, 1996);
_globals.SORTIE = 0;
for (;;) {
@@ -3340,8 +3340,8 @@ bool HopkinsEngine::runLinuxFull() {
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
_graphicsManager.DD_VBL();
- memset(_graphicsManager._vesaBuffer, 0, 0x4B000u);
- memset(_graphicsManager._vesaScreen, 0, 0x4B000u);
+ memset(_graphicsManager._vesaBuffer, 0, 307200);
+ memset(_graphicsManager._vesaScreen, 0, 307200);
_graphicsManager.Cls_Pal();
_graphicsManager.RESET_SEGMENT_VESA();
break;
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 42818b4e4a..bc79393f1d 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -1555,7 +1555,7 @@ void ObjectsManager::VERIFZONE() {
if (_vm->_globals.PLAN_FLAG
|| _vm->_eventsManager._startPos.x >= v0
|| (v1 = _vm->_graphicsManager.ofscroll + 54, v0 >= v1)
- || (v1 = v2 - 1, (uint16)(v2 - 1) > 0x3Bu)) {
+ || (v1 = v2 - 1, (uint16)(v2 - 1) > 59)) {
if (_visibleFl == true)
FLAG_VISIBLE_EFFACE = 4;
_visibleFl = false;
@@ -1776,7 +1776,7 @@ LABEL_241:
return;
}
if (_vm->_globals.g_old_sens == 3) {
- if ((uint16)(_vm->_globals.g_old_anim - 24) > 0xBu) {
+ if ((uint16)(_vm->_globals.g_old_anim - 24) > 11) {
v0 = g_old_x;
v58 = g_old_y;
} else {
@@ -1815,7 +1815,7 @@ LABEL_23:
}
if (_vm->_globals.g_old_sens != 7)
goto LABEL_43;
- if ((uint16)(_vm->_globals.g_old_anim - 24) > 0xBu) {
+ if ((uint16)(_vm->_globals.g_old_anim - 24) > 11) {
v0 = g_old_x;
v58 = g_old_y;
} else {
@@ -1885,7 +1885,7 @@ LABEL_59:
LABEL_60:
if (_vm->_globals.g_old_sens != 5)
goto LABEL_77;
- if ((uint16)(_vm->_globals.g_old_anim - 48) > 0xBu) {
+ if ((uint16)(_vm->_globals.g_old_anim - 48) > 11) {
v0 = g_old_x;
v58 = g_old_y;
} else {
@@ -1917,7 +1917,7 @@ LABEL_76:
LABEL_77:
if (_vm->_globals.g_old_sens != 2)
goto LABEL_96;
- if ((uint16)(_vm->_globals.g_old_anim - 12) > 0xBu) {
+ if ((uint16)(_vm->_globals.g_old_anim - 12) > 11) {
v0 = g_old_x;
v58 = g_old_y;
} else {
@@ -1955,7 +1955,7 @@ LABEL_95:
LABEL_96:
if (_vm->_globals.g_old_sens != 8)
goto LABEL_115;
- if ((uint16)(_vm->_globals.g_old_anim - 12) > 0xBu) {
+ if ((uint16)(_vm->_globals.g_old_anim - 12) > 11) {
v0 = g_old_x;
v58 = g_old_y;
} else {
@@ -1993,7 +1993,7 @@ LABEL_114:
LABEL_115:
if (_vm->_globals.g_old_sens != 4)
goto LABEL_134;
- if ((uint16)(_vm->_globals.g_old_anim - 36) > 0xBu) {
+ if ((uint16)(_vm->_globals.g_old_anim - 36) > 11) {
v0 = g_old_x;
v58 = g_old_y;
} else {
@@ -2031,7 +2031,7 @@ LABEL_133:
LABEL_134:
if (_vm->_globals.g_old_sens != 6)
goto LABEL_153;
- if ((uint16)(_vm->_globals.g_old_anim - 36) > 0xBu) {
+ if ((uint16)(_vm->_globals.g_old_anim - 36) > 11) {
v0 = g_old_x;
v58 = g_old_y;
} else {
@@ -2581,7 +2581,7 @@ void ObjectsManager::handleLeftButton() {
destX = _vm->_eventsManager.getMouseX();
destY = _vm->_eventsManager.getMouseY();
- if (!_vm->_dialogsManager._inventFl && !_vm->_globals.PLAN_FLAG && destX > _vm->_graphicsManager.ofscroll - 30 && destX < _vm->_graphicsManager.ofscroll + 50 && (uint16)(destY + 29) <= 0x4Eu) {
+ if (!_vm->_dialogsManager._inventFl && !_vm->_globals.PLAN_FLAG && destX > _vm->_graphicsManager.ofscroll - 30 && destX < _vm->_graphicsManager.ofscroll + 50 && (uint16)(destY + 29) <= 78) {
v1 = _vm->_eventsManager._mouseCursorId;
_vm->_dialogsManager._inventFl = true;
_vm->_dialogsManager.showInventory();
@@ -2595,30 +2595,30 @@ void ObjectsManager::handleLeftButton() {
}
if (_vm->_globals.SAUVEGARDE->data[svField354] == 1
&& !_vm->_globals.PLAN_FLAG
- && (uint16)(destX - 533) <= 0x1Au
- && (uint16)(destY - 26) <= 0x21u) {
+ && (uint16)(destX - 533) <= 26
+ && (uint16)(destY - 26) <= 33) {
changeCharacterHead(CHARACTER_HOPKINS_CLONE, CHARACTER_HOPKINS);
return;
}
if (_vm->_globals.SAUVEGARDE->data[svField356] == 1
&& !_vm->_globals.PLAN_FLAG
- && (uint16)(destX - 533) <= 0x1Au
- && (uint16)(destY - 26) <= 0x21u) {
+ && (uint16)(destX - 533) <= 26
+ && (uint16)(destY - 26) <= 22) {
changeCharacterHead(CHARACTER_SAMANTHA, CHARACTER_HOPKINS);
return;
}
if (_vm->_globals.SAUVEGARDE->data[svField357] == 1) {
if (_vm->_globals.SAUVEGARDE->data[svField353] == 1
&& !_vm->_globals.PLAN_FLAG
- && (uint16)(destX - 533) <= 0x1Au
- && (uint16)(destY - 26) <= 0x21u) {
+ && (uint16)(destX - 533) <= 26
+ && (uint16)(destY - 26) <= 33) {
changeCharacterHead(CHARACTER_HOPKINS, CHARACTER_HOPKINS_CLONE);
return;
}
if (_vm->_globals.SAUVEGARDE->data[svField355] == 1
&& !_vm->_globals.PLAN_FLAG
- && (uint16)(destX - 567) <= 0x1Au
- && (uint16)(destY - 26) <= 0x21u) {
+ && (uint16)(destX - 567) <= 26
+ && (uint16)(destY - 26) <= 33) {
changeCharacterHead(CHARACTER_HOPKINS, CHARACTER_SAMANTHA);
return;
}
@@ -3836,9 +3836,9 @@ void ObjectsManager::initBorder(int a1) {
_borderPos.x = _vm->_graphicsManager.ofscroll + 374;
if (a1 == 6 || a1 == 12 || a1 == 18 || a1 == 24 || (uint16)(a1 - 30) <= 1u)
_borderPos.x = _vm->_graphicsManager.ofscroll + 428;
- if ((uint16)(a1 - 1) <= 0x1Cu)
+ if ((uint16)(a1 - 1) <= 28)
_borderSpriteIndex = 0;
- if ((uint16)(a1 - 30) <= 1u)
+ if ((uint16)(a1 - 30) <= 1)
_borderSpriteIndex = 2;
if (a1 == 30)
_borderPos.y = 272;
@@ -3856,11 +3856,11 @@ void ObjectsManager::initBorder(int a1) {
_vm->_eventsManager._mouseCursorId = 2;
if (a1 == 31)
_vm->_eventsManager._mouseCursorId = 3;
- if ((uint16)(a1 - 1) <= 0x1Cu)
+ if ((uint16)(a1 - 1) <= 28)
_vm->_eventsManager._mouseCursorId = 8;
if (a1 == 29)
_vm->_eventsManager._mouseCursorId = 1;
- if ((uint16)(a1 - 1) <= 0x1Bu && !_vm->_globals._inventory[a1]) {
+ if ((uint16)(a1 - 1) <= 27 && !_vm->_globals._inventory[a1]) {
_vm->_eventsManager._mouseCursorId = 0;
_borderPos = Common::Point(0, 0);
_borderSpriteIndex = 0;
@@ -4042,10 +4042,10 @@ void ObjectsManager::SPECIAL_JEU() {
_vm->_talkManager.PARLER_PERSO("flicspe1.pe2");
_vm->_globals.NOPARLE = false;
if (!_vm->_globals.CENSURE) {
- v1 = _vm->_globals.allocMemory(0x3E8u);
- memcpy(v1, _vm->_graphicsManager.Palette, 0x301u);
+ v1 = _vm->_globals.allocMemory(1000);
+ memcpy(v1, _vm->_graphicsManager.Palette, 769);
- _vm->_saveLoadManager.saveFile("TEMP1.SCR", _vm->_graphicsManager._vesaScreen, 0x4B000u);
+ _vm->_saveLoadManager.saveFile("TEMP1.SCR", _vm->_graphicsManager._vesaScreen, 307200);
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager.ofscroll = 0;
@@ -4065,7 +4065,7 @@ void ObjectsManager::SPECIAL_JEU() {
g_system->getSavefileManager()->removeSavefile("TEMP1.SCR");
PERSO_ON = false;
- memcpy(_vm->_graphicsManager.Palette, v1, 0x301u);
+ memcpy(_vm->_graphicsManager.Palette, v1, 769);
_vm->_graphicsManager.SHOW_PALETTE();
_vm->_globals.freeMemory(v1);
_vm->_graphicsManager.lockScreen();
@@ -4073,7 +4073,7 @@ void ObjectsManager::SPECIAL_JEU() {
_vm->_graphicsManager.unlockScreen();
v2 = _vm->_graphicsManager._vesaBuffer;
v3 = _vm->_graphicsManager._vesaScreen;
- memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 0x95FFCu);
+ memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 614396);
v3 = v3 + 614396;
v2 = v2 + 614396;
*v2 = *v3;
@@ -4910,9 +4910,9 @@ int ObjectsManager::CALC_PROPRE(int idx) {
v2 = 20 * (5 * v4 - 165) / -67;
}
if (v2 < 0)
- return _vm->_graphicsManager.zoomOut(0x19u, -v2);
+ return _vm->_graphicsManager.zoomOut(25, -v2);
if (v2 > 0)
- return _vm->_graphicsManager.zoomIn(0x19u, v2);
+ return _vm->_graphicsManager.zoomIn(25, v2);
return v1;
}
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 1ec48259e8..e3fc59a990 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -587,7 +587,7 @@ LABEL_1141:
else if (_vm->_globals.SVGA == 2)
_vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager.SPECIAL_SOUND = 0;
- memset(_vm->_graphicsManager._vesaBuffer, 0, 0x96000u);
+ memset(_vm->_graphicsManager._vesaBuffer, 0, 614400);
_vm->_graphicsManager.NOFADE = true;
_vm->_globals.SORTIE = 151;
}
@@ -603,7 +603,7 @@ LABEL_1141:
_vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager.SPECIAL_SOUND = 0;
_vm->_graphicsManager.NOFADE = true;
- memset(_vm->_graphicsManager._vesaBuffer, 0, 0x96000u);
+ memset(_vm->_graphicsManager._vesaBuffer, 0, 614400);
_vm->_globals.SORTIE = 151;
}
if (v76 == 605) {
@@ -620,7 +620,7 @@ LABEL_1141:
_vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager.SPECIAL_SOUND = 0;
_vm->_graphicsManager.NOFADE = true;
- memset(_vm->_graphicsManager._vesaBuffer, 0, 0x96000u);
+ memset(_vm->_graphicsManager._vesaBuffer, 0, 614400);
_vm->_globals.SORTIE = 151;
}
if (v76 == 606) {
@@ -633,13 +633,13 @@ LABEL_1141:
_vm->_animationManager.playAnim("BOMBE3.ANM", 50, 14, 500);
else if (_vm->_globals.SVGA == 2)
_vm->_animationManager.playAnim("BOMBE3A.ANM", 50, 14, 500);
- memset(_vm->_graphicsManager._vesaBuffer, 0, 0x96000u);
+ memset(_vm->_graphicsManager._vesaBuffer, 0, 614400);
}
_vm->_globals.SORTIE = 6;
}
if (v76 == 607) {
if (!_vm->_globals._internetFl) {
- memcpy(_vm->_graphicsManager.OLD_PAL, _vm->_graphicsManager.Palette, 0x301u);
+ memcpy(_vm->_graphicsManager.OLD_PAL, _vm->_graphicsManager.Palette, 769);
v1 = _vm->_graphicsManager.OLD_PAL[769];
_vm->_animationManager.playAnim2("PLAN.ANM", 50, 10, 800);
}
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 8394865e76..fb1d4c3c97 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -100,9 +100,9 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_fileManager.constructLinuxFilename("TEMP.SCR");
if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH)
- _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 0x4B000u);
+ _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 307200);
else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2))
- _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 0x96000u);
+ _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 614400);
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager.ofscroll = 0;
@@ -162,11 +162,11 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_graphicsManager.unlockScreen();
v8 = _vm->_graphicsManager._vesaBuffer;
v9 = _vm->_graphicsManager._vesaScreen;
- memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 0x95FFCu);
+ memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 614396);
v9 = v9 + 614396;
v8 = v8 + 614396;
*v8 = *v9;
- v8 = v8 + 2;
+ v8 += 2;
*v8 = *(v9 + 2);
v10 = v8 + 1;
_vm->_globals._disableInventFl = oldDisableInventFl;
@@ -543,23 +543,23 @@ void TalkManager::CHERCHE_PAL(int a1, int a2) {
*(palette + 762) = 0;
*(palette + 763) = 0;
*(palette + 764) = 0;
- *(palette + 765) = 0xe0;
- *(palette + 766) = 0xe0;
- *(palette + 767) = 0xff;
- *(palette + 759) = 0xff;
- *(palette + 760) = 0xff;
+ *(palette + 765) = 224;
+ *(palette + 766) = 224;
+ *(palette + 767) = 255;
+ *(palette + 759) = 255;
+ *(palette + 760) = 255;
*(palette + 761) = 86;
*palette = 0;
*(palette + 1) = 0;
*(palette + 2) = 0;
}
if (a2 == 1) {
- *(palette + 765) = 0xe0;
- *(palette + 766) = 0xe0;
- *(palette + 767) = 0xff;
- *(palette + 759) = 0xff;
- *(palette + 760) = 0xff;
- *(palette + 761) = 0xff;
+ *(palette + 765) = 224;
+ *(palette + 766) = 224;
+ *(palette + 767) = 255;
+ *(palette + 759) = 255;
+ *(palette + 760) = 255;
+ *(palette + 761) = 255;
*palette = 0;
*(palette + 1) = 0;
*(palette + 2) = 0;
@@ -656,9 +656,9 @@ int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) {
v19 = ptr;
for (int i = 0; i < 2048; i++) {
v13 = *v19;
- if ((byte)(*v19 + 46) > 0x1Bu) {
- if ((byte)(v13 + 80) > 0x1Bu) {
- if ((byte)(v13 - 65) <= 0x19u || (byte)(v13 - 97) <= 0x19u)
+ if ((byte)(*v19 + 46) > 27) {
+ if ((byte)(v13 + 80) > 27) {
+ if ((byte)(v13 - 65) <= 25 || (byte)(v13 - 97) <= 25)
v13 = 32;
} else {
v13 -= 79;
@@ -1004,7 +1004,7 @@ LABEL_2:
loopCond = false;
v13 = 1;
do {
- v10 = _vm->_scriptManager.Traduction(ptr + 20 * v13);
+ v10 = _vm->_scriptManager.Traduction(ptr + 20 * v13);
if (_vm->shouldQuit())
return;
@@ -1189,9 +1189,9 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_fileManager.constructLinuxFilename("TEMP.SCR");
if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH)
- _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 0x4B000u);
+ _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 307200);
else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2))
- _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 0x96000u);
+ _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 614400);
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager.ofscroll = 0;
@@ -1274,7 +1274,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_graphicsManager.setpal_vga256(_vm->_graphicsManager.Palette);
v14 = _vm->_graphicsManager._vesaBuffer;
v15 = _vm->_graphicsManager._vesaScreen;
- memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 0x95FFCu);
+ memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 614396);
v15 = v15 + 614396;
v14 = v14 + 614396;
WRITE_LE_UINT16(v14, (int16)READ_LE_UINT16(v15));
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 13:09:28 +0000