[Scummvm-cvs-logs] SF.net SVN: scummvm: [24438] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sun Oct 22 15:20:28 CEST 2006
Revision: 24438
http://svn.sourceforge.net/scummvm/?rev=24438&view=rev
Author: kirben
Date: 2006-10-22 06:20:11 -0700 (Sun, 22 Oct 2006)
Log Message:
-----------
Add extra opcode for Elvira 2
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/debug.h
scummvm/trunk/engines/agos/script_e2.cpp
scummvm/trunk/engines/agos/script_ww.cpp
scummvm/trunk/engines/agos/vga.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2006-10-22 13:04:42 UTC (rev 24437)
+++ scummvm/trunk/engines/agos/agos.h 2006-10-22 13:20:11 UTC (rev 24438)
@@ -1138,6 +1138,7 @@
void oe2_moveDirn();
void oe2_pObj();
void oe2_loadUserGame();
+ void oe2_drawItem();
void oe2_setDoorOpen();
void oe2_setDoorClosed();
void oe2_setDoorLocked();
Modified: scummvm/trunk/engines/agos/debug.h
===================================================================
--- scummvm/trunk/engines/agos/debug.h 2006-10-22 13:04:42 UTC (rev 24437)
+++ scummvm/trunk/engines/agos/debug.h 2006-10-22 13:20:11 UTC (rev 24438)
@@ -527,7 +527,7 @@
"WWW|MOVE_BOX",
/* 112 */
NULL,
- NULL,
+ "IBWW|DRAW_ITEM",
"IB|DO_ICONS",
"IBJ|IS_CLASS",
/* 116 */
@@ -760,7 +760,7 @@
"WWW|MOVE_BOX",
/* 112 */
NULL,
- NULL,
+ "IBWW|DRAW_ITEM",
"IB|DO_ICONS",
"IBJ|IS_CLASS",
/* 116 */
Modified: scummvm/trunk/engines/agos/script_e2.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e2.cpp 2006-10-22 13:04:42 UTC (rev 24437)
+++ scummvm/trunk/engines/agos/script_e2.cpp 2006-10-22 13:20:11 UTC (rev 24438)
@@ -51,6 +51,7 @@
op[95] = &AGOSEngine::oe1_nextMaster;
op[98] = &AGOSEngine::o1_animate;
op[99] = &AGOSEngine::o1_stopAnimate;
+ op[113] = &AGOSEngine::oe2_drawItem;
op[123] = &AGOSEngine::oe1_setTime;
op[127] = &AGOSEngine::o1_playTune;
op[144] = &AGOSEngine::oe2_setDoorOpen;
@@ -95,6 +96,17 @@
getStringPtrByID(getNextStringID());
}
+void AGOSEngine::oe2_drawItem() {
+ // 113: draw item
+ Item *i = getNextItemPtr();
+ int a = getVarOrByte();
+ int x = getVarOrWord();
+ int y = getVarOrWord();
+ mouseOff();
+ draw_icon_c(_windowArray[a % 8], itemGetIconNumber(i), x, y);
+ mouseOn();
+}
+
void AGOSEngine::oe2_setDoorOpen() {
// 144: set door open
Item *i = getNextItemPtr();
Modified: scummvm/trunk/engines/agos/script_ww.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_ww.cpp 2006-10-22 13:04:42 UTC (rev 24437)
+++ scummvm/trunk/engines/agos/script_ww.cpp 2006-10-22 13:20:11 UTC (rev 24438)
@@ -61,6 +61,7 @@
op[99] = &AGOSEngine::o1_stopAnimate;
op[105] = &AGOSEngine::oww_menu;
op[106] = &AGOSEngine::oww_textMenu;
+ op[113] = &AGOSEngine::oe2_drawItem;
op[123] = &AGOSEngine::oe1_setTime;
op[127] = &AGOSEngine::o1_playTune;
op[144] = &AGOSEngine::oe2_setDoorOpen;
Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp 2006-10-22 13:04:42 UTC (rev 24437)
+++ scummvm/trunk/engines/agos/vga.cpp 2006-10-22 13:20:11 UTC (rev 24438)
@@ -146,6 +146,7 @@
op[54] = &AGOSEngine::vc54_dissolveOut;
op[57] = &AGOSEngine::vc57_blackPalette;
op[56] = &AGOSEngine::vc56_fullScreen;
+ op[58] = &AGOSEngine::vc58_checkCodeWheel;
op[59] = &AGOSEngine::vc59_skipIfNotEGA;
}
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