aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-04-12 02:35:59 +0000
committerTravis Howell2005-04-12 02:35:59 +0000
commit973b4073c90f9b84c02fbf77535377a500e5c5a1 (patch)
treedfe3a9d58624afbbede59f311da3de345b379145 /scumm
parentdea27e2c63bbedcc1dfb51bfb1c0ace902281e2e (diff)
downloadscummvm-rg350-973b4073c90f9b84c02fbf77535377a500e5c5a1.tar.gz
scummvm-rg350-973b4073c90f9b84c02fbf77535377a500e5c5a1.tar.bz2
scummvm-rg350-973b4073c90f9b84c02fbf77535377a500e5c5a1.zip
Sync.
svn-id: r17561
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h2
-rw-r--r--scumm/script_v100he.cpp18
2 files changed, 2 insertions, 18 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 408a2a90ab..364df7fc45 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -872,7 +872,7 @@ protected:
void loadImgSpot(int resId, int state, int16 &x, int16 &y);
void loadWizCursor(int resId);
- void unknownE0(int x1, int y1, int x, int cycles, int arg_10, int type, int resNum);
+ void unknownE0(int x1, int y1, int x, int unk1, int unk2, int type, int id);
void unknownE0Helper(int x, int y, int flags);
/* HE version 80 script opcodes */
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 63f5c5c893..dd5b7b2428 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -417,23 +417,7 @@ void ScummEngine_v100he::o100_actorOps() {
a->_needBgReset = true;
break;
case 9:
- {
- int top_actor = a->_top;
- int bottom_actor = a->_bottom;
- a->_drawToBackBuf = true;
- a->_needRedraw = true;
- a->drawActorCostume();
- a->_drawToBackBuf = false;
- a->_needRedraw = true;
- a->drawActorCostume();
- a->_needRedraw = false;
-
- if (a->_top > top_actor)
- a->_top = top_actor;
- if (a->_bottom < bottom_actor)
- a->_bottom = bottom_actor;
-
- }
+ a->drawActorToBackBuf(a->_pos.x, a->_pos.y);
break;
case 14:
a->_charset = pop();