[Scummvm-cvs-logs] SF.net SVN: scummvm: [24429] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sun Oct 22 07:11:32 CEST 2006
Revision: 24429
http://svn.sourceforge.net/scummvm/?rev=24429&view=rev
Author: kirben
Date: 2006-10-21 22:11:27 -0700 (Sat, 21 Oct 2006)
Log Message:
-----------
Fix regression is WW, caused by functions merge
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/vga.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2006-10-22 01:05:14 UTC (rev 24428)
+++ scummvm/trunk/engines/agos/agos.h 2006-10-22 05:11:27 UTC (rev 24429)
@@ -795,8 +795,8 @@
void loadZone(uint zoneNum);
- void animate(uint windowNum, uint zoneNum, uint vgaSpriteId, uint x, uint y, uint palette, bool setZone = true);
- void setImage(uint16 vga_res_id, bool setZone);
+ void animate(uint windowNum, uint zoneNum, uint vgaSpriteId, uint x, uint y, uint palette, bool vgaScript = false);
+ void setImage(uint16 vga_res_id, bool vgaScript = false);
void setWindowImage(uint16 mode, uint16 vga_res_id);
void setWindowImageEx(uint16 mode, uint16 vga_res);
Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp 2006-10-22 01:05:14 UTC (rev 24428)
+++ scummvm/trunk/engines/agos/vga.cpp 2006-10-22 05:11:27 UTC (rev 24429)
@@ -420,7 +420,7 @@
old_file_1 = _curVgaFile1;
old_file_2 = _curVgaFile2;
- setImage(num, false);
+ setImage(num, true);
_curVgaFile1 = old_file_1;
_curVgaFile2 = old_file_2;
@@ -451,7 +451,7 @@
old_file_1 = _curVgaFile1;
- animate(windowNum, zoneNum, vgaSpriteId, x, y, palette, false);
+ animate(windowNum, zoneNum, vgaSpriteId, x, y, palette, true);
_curVgaFile1 = old_file_1;
}
@@ -1670,7 +1670,7 @@
_fastFadeOutFlag = false;
}
-void AGOSEngine::animate(uint windowNum, uint zoneNum, uint vgaSpriteId, uint x, uint y, uint palette, bool setZone) {
+void AGOSEngine::animate(uint windowNum, uint zoneNum, uint vgaSpriteId, uint x, uint y, uint palette, bool vgaScript) {
VgaSprite *vsp;
VgaPointersEntry *vpe;
byte *p, *pp;
@@ -1704,19 +1704,19 @@
for (;;) {
vpe = &_vgaBufferPointers[zoneNum];
_curVgaFile1 = vpe->vgaFile1;
- if (setZone) {
- _zoneNumber = zoneNum;
+ if (vgaScript) {
if (vpe->vgaFile1 != NULL)
break;
+ if (_zoneNumber != zoneNum)
+ _noOverWrite = _zoneNumber;
+
loadZone(zoneNum);
+ _noOverWrite = 0xFFFF;
} else {
+ _zoneNumber = zoneNum;
if (vpe->vgaFile1 != NULL)
break;
- if (_zoneNumber != zoneNum)
- _noOverWrite = _zoneNumber;
-
loadZone(zoneNum);
- _noOverWrite = 0xFFFF;
}
}
@@ -1797,7 +1797,7 @@
}
}
-void AGOSEngine::setImage(uint16 vga_res_id, bool setZone) {
+void AGOSEngine::setImage(uint16 vga_res_id, bool vgaScript) {
uint zoneNum;
VgaPointersEntry *vpe;
byte *bb, *b;
@@ -1811,22 +1811,22 @@
_curVgaFile1 = vpe->vgaFile1;
_curVgaFile2 = vpe->vgaFile2;
- if (setZone) {
- _curSfxFile = vpe->sfxFile;
- _zoneNumber = zoneNum;
-
+ if (vgaScript) {
if (vpe->vgaFile1 != NULL)
break;
+ if (_zoneNumber != zoneNum)
+ _noOverWrite = _zoneNumber;
loadZone(zoneNum);
+ _noOverWrite = 0xFFFF;
} else {
+ _curSfxFile = vpe->sfxFile;
+ _zoneNumber = zoneNum;
+
if (vpe->vgaFile1 != NULL)
break;
- if (_zoneNumber != zoneNum)
- _noOverWrite = _zoneNumber;
loadZone(zoneNum);
- _noOverWrite = 0xFFFF;
}
}
@@ -1842,7 +1842,6 @@
b += sizeof(ImageHeader_Feeble);
}
assert(READ_LE_UINT16(&((ImageHeader_Feeble *) b)->id) == vga_res_id);
-
} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
b = bb + READ_BE_UINT16(bb + 4);
count = READ_BE_UINT16(&((VgaFileHeader2_Common *) b)->imageCount);
@@ -1868,7 +1867,8 @@
}
assert(READ_BE_UINT16(&((ImageHeader_WW *) b)->id) == vga_res_id);
- clearWindow(_windowNum, READ_BE_UINT16(&((ImageHeader_WW *) b)->color));
+ if (!vgaScript)
+ clearWindow(_windowNum, READ_BE_UINT16(&((ImageHeader_WW *) b)->color));
}
if (_startVgaScript) {
@@ -1936,7 +1936,7 @@
}
}
- setImage(vga_res_id, true);
+ setImage(vga_res_id);
if (getGameType() == GType_FF || getGameType() == GType_PP) {
fillFrontFromBack(0, 0, _screenWidth, _screenHeight);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list