aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2002-03-07 05:41:53 +0000
committerJames Brown2002-03-07 05:41:53 +0000
commitf5ff443424e1316cdcd6fed036a9dab97a1bbade (patch)
tree49959fb45679418b141d39856b066149c503c471
parentfe991a1a064340edc71b8ce2f14f8291bc888a8e (diff)
downloadscummvm-rg350-f5ff443424e1316cdcd6fed036a9dab97a1bbade.tar.gz
scummvm-rg350-f5ff443424e1316cdcd6fed036a9dab97a1bbade.tar.bz2
scummvm-rg350-f5ff443424e1316cdcd6fed036a9dab97a1bbade.zip
Rename o6_samGame to o6_bompWindow.
svn-id: r3679
-rw-r--r--script_v2.cpp9
-rw-r--r--scumm.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/script_v2.cpp b/script_v2.cpp
index 710811164c..c0006d1653 100644
--- a/script_v2.cpp
+++ b/script_v2.cpp
@@ -151,7 +151,7 @@ void Scumm::setupOpcodes2() {
&Scumm::o6_setObjectXY,
&Scumm::o6_drawBlastObject,
/* 64 */
- &Scumm::o6_samGame,
+ &Scumm::o6_bompWindow,
&Scumm::o6_stopObjectCode,
&Scumm::o6_stopObjectCode,
&Scumm::o6_endCutscene,
@@ -673,17 +673,18 @@ void Scumm::setupOpcodes2() {
_opcodes = opcode_list;
_opcodes_lookup = opcode_lookup;
}
-void Scumm::o6_samGame() {
+void Scumm::o6_bompWindow() { // Set BOMP processing window
int a, b, c, d;
- // Sam and Max game opcode
+
d = pop();
c = pop();
b = pop();
a = pop();
-
+ warning("o6_bompWindow(%d, %d, %d, %d)", a, b, c, d);
// sub_274EF(a, b, c, d);
}
+
int Scumm::popRoomAndObj(int *room) {
int obj;
diff --git a/scumm.h b/scumm.h
index e2302eb71c..9747673cbc 100644
--- a/scumm.h
+++ b/scumm.h
@@ -1414,7 +1414,7 @@ struct Scumm {
void o5_oldRoomEffect();
void o5_pickupObjectOld();
- void o6_samGame();
+ void o6_bompWindow();
void o6_pushByte();
void o6_pushWord();
void o6_pushByteVar();