[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.312,1.313 actor.h,1.74,1.75 akos.cpp,1.197,1.198 base-costume.h,1.32,1.33 script_v100he.cpp,2.13,2.14 script_v72he.cpp,2.169,2.170 script_v80he.cpp,2.56,2.57
Travis Howell
kirben at users.sourceforge.net
Tue Oct 12 07:14:57 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga ite_introproc.cpp,1.27,1.28 music.cpp,1.24,1.25 music.h,1.9,1.10 saga.cpp,1.53,1.54 scene.cpp,1.44,1.45 sfuncs.cpp,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.172,1.173
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7501/scumm
Modified Files:
actor.cpp actor.h akos.cpp base-costume.h script_v100he.cpp
script_v72he.cpp script_v80he.cpp
Log Message:
Rename vars
Add some missng code for HE games.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- actor.cpp 12 Oct 2004 04:26:02 -0000 1.312
+++ actor.cpp 12 Oct 2004 14:12:19 -0000 1.313
@@ -62,7 +62,7 @@
frame = 0;
_walkbox = 0;
animProgress = 0;
- skipLimb = false;
+ skipLimbs = false;
drawToBackBuf = false;
memset(animVariable, 0, sizeof(animVariable));
memset(palette, 0, sizeof(palette));
@@ -83,14 +83,14 @@
_pos.y = 0;
facing = 180;
condMask = 1;
- talkUnk = 0;
+ noTalkAnimation = 0;
if (_vm->_version >= 7)
visible = false;
- skipLimb = false;
+ skipLimbs = false;
} else if (mode == 2) {
facing = 180;
condMask = 1;
- skipLimb = false;
+ skipLimbs = false;
}
_elevation = 0;
width = 24;
@@ -1079,10 +1079,10 @@
bcr->_draw_top = 0x7fffffff;
bcr->_draw_bottom = 0;
- bcr->_skipLimb = (skipLimb != 0);
+ bcr->_skipLimbs = (skipLimbs != 0);
bcr->_paletteNum = paletteNum;
- if (_vm->_heversion >= 80 && talkUnk == 0) {
+ if (_vm->_heversion >= 80 && noTalkAnimation == 0) {
condMask &= 0xFFFFFC00;
condMask |= 1;
if (_vm->getTalkingActor() == number) {
@@ -1092,7 +1092,7 @@
setTalkCondition(rnd);
}
}
- talkUnk = 0;
+ noTalkAnimation = 0;
// If the actor is partially hidden, redraw it next frame.
// Only done for pre-AKOS, though.
@@ -1352,7 +1352,7 @@
int i;
if ((_vm->_features & GF_HUMONGOUS) && (c == -1 || c == -2)) {
- skipLimb = (c == -1);
+ skipLimbs = (c == -1);
needRedraw = true;
return;
}
@@ -2017,7 +2017,7 @@
MKLINE(Actor, cost.soundCounter, sleByte, VER(8)),
MKLINE(Actor, drawToBackBuf, sleByte, VER(32)),
MKLINE(Actor, flip, sleByte, VER(32)),
- MKLINE(Actor, skipLimb, sleByte, VER(32)),
+ MKLINE(Actor, skipLimbs, sleByte, VER(32)),
// Actor palette grew from 64 to 256 bytes
MKARRAY_OLD(Actor, palette[0], sleByte, 64, VER(8), VER(9)),
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- actor.h 12 Oct 2004 04:26:02 -0000 1.74
+++ actor.h 12 Oct 2004 14:12:20 -0000 1.75
@@ -126,15 +126,18 @@
int16 talkPosX, talkPosY;
uint16 talkScript, walkScript;
bool ignoreTurns;
- bool skipLimb;
bool drawToBackBuf;
- bool _talking;
int8 _layer;
uint16 sound[32];
CostumeData cost;
- uint32 condMask;
- bool talkUnk;
+
+ /* HE specific */
byte paletteNum;
+ bool noTalkAnimation;
+ bool skipLimbs;
+ bool _talking;
+ uint32 condMask;
+
AuxBlock auxBlock;
struct {
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- akos.cpp 12 Oct 2004 04:26:02 -0000 1.197
+++ akos.cpp 12 Oct 2004 14:12:20 -0000 1.198
@@ -358,7 +358,7 @@
seq3Idx[i] = i;
}
- if (_skipLimb)
+ if (_skipLimbs)
return 0;
if (_vm->_heversion >= 70 && cost.active[limb] == 8)
Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- base-costume.h 12 Oct 2004 04:26:02 -0000 1.32
+++ base-costume.h 12 Oct 2004 14:12:20 -0000 1.33
@@ -63,7 +63,7 @@
int _draw_top, _draw_bottom;
byte _paletteNum;
- bool _skipLimb;
+ bool _skipLimbs;
bool _actorDrawVirScr;
@@ -116,7 +116,7 @@
_xmove = _ymove = 0;
_mirror = false;
_width = _height = 0;
- _skipLimb = 0;
+ _skipLimbs = 0;
_paletteNum = 0;
}
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- script_v100he.cpp 12 Oct 2004 04:26:02 -0000 2.13
+++ script_v100he.cpp 12 Oct 2004 14:12:20 -0000 2.14
@@ -562,7 +562,7 @@
break;
case 142:
k = pop();
- a->talkUnk = 1;
+ a->noTalkAnimation = 1;
a->setTalkCondition(k);
debug(1,"o100_actorOps: case 24 (%d)", k);
break;
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.169
retrieving revision 2.170
diff -u -d -r2.169 -r2.170
--- script_v72he.cpp 12 Oct 2004 04:26:02 -0000 2.169
+++ script_v72he.cpp 12 Oct 2004 14:12:20 -0000 2.170
@@ -1071,7 +1071,7 @@
break;
case 24: // HE 80+
k = pop();
- a->talkUnk = 1;
+ a->noTalkAnimation = 1;
a->setTalkCondition(k);
debug(1,"o72_actorOps: case 24 (%d)", k);
break;
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.56
retrieving revision 2.57
diff -u -d -r2.56 -r2.57
--- script_v80he.cpp 10 Oct 2004 05:49:30 -0000 2.56
+++ script_v80he.cpp 12 Oct 2004 14:12:20 -0000 2.57
@@ -636,30 +636,60 @@
void ScummEngine_v80he::o80_unknownE0() {
// wizImage related
- int a, b, c, d, e, f, type = 1;
+ int b, c, d, num, x1, y1, type = 0;
- a = pop();
b = pop();
+ num = pop();
c = pop();
d = pop();
- e = pop();
- f = pop();
+ y1 = pop();
+ x1 = pop();
byte subOp = fetchScriptByte();
switch (subOp) {
case 55:
+ {
+ Actor *a = derefActorSafe(num, "o80_unknownE0");
+ 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;
+
type = 2;
+ }
break;
case 63:
+ {
+ WizImage wi;
+ wi.flags = 0;
+ wi.y1 = y1;
+ wi.x1 = x1;
+ wi.resNum = num;
+ wi.state = 0;
+ displayWizImage(&wi);
+
type = 3;
+ }
break;
case 66:
type = 1;
break;
+ default:
+ error("o80_unknownE0: default case %d", subOp);
}
- debug(1,"o80_unknownE0 stub: type %d (%d, %d, %d, %d, %d, %d)",subOp, a, b, c, d, e, f);
+ debug(1,"o80_unknownE0 stub: type %d (%d, num %d, %d, %d, y %d, x %d)", type, b, num, c, d, y1, x1);
}
void ScummEngine_v80he::o80_pickVarRandom() {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga ite_introproc.cpp,1.27,1.28 music.cpp,1.24,1.25 music.h,1.9,1.10 saga.cpp,1.53,1.54 scene.cpp,1.44,1.45 sfuncs.cpp,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.172,1.173
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list