[Scummvm-cvs-logs] SF.net SVN: scummvm: [26796] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Thu May 10 02:43:28 CEST 2007
Revision: 26796
http://scummvm.svn.sourceforge.net/scummvm/?rev=26796&view=rev
Author: kirben
Date: 2007-05-09 17:43:27 -0700 (Wed, 09 May 2007)
Log Message:
-----------
Fix glitches in pause options of Elvira 1.
Modified Paths:
--------------
scummvm/trunk/engines/agos/event.cpp
scummvm/trunk/engines/agos/gfx.cpp
scummvm/trunk/engines/agos/script_e1.cpp
scummvm/trunk/engines/agos/script_e2.cpp
scummvm/trunk/engines/agos/subroutine.cpp
Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp 2007-05-10 00:02:37 UTC (rev 26795)
+++ scummvm/trunk/engines/agos/event.cpp 2007-05-10 00:43:27 UTC (rev 26796)
@@ -180,7 +180,11 @@
if (!(_lockWord & 0x10))
return;
+ _window4Flag = 2;
+
+ setMoveRect(0, 0, 224, 127);
updateScreen();
+
_lockWord &= ~0x10;
// Check picture queue
Modified: scummvm/trunk/engines/agos/gfx.cpp
===================================================================
--- scummvm/trunk/engines/agos/gfx.cpp 2007-05-10 00:02:37 UTC (rev 26795)
+++ scummvm/trunk/engines/agos/gfx.cpp 2007-05-10 00:43:27 UTC (rev 26796)
@@ -1364,9 +1364,9 @@
src += srcWidth;
}
- if (getGameType() == GType_ELVIRA1 && updateWindow == 3 && _bottomPalette != 0) {
- dst = getFrontBuf() + 42560;
- int size = 21440;
+ if (getGameType() == GType_ELVIRA1 && updateWindow == 3 && _bottomPalette) {
+ dst = getFrontBuf() + 133 * _screenWidth;
+ int size = 67 * _screenWidth;
while (size--) {
*dst += 0x10;
Modified: scummvm/trunk/engines/agos/script_e1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e1.cpp 2007-05-10 00:02:37 UTC (rev 26795)
+++ scummvm/trunk/engines/agos/script_e1.cpp 2007-05-10 00:43:27 UTC (rev 26796)
@@ -960,6 +960,7 @@
window->textColumn = 0;
window->textRow = 0;
window->textColumnOffset = 0;
+ window->textLength = 0; // Difference
switch (_language) {
case Common::FR_FRA:
@@ -986,6 +987,7 @@
window->textColumn = 0;
window->textRow = 0;
window->textColumnOffset = 0;
+ window->textLength = 0; // Difference
switch (_language) {
case Common::FR_FRA:
@@ -1199,11 +1201,12 @@
state.srcPtr = vpe->vgaFile2 + READ_BE_UINT32(vpe->vgaFile2 + 9 * 8);
state.palette = 0;
+ state.paletteMod = 0;
state.x = 10;
state.y = 32;
state.width = state.draw_width = 10;
state.height = state.draw_height = 72;
- state.flags = kDFCompressed | kDFUseFrontBuf;
+ state.flags = kDFCompressed;
_windowNum = 3;
state.depack_cont = -0x80;
Modified: scummvm/trunk/engines/agos/script_e2.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e2.cpp 2007-05-10 00:02:37 UTC (rev 26795)
+++ scummvm/trunk/engines/agos/script_e2.cpp 2007-05-10 00:43:27 UTC (rev 26796)
@@ -316,7 +316,7 @@
void AGOSEngine_Elvira2::oe2_loadGame() {
// 89: load game
uint16 stringId = getNextStringID();
- debug(0, "oe1_loadGame: stub (%s)", (const char *)getStringPtrByID(stringId));
+ debug(0, "oe2_loadGame: stub (%s)", (const char *)getStringPtrByID(stringId));
if (!scumm_stricmp(getFileName(GAME_RESTFILE), (const char *)getStringPtrByID(stringId))) {
loadGame(getFileName(GAME_RESTFILE), true);
Modified: scummvm/trunk/engines/agos/subroutine.cpp
===================================================================
--- scummvm/trunk/engines/agos/subroutine.cpp 2007-05-10 00:02:37 UTC (rev 26795)
+++ scummvm/trunk/engines/agos/subroutine.cpp 2007-05-10 00:43:27 UTC (rev 26796)
@@ -321,7 +321,7 @@
_tablesHeapCurPosNew = _tablesHeapCurPos;
if (_tablesHeapCurPos > _tablesHeapSize)
- error("loadTablesOldIntoMem: Out of table memory");
+ error("loadTablesIntoMem: Out of table memory");
return 1;
}
@@ -331,7 +331,7 @@
p += 6;
}
- debug(1,"loadTablesOldIntoMem: didn't find %d", subr_id);
+ debug(1,"loadTablesIntoMem: didn't find %d", subr_id);
return 0;
}
@@ -387,13 +387,13 @@
_tablesHeapCurPosNew = _tablesHeapCurPos;
if (_tablesHeapCurPos > _tablesHeapSize)
- error("loadTablesNewIntoMem: Out of table memory");
+ error("loadTablesIntoMem: Out of table memory");
return 1;
}
}
}
- debug(1,"loadTablesNewIntoMem: didn't find %d", subr_id);
+ debug(1,"loadTablesIntoMem: didn't find %d", subr_id);
return 0;
}
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