mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-26 20:59:00 +00:00
HOPKINS: More misc renaming
This commit is contained in:
Strangerke
parent
f9f6133851
commit
8457c00457
@ -148,11 +148,11 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
|
||||
_vm->_graphicsManager.lockScreen();
|
||||
if (hasScreenCopy) {
|
||||
if (*screenP != kByteStop) {
|
||||
_vm->_graphicsManager.Copy_WinScan_Vbe3(screenP, screenCopy);
|
||||
_vm->_graphicsManager.copyWinscanVbe3(screenP, screenCopy);
|
||||
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
|
||||
}
|
||||
} else if (*screenP != kByteStop) {
|
||||
_vm->_graphicsManager.Copy_Video_Vbe16(screenP);
|
||||
_vm->_graphicsManager.copyVideoVbe16(screenP);
|
||||
}
|
||||
_vm->_graphicsManager.unlockScreen();
|
||||
_vm->_graphicsManager.DD_VBL();
|
||||
@ -200,7 +200,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
|
||||
|
||||
f.read(screenP, READ_LE_UINT32(imageStr + 8));
|
||||
if (*screenP != kByteStop)
|
||||
_vm->_graphicsManager.Copy_WinScan_Vbe3(screenP, screenCopy);
|
||||
_vm->_graphicsManager.copyWinscanVbe3(screenP, screenCopy);
|
||||
}
|
||||
_vm->_graphicsManager.fadeOutDefaultLength(screenCopy);
|
||||
screenCopy = _vm->_globals.freeMemory(screenCopy);
|
||||
@ -322,10 +322,10 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u
|
||||
_vm->_graphicsManager.lockScreen();
|
||||
if (*screenP != kByteStop) {
|
||||
if (hasScreenCopy) {
|
||||
_vm->_graphicsManager.Copy_WinScan_Vbe3(screenP, screenCopy);
|
||||
_vm->_graphicsManager.copyWinscanVbe3(screenP, screenCopy);
|
||||
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
|
||||
} else {
|
||||
_vm->_graphicsManager.Copy_Video_Vbe16(screenP);
|
||||
_vm->_graphicsManager.copyVideoVbe16(screenP);
|
||||
}
|
||||
}
|
||||
_vm->_graphicsManager.unlockScreen();
|
||||
@ -365,7 +365,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u
|
||||
|
||||
f.read(screenP, READ_LE_UINT32(imageStr + 8));
|
||||
if (*screenP != kByteStop)
|
||||
_vm->_graphicsManager.Copy_WinScan_Vbe3(screenP, ptra);
|
||||
_vm->_graphicsManager.copyWinscanVbe3(screenP, ptra);
|
||||
}
|
||||
_vm->_graphicsManager.fadeOutDefaultLength(ptra);
|
||||
ptra = _vm->_globals.freeMemory(ptra);
|
||||
@ -721,11 +721,11 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
|
||||
_vm->_graphicsManager.lockScreen();
|
||||
if (hasScreenCopy) {
|
||||
if (*screenP != kByteStop) {
|
||||
_vm->_graphicsManager.Copy_WinScan_Vbe(screenP, screenCopy);
|
||||
_vm->_graphicsManager.copyWinscanVbe(screenP, screenCopy);
|
||||
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
|
||||
}
|
||||
} else if (*screenP != kByteStop) {
|
||||
_vm->_graphicsManager.Copy_Video_Vbe16a(screenP);
|
||||
_vm->_graphicsManager.copyVideoVbe16a(screenP);
|
||||
}
|
||||
_vm->_graphicsManager.unlockScreen();
|
||||
_vm->_graphicsManager.DD_VBL();
|
||||
@ -847,11 +847,11 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
|
||||
_vm->_graphicsManager.lockScreen();
|
||||
if (multiScreenFl) {
|
||||
if (*screenP != kByteStop) {
|
||||
_vm->_graphicsManager.Copy_WinScan_Vbe(screenP, screenCopy);
|
||||
_vm->_graphicsManager.copyWinscanVbe(screenP, screenCopy);
|
||||
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
|
||||
}
|
||||
} else if (*screenP != kByteStop) {
|
||||
_vm->_graphicsManager.Copy_Video_Vbe16a(screenP);
|
||||
_vm->_graphicsManager.copyVideoVbe16a(screenP);
|
||||
}
|
||||
_vm->_graphicsManager.unlockScreen();
|
||||
_vm->_graphicsManager.DD_VBL();
|
||||
@ -891,7 +891,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
|
||||
|
||||
f.read(screenP, READ_LE_UINT32(imageStr + 8));
|
||||
if (*screenP != kByteStop)
|
||||
_vm->_graphicsManager.Copy_WinScan_Vbe(screenP, ptra);
|
||||
_vm->_graphicsManager.copyWinscanVbe(screenP, ptra);
|
||||
}
|
||||
_vm->_graphicsManager.fadeOutDefaultLength(ptra);
|
||||
ptra = _vm->_globals.freeMemory(ptra);
|
||||
|
||||
@ -127,7 +127,7 @@ void ComputerManager::setTextPosition(int yp, int xp) {
|
||||
*/
|
||||
void ComputerManager::showComputer(ComputerEnum mode) {
|
||||
_vm->_eventsManager._escKeyFl = false;
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
setVideoMode();
|
||||
setTextColor(4);
|
||||
setTextPosition(2, 4);
|
||||
@ -287,7 +287,7 @@ void ComputerManager::showComputer(ComputerEnum mode) {
|
||||
else // Free access or Samantha
|
||||
_vm->_globals._exitId = 14;
|
||||
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
}
|
||||
|
||||
static const char _englishText[] =
|
||||
@ -557,9 +557,9 @@ void ComputerManager::displayGamesSubMenu() {
|
||||
loadHiscore();
|
||||
setModeVGA256();
|
||||
newLevel();
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
playBreakout();
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
_breakoutSpr = _vm->_globals.freeMemory(_breakoutSpr);
|
||||
_breakoutLevel = (int16 *)_vm->_globals.freeMemory((byte *)_breakoutLevel);
|
||||
_vm->_objectsManager._sprite[0]._spriteData = oldSpriteData;
|
||||
@ -726,7 +726,7 @@ void ComputerManager::playBreakout() {
|
||||
_ballPosition = Common::Point(_padPositionX + 14, 187);
|
||||
_vm->_objectsManager.setSpriteY(1, 187);
|
||||
_vm->_objectsManager.setSpriteX(1, _ballPosition.x);
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
_vm->_eventsManager.VBL();
|
||||
_vm->_graphicsManager.fadeInBreakout();
|
||||
|
||||
@ -801,7 +801,7 @@ void ComputerManager::playBreakout() {
|
||||
* @return The selected button index: 1 = Game, 2 = Quit
|
||||
*/
|
||||
int ComputerManager::displayHiscores() {
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
loadHiscore();
|
||||
_vm->_graphicsManager.loadVgaImage("HISCORE.PCX");
|
||||
byte *ptr = _vm->_fileManager.loadFile("ALPHA.SPR");
|
||||
@ -827,7 +827,7 @@ int ComputerManager::displayHiscores() {
|
||||
}
|
||||
|
||||
_vm->_graphicsManager.fadeInBreakout();
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
int buttonIndex = 0;
|
||||
do {
|
||||
_vm->_eventsManager.refreshEvents();
|
||||
|
||||
@ -374,7 +374,7 @@ void DialogsManager::showInventory() {
|
||||
// The last two zones are not reserved for the inventory: Options and Save/Load
|
||||
if (inventIdx && inventCount <= 29) {
|
||||
byte *obj = _vm->_objectsManager.CAPTURE_OBJET(inventIdx, false);
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, obj, _inventX + curPosX + 6,
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, obj, _inventX + curPosX + 6,
|
||||
curPosY + 120, _vm->_globals._objectWidth, _vm->_globals._objectHeight);
|
||||
_vm->_globals.freeMemory(obj);
|
||||
}
|
||||
@ -382,7 +382,7 @@ void DialogsManager::showInventory() {
|
||||
};
|
||||
curPosY += 38;
|
||||
}
|
||||
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager._vesaBuffer, _inventWin1, _inventX, _inventY, _inventWidth, _inventHeight);
|
||||
_vm->_graphicsManager.copySurfaceRect(_vm->_graphicsManager._vesaBuffer, _inventWin1, _inventX, _inventY, _inventWidth, _inventHeight);
|
||||
_vm->_eventsManager._curMouseButton = 0;
|
||||
int newInventoryItem = 0;
|
||||
|
||||
@ -667,22 +667,22 @@ void DialogsManager::showSaveLoad(int a1) {
|
||||
|
||||
switch (slotNumber) {
|
||||
case 1:
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 190, 112, 128, 87);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 190, 112, 128, 87);
|
||||
break;
|
||||
case 2:
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 323, 112, 128, 87);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 323, 112, 128, 87);
|
||||
break;
|
||||
case 3:
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 190, 203, 128, 87);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 190, 203, 128, 87);
|
||||
break;
|
||||
case 4:
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 323, 203, 128, 87);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 323, 203, 128, 87);
|
||||
break;
|
||||
case 5:
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 190, 294, 128, 87);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 190, 294, 128, 87);
|
||||
break;
|
||||
case 6:
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 323, 294, 128, 87);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, thumb, _vm->_eventsManager._startPos.x + 323, 294, 128, 87);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -692,7 +692,7 @@ void DialogsManager::showSaveLoad(int a1) {
|
||||
}
|
||||
}
|
||||
|
||||
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager._saveLoadSprite, _vm->_eventsManager._startPos.x + 183, 60, 274, 353);
|
||||
_vm->_graphicsManager.copySurfaceRect(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager._saveLoadSprite, _vm->_eventsManager._startPos.x + 183, 60, 274, 353);
|
||||
_vm->_objectsManager._saveLoadFl = true;
|
||||
_vm->_objectsManager._saveLoadX = 0;
|
||||
_vm->_objectsManager._saveLoadY = 0;
|
||||
|
||||
@ -467,7 +467,7 @@ void EventsManager::VBL() {
|
||||
_vm->_graphicsManager.unlockScreen();
|
||||
_vm->_graphicsManager.dstrect[0] = Common::Rect(0, 20, SCREEN_WIDTH, 460);
|
||||
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
|
||||
_startPos.x = _vm->_graphicsManager._scrollPosX;
|
||||
_vm->_graphicsManager._scrollOffset = _vm->_graphicsManager._scrollPosX;
|
||||
|
||||
@ -159,7 +159,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
|
||||
} else {
|
||||
int height = _text[idx]._height;
|
||||
int width = _text[idx]._width;
|
||||
_vm->_graphicsManager.Restore_Mem(
|
||||
_vm->_graphicsManager.restoreSurfaceRect(
|
||||
_vm->_graphicsManager._vesaBuffer,
|
||||
_text[idx]._textBlock,
|
||||
xp,
|
||||
@ -346,9 +346,9 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
|
||||
if (ptrd == g_PTRNUL)
|
||||
error("Cutting a block for text box (%d)", size);
|
||||
|
||||
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager._vesaBuffer, ptrd, posX, posY, saveWidth, saveHeight);
|
||||
_vm->_graphicsManager.copySurfaceRect(_vm->_graphicsManager._vesaBuffer, ptrd, posX, posY, saveWidth, saveHeight);
|
||||
_vm->_graphicsManager.Trans_bloc2(ptrd, _vm->_graphicsManager._colorTable, size);
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, ptrd, posX, posY, saveWidth, saveHeight);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, ptrd, posX, posY, saveWidth, saveHeight);
|
||||
_vm->_globals.freeMemory(ptrd);
|
||||
|
||||
_vm->_graphicsManager.drawHorizontalLine(_vm->_graphicsManager._vesaBuffer, posX, posY, saveWidth, (byte)-2);
|
||||
@ -380,7 +380,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
|
||||
_text[idx]._textBlock = ptre;
|
||||
_text[idx]._width = blockWidth;
|
||||
_text[idx]._height = blockHeight;
|
||||
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager._vesaBuffer, _text[idx]._textBlock, posX, posY, _text[idx]._width, blockHeight);
|
||||
_vm->_graphicsManager.copySurfaceRect(_vm->_graphicsManager._vesaBuffer, _text[idx]._textBlock, posX, posY, _text[idx]._width, blockHeight);
|
||||
}
|
||||
_tempText = _vm->_globals.freeMemory(_tempText);
|
||||
}
|
||||
|
||||
@ -723,7 +723,7 @@ void GraphicsManager::DD_VBL() {
|
||||
g_system->updateScreen();
|
||||
}
|
||||
|
||||
void GraphicsManager::Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface) {
|
||||
void GraphicsManager::copyWinscanVbe3(const byte *srcData, byte *destSurface) {
|
||||
byte srcByte;
|
||||
byte destLen1;
|
||||
byte *destSlice1P;
|
||||
@ -773,7 +773,7 @@ void GraphicsManager::Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface)
|
||||
}
|
||||
}
|
||||
|
||||
void GraphicsManager::Copy_Video_Vbe16(const byte *srcData) {
|
||||
void GraphicsManager::copyVideoVbe16(const byte *srcData) {
|
||||
const byte *srcP = srcData;
|
||||
int destOffset = 0;
|
||||
assert(_videoPtr);
|
||||
@ -844,7 +844,7 @@ void GraphicsManager::Copy_Video_Vbe16(const byte *srcData) {
|
||||
}
|
||||
}
|
||||
|
||||
void GraphicsManager::Copy_Video_Vbe16a(const byte *srcData) {
|
||||
void GraphicsManager::copyVideoVbe16a(const byte *srcData) {
|
||||
byte srcByte;
|
||||
int destOffset = 0;
|
||||
const byte *srcP = srcData;
|
||||
@ -875,7 +875,7 @@ void GraphicsManager::Copy_Video_Vbe16a(const byte *srcData) {
|
||||
}
|
||||
}
|
||||
|
||||
void GraphicsManager::Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height) {
|
||||
void GraphicsManager::copySurfaceRect(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height) {
|
||||
const byte *srcP;
|
||||
byte *destP;
|
||||
int rowCount;
|
||||
@ -1073,7 +1073,7 @@ void GraphicsManager::displayAllBob() {
|
||||
}
|
||||
}
|
||||
|
||||
void GraphicsManager::RESET_SEGMENT_VESA() {
|
||||
void GraphicsManager::resetVesaSegment() {
|
||||
for (int idx = 0; idx <= NBBLOC; idx++)
|
||||
BLOC[idx]._activeFl = false;
|
||||
|
||||
@ -1193,8 +1193,7 @@ void GraphicsManager::copy16bFromSurfaceScaleX2(const byte *surface) {
|
||||
}
|
||||
}
|
||||
|
||||
void GraphicsManager::Restore_Mem(byte *destSurface, const byte *src, int xp, int yp, int width, int height) {
|
||||
int i;
|
||||
void GraphicsManager::restoreSurfaceRect(byte *destSurface, const byte *src, int xp, int yp, int width, int height) {
|
||||
int yCtr;
|
||||
|
||||
byte *destP = xp + _lineNbr2 * yp + destSurface;
|
||||
@ -1207,7 +1206,7 @@ void GraphicsManager::Restore_Mem(byte *destSurface, const byte *src, int xp, in
|
||||
srcP += width;
|
||||
destP += width;
|
||||
} else if (width & 2) {
|
||||
for (i = width >> 1; i; --i) {
|
||||
for (int i = width >> 1; i; --i) {
|
||||
destP[0] = srcP[0];
|
||||
destP[1] = srcP[1];
|
||||
srcP += 2;
|
||||
@ -1742,7 +1741,7 @@ void GraphicsManager::NB_SCREEN(bool initPalette) {
|
||||
DD_VBL();
|
||||
}
|
||||
|
||||
void GraphicsManager::Copy_WinScan_Vbe(const byte *src, byte *dest) {
|
||||
void GraphicsManager::copyWinscanVbe(const byte *src, byte *dest) {
|
||||
int destOffset = 0;
|
||||
const byte *srcPtr = src;
|
||||
for (;;) {
|
||||
|
||||
@ -137,6 +137,13 @@ public:
|
||||
void fadeOutShort();
|
||||
void fastDisplay(const byte *spriteData, int xp, int yp, int spriteIndex, bool addSegment = true);
|
||||
void displayVesaSegment();
|
||||
void resetVesaSegment();
|
||||
void copyWinscanVbe3(const byte *srcData, byte *destSurface);
|
||||
void copyWinscanVbe(const byte *srcP, byte *destP);
|
||||
void copyVideoVbe16(const byte *srcData);
|
||||
void copyVideoVbe16a(const byte *srcData);
|
||||
void copySurfaceRect(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height);
|
||||
void restoreSurfaceRect(byte *destSurface, const byte *src, int xp, int yp, int width, int height);
|
||||
void displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
|
||||
void drawHorizontalLine(byte *surface, int xp, int yp, uint16 width, byte col);
|
||||
void drawVerticalLine(byte *surface, int xp, int yp, int height, byte col);
|
||||
@ -151,13 +158,10 @@ public:
|
||||
void displayAllBob();
|
||||
void endDisplayBob();
|
||||
|
||||
void Restore_Mem(byte *destSurface, const byte *src, int xp, int yp, int width, int height);
|
||||
void SETCOLOR3(int palIndex, int r, int g, int b);
|
||||
void SETCOLOR4(int palIndex, int r, int g, int b);
|
||||
void AFFICHE_SPEEDVGA(const byte *objectData, int xp, int yp, int idx, bool addSegment = true);
|
||||
void RESET_SEGMENT_VESA();
|
||||
void DD_VBL();
|
||||
void Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height);
|
||||
void Affiche_Perfect(byte *surface, const byte *srcData, int xp300, int yp300, int frameIndex, int zoom1, int zoom2, bool flipFl);
|
||||
void Copy_Mem(const byte *srcSurface, int x1, int y1, uint16 width, int height, byte *destSurface, int destX, int destY);
|
||||
void SCANLINE(int pitch);
|
||||
@ -167,10 +171,6 @@ public:
|
||||
void Trans_bloc2(byte *surface, byte *col, int size);
|
||||
void NB_SCREEN(bool initPalette);
|
||||
void Reduc_Ecran(const byte *srcSruface, byte *destSurface, int xp, int yp, int width, int height, int zoom);
|
||||
void Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface);
|
||||
void Copy_WinScan_Vbe(const byte *srcP, byte *destP);
|
||||
void Copy_Video_Vbe16(const byte *srcData);
|
||||
void Copy_Video_Vbe16a(const byte *srcData);
|
||||
};
|
||||
|
||||
} // End of namespace Hopkins
|
||||
|
||||
@ -343,7 +343,7 @@ bool HopkinsEngine::runWin95Demo() {
|
||||
memset(_graphicsManager._vesaBuffer, 0, 307200);
|
||||
memset(_graphicsManager._vesaScreen, 0, 307200);
|
||||
_graphicsManager.clearPalette();
|
||||
_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_graphicsManager.resetVesaSegment();
|
||||
break;
|
||||
|
||||
case 114:
|
||||
@ -661,7 +661,7 @@ bool HopkinsEngine::runLinuxDemo() {
|
||||
memset(_graphicsManager._vesaBuffer, 0, 307200);
|
||||
memset(_graphicsManager._vesaScreen, 0, 307200);
|
||||
_graphicsManager.clearPalette();
|
||||
_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_graphicsManager.resetVesaSegment();
|
||||
break;
|
||||
|
||||
case 114:
|
||||
@ -1434,7 +1434,7 @@ bool HopkinsEngine::runFull() {
|
||||
memset(_graphicsManager._vesaBuffer, 0, 307200);
|
||||
memset(_graphicsManager._vesaScreen, 0, 307200);
|
||||
_graphicsManager.clearPalette();
|
||||
_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_graphicsManager.resetVesaSegment();
|
||||
break;
|
||||
|
||||
case 114:
|
||||
@ -1905,7 +1905,7 @@ void HopkinsEngine::restoreSystem() {
|
||||
|
||||
void HopkinsEngine::endLinuxDemo() {
|
||||
_globals._linuxEndDemoFl = true;
|
||||
_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_graphicsManager.resetVesaSegment();
|
||||
_objectsManager._forestFl = false;
|
||||
_eventsManager._breakoutFl = false;
|
||||
_globals._disableInventFl = true;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -76,18 +76,18 @@ struct ZonePItem {
|
||||
int _destX;
|
||||
int _destY;
|
||||
int _spriteIndex;
|
||||
int field6;
|
||||
int field7;
|
||||
int field8;
|
||||
int field9;
|
||||
int fieldA;
|
||||
int fieldB;
|
||||
int fieldC;
|
||||
int fieldD;
|
||||
int fieldE;
|
||||
int fieldF;
|
||||
int _verbFl1;
|
||||
int _verbFl2;
|
||||
int _verbFl3;
|
||||
int _verbFl4;
|
||||
int _verbFl5;
|
||||
int _verbFl6;
|
||||
int _verbFl7;
|
||||
int _verbFl8;
|
||||
int _verbFl9;
|
||||
int _verbFl10;
|
||||
bool _enabledFl;
|
||||
int field12;
|
||||
int _messageId;
|
||||
};
|
||||
|
||||
struct RouteItem {
|
||||
@ -106,25 +106,26 @@ private:
|
||||
|
||||
int _pathFindingMaxDepth;
|
||||
SmoothItem _smoothRoute[4000];
|
||||
int NV_LIGNEDEP;
|
||||
int NV_LIGNEOFS;
|
||||
int NV_POSI;
|
||||
int NVPX;
|
||||
int NVPY;
|
||||
Directions _smoothMoveDirection;
|
||||
RouteItem super_parcours[8001];
|
||||
byte *BUFFERTAPE;
|
||||
RouteItem *essai0;
|
||||
RouteItem *essai1;
|
||||
int16 *BufLig;
|
||||
LigneZoneItem _zoneLine[401];
|
||||
LigneItem Ligne[400];
|
||||
SegmentItem _segment[101];
|
||||
SquareZoneItem _squareZone[101];
|
||||
int _currentSegmentId;
|
||||
int _maxLineIdx;
|
||||
int _lastLine;
|
||||
int _linesNumb;
|
||||
int _newLineIdx;
|
||||
int _newLineDataIdx;
|
||||
int _newRouteIdx;
|
||||
int _newPosX;
|
||||
int _newPosY;
|
||||
|
||||
byte *_largeBuf;
|
||||
RouteItem *essai0;
|
||||
RouteItem *essai1;
|
||||
int16 *_lineBuf;
|
||||
LigneItem _lineItem[400];
|
||||
RouteItem _bestRoute[8001];
|
||||
|
||||
int checkInventoryHotspotsRow(int posX, int minZoneNum, bool lastRow);
|
||||
void removeZoneLine(int idx);
|
||||
|
||||
@ -409,7 +409,7 @@ void ObjectsManager::displaySprite() {
|
||||
|
||||
_vm->_globals._sortedDisplayCount = 0;
|
||||
if (_vm->_dialogsManager._inventDisplayedFl) {
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, _vm->_dialogsManager._inventWin1, _vm->_dialogsManager._inventX, _vm->_dialogsManager._inventY, _vm->_dialogsManager._inventWidth, _vm->_dialogsManager._inventHeight);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, _vm->_dialogsManager._inventWin1, _vm->_dialogsManager._inventX, _vm->_dialogsManager._inventY, _vm->_dialogsManager._inventWidth, _vm->_dialogsManager._inventHeight);
|
||||
if (_oldBorderPos.x && _oldBorderPos.y)
|
||||
_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _vm->_dialogsManager._inventBuf2, _oldBorderPos.x + 300, _oldBorderPos.y + 300, _oldBorderSpriteIndex + 1);
|
||||
if (_borderPos.x && _borderPos.y)
|
||||
@ -418,7 +418,7 @@ void ObjectsManager::displaySprite() {
|
||||
}
|
||||
|
||||
if (_saveLoadFl) {
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer, _saveLoadSprite, _vm->_eventsManager._startPos.x + 183, 60, 274, 353);
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, _saveLoadSprite, _vm->_eventsManager._startPos.x + 183, 60, 274, 353);
|
||||
if (_saveLoadX && _saveLoadY)
|
||||
_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _saveLoadSprite2, _saveLoadX + _vm->_eventsManager._startPos.x + 300, _saveLoadY + 300, 0);
|
||||
|
||||
@ -1076,11 +1076,11 @@ void ObjectsManager::displayVBob() {
|
||||
width = getWidth(_vm->_globals.VBob[idx]._spriteData, _vm->_globals.VBob[idx]._frameIndex);
|
||||
height = getHeight(_vm->_globals.VBob[idx]._spriteData, _vm->_globals.VBob[idx]._frameIndex);
|
||||
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaScreen,
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaScreen,
|
||||
_vm->_globals.VBob[idx]._surface, _vm->_globals.VBob[idx]._xp,
|
||||
_vm->_globals.VBob[idx]._yp, width, height);
|
||||
|
||||
_vm->_graphicsManager.Restore_Mem(
|
||||
_vm->_graphicsManager.restoreSurfaceRect(
|
||||
_vm->_graphicsManager._vesaBuffer, _vm->_globals.VBob[idx]._surface,
|
||||
_vm->_globals.VBob[idx]._xp, _vm->_globals.VBob[idx]._yp,
|
||||
width, height);
|
||||
@ -1106,12 +1106,12 @@ void ObjectsManager::displayVBob() {
|
||||
width = getWidth(_vm->_globals.VBob[idx]._oldSpriteData, _vm->_globals.VBob[idx]._oldFrameIndex);
|
||||
height = getHeight(_vm->_globals.VBob[idx]._oldSpriteData, _vm->_globals.VBob[idx]._oldFrameIndex);
|
||||
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaScreen,
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaScreen,
|
||||
_vm->_globals.VBob[idx]._surface, _vm->_globals.VBob[idx]._oldX,
|
||||
_vm->_globals.VBob[idx]._oldY,
|
||||
width, height);
|
||||
|
||||
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager._vesaBuffer,
|
||||
_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer,
|
||||
_vm->_globals.VBob[idx]._surface, _vm->_globals.VBob[idx]._oldX,
|
||||
_vm->_globals.VBob[idx]._oldY, width, height);
|
||||
|
||||
@ -1138,7 +1138,7 @@ void ObjectsManager::displayVBob() {
|
||||
byte *surface = _vm->_globals.allocMemory(height * width);
|
||||
_vm->_globals.VBob[idx]._surface = surface;
|
||||
|
||||
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager._vesaScreen, surface,
|
||||
_vm->_graphicsManager.copySurfaceRect(_vm->_graphicsManager._vesaScreen, surface,
|
||||
_vm->_globals.VBob[idx]._xp, _vm->_globals.VBob[idx]._yp, width, height);
|
||||
|
||||
byte *v10 = _vm->_globals.VBob[idx]._spriteData;
|
||||
@ -1665,17 +1665,17 @@ void ObjectsManager::loadZone(const Common::String &file) {
|
||||
_vm->_linesManager.ZONEP[i]._destX = 0;
|
||||
_vm->_linesManager.ZONEP[i]._destY = 0;
|
||||
_vm->_linesManager.ZONEP[i]._spriteIndex = 0;
|
||||
_vm->_linesManager.ZONEP[i].field6 = 0;
|
||||
_vm->_linesManager.ZONEP[i].field7 = 0;
|
||||
_vm->_linesManager.ZONEP[i].field8 = 0;
|
||||
_vm->_linesManager.ZONEP[i].field9 = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldA = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldB = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldC = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldD = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldE = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldF = 0;
|
||||
_vm->_linesManager.ZONEP[i].field12 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl1 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl2 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl3 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl4 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl5 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl6 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl7 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl8 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl9 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl10 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._messageId = 0;
|
||||
_vm->_linesManager.ZONEP[i]._enabledFl = false;
|
||||
}
|
||||
|
||||
@ -1713,22 +1713,22 @@ void ObjectsManager::loadZone(const Common::String &file) {
|
||||
byte *v9 = (ptr + 10 * zoneLineIdx + 606);
|
||||
bufId = 0;
|
||||
for (int i = 1; i <= 100; i++) {
|
||||
_vm->_linesManager.ZONEP[i].field6 = v9[bufId];
|
||||
_vm->_linesManager.ZONEP[i].field7 = v9[bufId + 1];
|
||||
_vm->_linesManager.ZONEP[i].field8 = v9[bufId + 2];
|
||||
_vm->_linesManager.ZONEP[i].field9 = v9[bufId + 3];
|
||||
_vm->_linesManager.ZONEP[i].fieldA = v9[bufId + 4];
|
||||
_vm->_linesManager.ZONEP[i].fieldB = v9[bufId + 5];
|
||||
_vm->_linesManager.ZONEP[i].fieldC = v9[bufId + 6];
|
||||
_vm->_linesManager.ZONEP[i].fieldD = v9[bufId + 7];
|
||||
_vm->_linesManager.ZONEP[i].fieldE = v9[bufId + 8];
|
||||
_vm->_linesManager.ZONEP[i].fieldF = v9[bufId + 9];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl1 = v9[bufId];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl2 = v9[bufId + 1];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl3 = v9[bufId + 2];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl4 = v9[bufId + 3];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl5 = v9[bufId + 4];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl6 = v9[bufId + 5];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl7 = v9[bufId + 6];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl8 = v9[bufId + 7];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl9 = v9[bufId + 8];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl10 = v9[bufId + 9];
|
||||
|
||||
bufId += 10;
|
||||
}
|
||||
v9 += 1010;
|
||||
for (int i = 0; i < 100; i++)
|
||||
_vm->_linesManager.ZONEP[i + 1].field12 = READ_LE_UINT16(v9 + 2 * i);
|
||||
_vm->_linesManager.ZONEP[i + 1]._messageId = READ_LE_UINT16(v9 + 2 * i);
|
||||
|
||||
_vm->_globals.freeMemory(ptr);
|
||||
_vm->_linesManager.CARRE_ZONE();
|
||||
@ -2094,7 +2094,7 @@ void ObjectsManager::clearScreen() {
|
||||
_changeVerbFl = false;
|
||||
_vm->_linesManager._route = (RouteItem *)g_PTRNUL;
|
||||
_vm->_globals._oldDirection = DIR_NONE;
|
||||
_vm->_graphicsManager.RESET_SEGMENT_VESA();
|
||||
_vm->_graphicsManager.resetVesaSegment();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2244,139 +2244,139 @@ void ObjectsManager::nextVerbIcon() {
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 5 || _vm->_eventsManager._mouseCursorId == 6) {
|
||||
_vm->_eventsManager._mouseCursorId = 6;
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field6 == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl1 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 7) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field7 == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl2 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 8) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field8 == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl3 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 9) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field9 == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl4 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 10) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldA == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl5 == 1)
|
||||
return;
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 11) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldB == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl6 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 12) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldC == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl7 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 13) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldD == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl8 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 14) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldE == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl9 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 15) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldF == 1)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl10 == 1)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 16) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field6 == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl1 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 17) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field9 == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl4 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 18) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldA == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl5 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 19) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldB == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl6 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 20) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldC == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl7 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 21) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldF == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl10 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 22) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldD == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl8 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 23) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field8 == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl3 == 2)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 24) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].field9 == 3)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl4 == 3)
|
||||
return;
|
||||
|
||||
++_vm->_eventsManager._mouseCursorId;
|
||||
}
|
||||
|
||||
if (_vm->_eventsManager._mouseCursorId == 25) {
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum].fieldE == 2)
|
||||
if (_vm->_linesManager.ZONEP[_zoneNum]._verbFl9 == 2)
|
||||
return;
|
||||
}
|
||||
_vm->_eventsManager._mouseCursorId = 4;
|
||||
@ -3148,17 +3148,17 @@ void ObjectsManager::loadLinkFile(const Common::String &file) {
|
||||
_vm->_linesManager.ZONEP[i]._destX = 0;
|
||||
_vm->_linesManager.ZONEP[i]._destY = 0;
|
||||
_vm->_linesManager.ZONEP[i]._spriteIndex = 0;
|
||||
_vm->_linesManager.ZONEP[i].field6 = 0;
|
||||
_vm->_linesManager.ZONEP[i].field7 = 0;
|
||||
_vm->_linesManager.ZONEP[i].field8 = 0;
|
||||
_vm->_linesManager.ZONEP[i].field9 = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldA = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldB = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldC = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldD = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldE = 0;
|
||||
_vm->_linesManager.ZONEP[i].fieldF = 0;
|
||||
_vm->_linesManager.ZONEP[i].field12 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl1 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl2 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl3 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl4 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl5 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl6 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl7 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl8 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl9 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._verbFl10 = 0;
|
||||
_vm->_linesManager.ZONEP[i]._messageId = 0;
|
||||
}
|
||||
|
||||
int curLineIdx = 0;
|
||||
@ -3188,20 +3188,20 @@ void ObjectsManager::loadLinkFile(const Common::String &file) {
|
||||
byte *v22 = ptr + idx + (10 * curLineIdx + 606) + 4;
|
||||
for (int i = 1; i <= 100; i++) {
|
||||
int j = (i - 1) * 10;
|
||||
_vm->_linesManager.ZONEP[i].field6 = v22[j];
|
||||
_vm->_linesManager.ZONEP[i].field7 = v22[j + 1];
|
||||
_vm->_linesManager.ZONEP[i].field8 = v22[j + 2];
|
||||
_vm->_linesManager.ZONEP[i].field9 = v22[j + 3];
|
||||
_vm->_linesManager.ZONEP[i].fieldA = v22[j + 4];
|
||||
_vm->_linesManager.ZONEP[i].fieldB = v22[j + 5];
|
||||
_vm->_linesManager.ZONEP[i].fieldC = v22[j + 6];
|
||||
_vm->_linesManager.ZONEP[i].fieldD = v22[j + 7];
|
||||
_vm->_linesManager.ZONEP[i].fieldE = v22[j + 8];
|
||||
_vm->_linesManager.ZONEP[i].fieldF = v22[j + 9];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl1 = v22[j];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl2 = v22[j + 1];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl3 = v22[j + 2];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl4 = v22[j + 3];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl5 = v22[j + 4];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl6 = v22[j + 5];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl7 = v22[j + 6];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl8 = v22[j + 7];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl9 = v22[j + 8];
|
||||
_vm->_linesManager.ZONEP[i]._verbFl10 = v22[j + 9];
|
||||
}
|
||||
int dep = 1010;
|
||||
for (int i = 1; i <= 100; i++) {
|
||||
_vm->_linesManager.ZONEP[i].field12 = READ_LE_INT16(v22 + dep);
|
||||
_vm->_linesManager.ZONEP[i]._messageId = READ_LE_INT16(v22 + dep);
|
||||
dep += 2;
|
||||
}
|
||||
_vm->_linesManager.CARRE_ZONE();
|
||||
@ -3286,10 +3286,10 @@ void ObjectsManager::SPECIAL_INI() {
|
||||
enableVerb(21, 5);
|
||||
enableVerb(22, 5);
|
||||
enableVerb(23, 5);
|
||||
_vm->_linesManager.ZONEP[20].field12 = 30;
|
||||
_vm->_linesManager.ZONEP[21].field12 = 30;
|
||||
_vm->_linesManager.ZONEP[22].field12 = 30;
|
||||
_vm->_linesManager.ZONEP[23].field12 = 30;
|
||||
_vm->_linesManager.ZONEP[20]._messageId = 30;
|
||||
_vm->_linesManager.ZONEP[21]._messageId = 30;
|
||||
_vm->_linesManager.ZONEP[22]._messageId = 30;
|
||||
_vm->_linesManager.ZONEP[23]._messageId = 30;
|
||||
for (int i = 200; i <= 214; i++) {
|
||||
if (_vm->_globals._saveData->_data[i] != 2)
|
||||
_vm->_globals._saveData->_data[i] = 0;
|
||||
@ -3347,42 +3347,42 @@ void ObjectsManager::disableVerb(int idx, int a2) {
|
||||
switch (a2) {
|
||||
case 6:
|
||||
case 16:
|
||||
_vm->_linesManager.ZONEP[idx].field6 = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl1 = 0;
|
||||
break;
|
||||
case 7:
|
||||
_vm->_linesManager.ZONEP[idx].field7 = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl2 = 0;
|
||||
break;
|
||||
case 5:
|
||||
case 8:
|
||||
_vm->_linesManager.ZONEP[idx].field8 = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl3 = 0;
|
||||
break;
|
||||
case 9:
|
||||
case 17:
|
||||
case 24:
|
||||
_vm->_linesManager.ZONEP[idx].field9 = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl4 = 0;
|
||||
break;
|
||||
case 10:
|
||||
case 18:
|
||||
_vm->_linesManager.ZONEP[idx].fieldA = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl5 = 0;
|
||||
break;
|
||||
case 11:
|
||||
case 19:
|
||||
_vm->_linesManager.ZONEP[idx].fieldB = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl6 = 0;
|
||||
break;
|
||||
case 12:
|
||||
case 20:
|
||||
_vm->_linesManager.ZONEP[idx].fieldC = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl7 = 0;
|
||||
break;
|
||||
case 13:
|
||||
case 22:
|
||||
_vm->_linesManager.ZONEP[idx].fieldD = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl8 = 0;
|
||||
case 14:
|
||||
case 21:
|
||||
case 25:
|
||||
_vm->_linesManager.ZONEP[idx].fieldE = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl9 = 0;
|
||||
break;
|
||||
case 15:
|
||||
_vm->_linesManager.ZONEP[idx].fieldF = 0;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl10 = 0;
|
||||
break;
|
||||
}
|
||||
_changeVerbFl = true;
|
||||
@ -3391,64 +3391,64 @@ void ObjectsManager::disableVerb(int idx, int a2) {
|
||||
void ObjectsManager::enableVerb(int idx, int a2) {
|
||||
switch (a2) {
|
||||
case 5:
|
||||
_vm->_linesManager.ZONEP[idx].field8 = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl3 = 2;
|
||||
break;
|
||||
case 6:
|
||||
_vm->_linesManager.ZONEP[idx].field6 = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl1 = 1;
|
||||
break;
|
||||
case 7:
|
||||
_vm->_linesManager.ZONEP[idx].field7 = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl2 = 1;
|
||||
break;
|
||||
case 8:
|
||||
_vm->_linesManager.ZONEP[idx].field8 = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl3 = 1;
|
||||
break;
|
||||
case 9:
|
||||
_vm->_linesManager.ZONEP[idx].field9 = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl4 = 1;
|
||||
break;
|
||||
case 10:
|
||||
_vm->_linesManager.ZONEP[idx].fieldA = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl5 = 1;
|
||||
break;
|
||||
case 11:
|
||||
_vm->_linesManager.ZONEP[idx].fieldB = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl6 = 1;
|
||||
break;
|
||||
case 12:
|
||||
_vm->_linesManager.ZONEP[idx].fieldC = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl7 = 1;
|
||||
break;
|
||||
case 13:
|
||||
_vm->_linesManager.ZONEP[idx].fieldD = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl8 = 1;
|
||||
break;
|
||||
case 14:
|
||||
_vm->_linesManager.ZONEP[idx].fieldD = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl8 = 1;
|
||||
break;
|
||||
case 15:
|
||||
_vm->_linesManager.ZONEP[idx].fieldE = 1;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl9 = 1;
|
||||
break;
|
||||
case 16:
|
||||
_vm->_linesManager.ZONEP[idx].field6 = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl1 = 2;
|
||||
break;
|
||||
case 17:
|
||||
_vm->_linesManager.ZONEP[idx].field9 = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl4 = 2;
|
||||
break;
|
||||
case 18:
|
||||
_vm->_linesManager.ZONEP[idx].fieldA = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl5 = 2;
|
||||
break;
|
||||
case 19:
|
||||
_vm->_linesManager.ZONEP[idx].fieldB = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl6 = 2;
|
||||
break;
|
||||
case 20:
|
||||
_vm->_linesManager.ZONEP[idx].fieldC = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl7 = 2;
|
||||
break;
|
||||
case 21:
|
||||
_vm->_linesManager.ZONEP[idx].fieldE = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl9 = 2;
|
||||
break;
|
||||
case 22:
|
||||
_vm->_linesManager.ZONEP[idx].fieldD = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl8 = 2;
|
||||
break;
|
||||
case 24:
|
||||
_vm->_linesManager.ZONEP[idx].field9 = 3;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl4 = 3;
|
||||
break;
|
||||
case 25:
|
||||
_vm->_linesManager.ZONEP[idx].fieldE = 2;
|
||||
_vm->_linesManager.ZONEP[idx]._verbFl9 = 2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2391,7 +2391,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
|
||||
opcodeType = 1;
|
||||
break;
|
||||
case MKTAG24('Z', 'C', 'H'):
|
||||
_vm->_linesManager.ZONEP[READ_LE_INT16(dataP + 5)].field12 = READ_LE_INT16(dataP + 7);
|
||||
_vm->_linesManager.ZONEP[READ_LE_INT16(dataP + 5)]._messageId = READ_LE_INT16(dataP + 7);
|
||||
opcodeType = 1;
|
||||
break;
|
||||
case MKTAG24('J', 'U', 'M'):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user