[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.49,2.50 script_v2.cpp,2.3,2.4

James Brown ender at users.sourceforge.net
Sun Apr 20 10:00:09 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13226/scumm

Modified Files:
	intern.h script_v2.cpp 
Log Message:

o2_actorSet stubs


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -d -r2.49 -r2.50
--- intern.h	20 Apr 2003 16:37:43 -0000	2.49
+++ intern.h	20 Apr 2003 16:59:51 -0000	2.50
@@ -224,6 +224,7 @@
 	void o2_ifNotState20();
 	void o2_ifState10();
 	void o2_ifNotState10();
+	void o2_actorSet();
 	void o2_waitForActor();
 	void o2_waitForSentence();
 	void o2_restart();

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- script_v2.cpp	20 Apr 2003 16:32:44 -0000	2.3
+++ script_v2.cpp	20 Apr 2003 16:59:52 -0000	2.4
@@ -56,7 +56,7 @@
 		OPCODE(o5_getObjectOwner),
 		OPCODE(o5_animateActor),
 		OPCODE(o5_panCameraTo),
-		OPCODE(o5_actorSet),
+		OPCODE(o2_actorSet),
 		/* 14 */
 		OPCODE(o5_print),
 		OPCODE(o5_actorFromPos),
@@ -559,6 +559,33 @@
 	}
 }
 
+void Scumm_v2::o2_actorSet() {
+	int arg1 = getVarOrDirectByte(0x80);
+	int arg2 = getVarOrDirectByte(0x40);
+
+	switch (fetchScriptByte()) {
+		case 1:
+			warning("o2_actorSet(%d, %d) - SoundThingy Not Implemented", arg1, arg2);
+			break;
+
+		case 2:
+			warning("o2_actorSet(%d, %d) - Init(?) Not Implemented", arg1, arg2);
+			break;
+
+		case 3:
+			warning("o2_actorSet(%d, %d) - SetName Not Implemented", arg1, arg2);
+			break;
+
+		case 4:
+			warning("o2_actorSet(%d, %d) - Costume Not Implemented", arg1, arg2);
+			break;
+
+		case 5:
+			warning("o2_actorSet(%d, %d) - TextColor Not Implemented", arg1, arg2);
+			break;
+	}
+}
+
 void Scumm_v2::o2_waitForSentence() {
 	if (_sentenceNum) {
 		if (_sentence[_sentenceNum - 1].freezeCount && !isScriptInUse(_vars[VAR_SENTENCE_SCRIPT]))
@@ -572,3 +599,5 @@
 
 void Scumm_v2::o2_restart() {
 }
+
+





More information about the Scummvm-git-logs mailing list