aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2003-04-20 16:59:52 +0000
committerJames Brown2003-04-20 16:59:52 +0000
commit4182b359f9d7ce07b55ec48377b6149ec24529bc (patch)
tree3199384237b4106994ceac20b188232bc6d69e4d
parent47114e1da2790eff6ef9be716a6f8df1009e75da (diff)
downloadscummvm-rg350-4182b359f9d7ce07b55ec48377b6149ec24529bc.tar.gz
scummvm-rg350-4182b359f9d7ce07b55ec48377b6149ec24529bc.tar.bz2
scummvm-rg350-4182b359f9d7ce07b55ec48377b6149ec24529bc.zip
o2_actorSet stubs
svn-id: r7037
-rw-r--r--scumm/intern.h1
-rw-r--r--scumm/script_v2.cpp31
2 files changed, 31 insertions, 1 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 35e9f8131a..1fa6e1e065 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -224,6 +224,7 @@ protected:
void o2_ifNotState20();
void o2_ifState10();
void o2_ifNotState10();
+ void o2_actorSet();
void o2_waitForActor();
void o2_waitForSentence();
void o2_restart();
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index c2b7d5f9ab..87e1157d3c 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -56,7 +56,7 @@ void Scumm_v2::setupOpcodes() {
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_waitForActor() {
}
}
+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_waitForSentence() {
void Scumm_v2::o2_restart() {
}
+
+