[Scummvm-cvs-logs] SF.net SVN: scummvm: [24348] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 24348
          http://svn.sourceforge.net/scummvm/?rev=24348&view=rev
Author:   kirben
Date:     2006-10-16 02:44:47 -0700 (Mon, 16 Oct 2006)

Log Message:
-----------
Add more opcode differences for WW

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/debug.h
    scummvm/trunk/engines/agos/script.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-16 08:41:50 UTC (rev 24347)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-16 09:44:47 UTC (rev 24348)
@@ -1984,7 +1984,7 @@
 	return NULL;
 }
 
-Item *AGOSEngine::findMaster(int16 pe, int16 a, int16 n) {
+Item *AGOSEngine::findMaster(int16 a, int16 n) {
 	uint j;
 
 	for (j = 1; j < _itemArraySize; j++) {
@@ -1996,7 +1996,7 @@
 	return NULL;
 }
 
-Item *AGOSEngine::nextMaster(int16 pe, Item *i, int16 a, int16 n) {
+Item *AGOSEngine::nextMaster(Item *i, int16 a, int16 n) {
 	uint j;
 	uint first = itemPtrToID(i) + 1;
 

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2006-10-16 08:41:50 UTC (rev 24347)
+++ scummvm/trunk/engines/agos/agos.h	2006-10-16 09:44:47 UTC (rev 24348)
@@ -1046,8 +1046,8 @@
 	void o_unfreezeZones();
 
 	Item *findInByClass(Item *i, int16 m);
-	Item *findMaster(int16 pe, int16 a, int16 n);
-	Item *nextMaster(int16 pe, Item *item, int16 a, int16 n);
+	Item *findMaster(int16 a, int16 n);
+	Item *nextMaster(Item *item, int16 a, int16 n);
 	int16 levelOf(Item *item);
 	int wordMatch(Item *item, int16 a, int16 n);
 

Modified: scummvm/trunk/engines/agos/debug.h
===================================================================
--- scummvm/trunk/engines/agos/debug.h	2006-10-16 08:41:50 UTC (rev 24347)
+++ scummvm/trunk/engines/agos/debug.h	2006-10-16 09:44:47 UTC (rev 24348)
@@ -503,8 +503,8 @@
 	/* 92 */
 	"IB|GET_CHILDREN",
 	NULL,
-	NULL,
-	NULL,
+	"BB|FIND_MASTER",
+	"IBB|NEXT_MASTER",
 	/* 96 */
 	"WB|PICTURE",
 	"W|LOAD_ZONE",
@@ -736,8 +736,8 @@
 	/* 92 */
 	"IB|GET_CHILDREN",
 	NULL,
-	NULL,
-	NULL,
+	"BB|FIND_MASTER",
+	"IBB|NEXT_MASTER",
 	/* 96 */
 	"WB|PICTURE",
 	"W|LOAD_ZONE",

Modified: scummvm/trunk/engines/agos/script.cpp
===================================================================
--- scummvm/trunk/engines/agos/script.cpp	2006-10-16 08:41:50 UTC (rev 24347)
+++ scummvm/trunk/engines/agos/script.cpp	2006-10-16 09:44:47 UTC (rev 24348)
@@ -360,6 +360,8 @@
 	op[75] = &AGOSEngine::oe1_pcName;
 	op[83] = &AGOSEngine::o1_rescan;
 	op[89] = &AGOSEngine::oe2_loadUserGame;
+	op[94] = &AGOSEngine::oe1_findMaster;
+	op[95] = &AGOSEngine::oe1_nextMaster;
 	op[98] = &AGOSEngine::o1_animate;
 	op[99] = &AGOSEngine::o1_stopAnimate;
 	op[123] = &AGOSEngine::oe1_setTime;
@@ -424,6 +426,8 @@
 	op[83] = &AGOSEngine::o1_rescan;
 	op[85] = &AGOSEngine::oww_whereTo;
 	op[89] = &AGOSEngine::oe2_loadUserGame;
+	op[94] = &AGOSEngine::oe1_findMaster;
+	op[95] = &AGOSEngine::oe1_nextMaster;
 	op[98] = &AGOSEngine::o1_animate;
 	op[99] = &AGOSEngine::o1_stopAnimate;
 	op[105] = &AGOSEngine::oww_menu;
@@ -1884,9 +1888,9 @@
 	int a = getVarOrWord();	
 
 	if (a == 1)
-		_subjectItem = findMaster(levelOf(me()), _scriptAdj1,_scriptNoun1);
+		_subjectItem = findMaster(_scriptAdj1,_scriptNoun1);
 	else
-		_objectItem = findMaster(levelOf(me()), _scriptAdj2, _scriptNoun2);
+		_objectItem = findMaster(_scriptAdj2, _scriptNoun2);
 }
 
 void AGOSEngine::oe1_weigh() {
@@ -2047,32 +2051,32 @@
 void AGOSEngine::oe1_findMaster() {
 	// 219: find master
 	int16 ad, no;
-	int16 d = getVarOrWord();
+	int16 d = getVarOrByte();
 
 	ad = (d == 1) ? _scriptAdj1 : _scriptAdj2;
 	no = (d == 1) ? _scriptNoun1 : _scriptNoun2;
 
-	d = getVarOrWord();
+	d = getVarOrByte();
 	if (d == 1)
-		_subjectItem = findMaster(levelOf(me()), ad, no);
+		_subjectItem = findMaster(ad, no);
 	else
-		_objectItem = findMaster(levelOf(me()), ad, no);
+		_objectItem = findMaster(ad, no);
 }
 
 void AGOSEngine::oe1_nextMaster() {
 	// 220: next master
 	int16 ad, no;
 	Item *item = getNextItemPtr();
-	int16 d = getVarOrWord();
+	int16 d = getVarOrByte();
 
 	ad = (d == 1) ? _scriptAdj1 : _scriptAdj2;
 	no = (d == 1) ? _scriptNoun1 : _scriptNoun2;
 
-	d = getVarOrWord();
+	d = getVarOrByte();
 	if (d == 1)
-		_subjectItem = nextMaster(levelOf(me()), item, ad, no);
+		_subjectItem = nextMaster(item, ad, no);
 	else
-		_objectItem = nextMaster(levelOf(me()), item, ad, no);
+		_objectItem = nextMaster(item, ad, no);
 }
 
 void AGOSEngine::oe1_menu() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.