[Scummvm-cvs-logs] SF.net SVN: scummvm: [24262] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Tue Oct 10 14:13:56 CEST 2006
Revision: 24262
http://svn.sourceforge.net/scummvm/?rev=24262&view=rev
Author: kirben
Date: 2006-10-10 05:13:47 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
Fix and remove duplicate opcode for Elvira 1
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/icons.cpp
scummvm/trunk/engines/agos/items.cpp
scummvm/trunk/engines/agos/vga.cpp
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2006-10-10 11:44:58 UTC (rev 24261)
+++ scummvm/trunk/engines/agos/agos.cpp 2006-10-10 12:13:47 UTC (rev 24262)
@@ -714,10 +714,13 @@
_stringIdLocalMin = 1;
for (int i = 0; i < 20; i++) {
- if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2)
+ if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
_videoWindows[i] = initialVideoWindows_Simon[i];
- else
+ } else {
_videoWindows[i] = initialVideoWindows_Common[i];
+ }
+
+ printf("initialVideoWindows_Common[%d] %d\n", i, _videoWindows[i]);
}
}
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2006-10-10 11:44:58 UTC (rev 24261)
+++ scummvm/trunk/engines/agos/agos.h 2006-10-10 12:13:47 UTC (rev 24262)
@@ -1094,7 +1094,6 @@
void oe1_printMonsterDamage();
void oe1_printPlayerHit();
void oe1_printMonsterHit();
- void oe1_setStore();
// Opcodes, Elvira 2 only
void oe2_moveDirn();
Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp 2006-10-10 11:44:58 UTC (rev 24261)
+++ scummvm/trunk/engines/agos/icons.cpp 2006-10-10 12:13:47 UTC (rev 24262)
@@ -164,6 +164,8 @@
}
void AGOSEngine::draw_icon_c(WindowBlock *window, uint icon, uint x, uint y) {
+ return;
+
byte *dst;
byte *src;
Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp 2006-10-10 11:44:58 UTC (rev 24261)
+++ scummvm/trunk/engines/agos/items.cpp 2006-10-10 12:13:47 UTC (rev 24262)
@@ -338,7 +338,7 @@
op[279] = &AGOSEngine::o_freezeZones;
op[280] = &AGOSEngine::o_placeNoIcons;
op[281] = &AGOSEngine::o_clearTimers;
- op[282] = &AGOSEngine::oe1_setStore;
+ op[282] = &AGOSEngine::o_setDollar;
op[283] = &AGOSEngine::o_isBox;
}
@@ -2135,16 +2135,6 @@
printStats();
}
-void AGOSEngine::oe1_setStore() {
- // 282: set store
- Item *item = getNextItemPtr();
-
- if (getVarOrWord() == 1)
- _subjectItem = item;
- else
- _objectItem = item;
-}
-
// -----------------------------------------------------------------------
// Elvira 2 Opcodes
// -----------------------------------------------------------------------
Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp 2006-10-10 11:44:58 UTC (rev 24261)
+++ scummvm/trunk/engines/agos/vga.cpp 2006-10-10 12:13:47 UTC (rev 24262)
@@ -1249,6 +1249,9 @@
void AGOSEngine::drawImages(VC10_state *state) {
const uint16 *vlut = &_videoWindows[_windowNum * 4];
+ printf("_windowNum %d vlut[0] %d vlut[1] %d\n", _windowNum, vlut[0], vlut[1]);
+
+
if (drawImages_clip(state) == 0)
return;
@@ -1292,6 +1295,8 @@
offs2 = (vlut[1] - _videoWindows[17] + state->y);
}
+ printf("offs %d offs2 %d\n", offs, offs2);
+
state->surf2_addr += offs + offs2 * state->surf2_pitch;
state->surf_addr += offs + offs2 * state->surf_pitch;
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