[Scummvm-cvs-logs] CVS: scummvm/scumm actor.h,1.46,1.47 script_v2.cpp,2.225,2.226 script_v5.cpp,1.219,1.220 script_v6.cpp,1.244,1.245 script_v8.cpp,2.213,2.214
Max Horn
fingolfin at users.sourceforge.net
Mon Jan 5 08:31:03 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.198,1.199 actor.h,1.45,1.46 akos.cpp,1.92,1.93 base-costume.cpp,2.9,2.10 base-costume.h,1.15,1.16 costume.cpp,1.122,1.123 debugger.cpp,1.106,1.107 script_v2.cpp,2.224,2.225 script_v5.cpp,1.218,1.219 script_v6.cpp,1.243,1.244 script_v8.cpp,2.212,2.213 scumm.h,1.347,1.348 string.cpp,1.177,1.178
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.93,1.94 costume.cpp,1.123,1.124 debugger.cpp,1.107,1.108
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv18785
Modified Files:
actor.h script_v2.cpp script_v5.cpp script_v6.cpp
script_v8.cpp
Log Message:
more cleanup
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- actor.h 5 Jan 2004 16:19:13 -0000 1.46
+++ actor.h 5 Jan 2004 16:30:00 -0000 1.47
@@ -105,12 +105,12 @@
byte walkbox;
int16 talkPosX, talkPosY;
uint16 talkScript, walkScript;
- bool ignoreTurns; // TODO - we do not honor this flag at all currently!
+ bool ignoreTurns;
int8 layer;
uint16 sound[8];
CostumeData cost;
- byte palette[256];
protected:
+ byte palette[256];
int elevation;
uint16 facing;
uint16 targetFacing;
@@ -206,6 +206,19 @@
}
}
+ void setPalette(int idx, int val) {
+ palette[idx] = val;
+ needRedraw = true;
+ }
+
+ void setScale(int sx, int sy) {
+ if (sx != -1)
+ scalex = sx;
+ if (sy != -1)
+ scaley = sy;
+ needRedraw = true;
+ }
+
void classChanged(int cls, bool value);
// Used by the save/load syste:
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.225
retrieving revision 2.226
diff -u -d -r2.225 -r2.226
--- script_v2.cpp 5 Jan 2004 16:19:13 -0000 2.225
+++ script_v2.cpp 5 Jan 2004 16:30:00 -0000 2.226
@@ -691,8 +691,7 @@
else
i = fetchScriptByte();
- a->palette[i] = arg;
- a->needRedraw = true;
+ a->setPalette(i, arg);
break;
case 3: // SO_ACTOR_NAME
loadPtrToResource(rtActorName, a->number, NULL);
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- script_v5.cpp 5 Jan 2004 16:19:13 -0000 1.219
+++ script_v5.cpp 5 Jan 2004 16:30:00 -0000 1.220
@@ -459,8 +459,7 @@
i = getVarOrDirectByte(PARAM_1);
j = getVarOrDirectByte(PARAM_2);
checkRange(31, 0, i, "Illegal palette slot %d");
- a->palette[i] = j;
- a->needRedraw = true;
+ a->setPalette(i, j);
break;
case 12: // SO_TALK_COLOR
@@ -498,13 +497,13 @@
break;
case 17: // SO_ACTOR_SCALE
if (_version == 4) {
- a->scalex = a->scaley = getVarOrDirectByte(PARAM_1);
+ i = j = getVarOrDirectByte(PARAM_1);
} else {
- a->scalex = getVarOrDirectByte(PARAM_1);
- a->scaley = getVarOrDirectByte(PARAM_2);
+ i = getVarOrDirectByte(PARAM_1);
+ j = getVarOrDirectByte(PARAM_2);
}
- a->needRedraw = true;
+ a->setScale(i, j);
break;
case 18: // SO_NEVER_ZCLIP
a->forceClip = 0;
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- script_v6.cpp 5 Jan 2004 16:19:13 -0000 1.244
+++ script_v6.cpp 5 Jan 2004 16:30:00 -0000 1.245
@@ -1705,8 +1705,7 @@
j = pop();
i = pop();
checkRange(255, 0, i, "Illegal palette slot %d");
- a->palette[i] = j;
- a->needRedraw = true;
+ a->setPalette(i, j);
break;
case 87: // SO_TALK_COLOR
a->talkColor = pop();
@@ -1721,8 +1720,8 @@
a->width = pop();
break;
case 92: // SO_SCALE
- a->scalex = a->scaley = pop();
- a->needRedraw = true;
+ i = pop();
+ a->setScale(i, i);
break;
case 93: // SO_NEVER_ZCLIP
a->forceClip = 0;
@@ -2546,8 +2545,7 @@
break;
case 107:
a = derefActor(args[1], "o6_kernelSetFunctions: 107");
- a->scalex = (unsigned char)args[2];
- a->needRedraw = true;
+ a->setScale((unsigned char)args[2], -1);
break;
case 108:
setupShadowPalette(args[1], args[2], args[3], args[4], args[5], args[6]);
@@ -2610,8 +2608,7 @@
break;
case 107: /* set actor scale */
a = derefActor(args[1], "o6_kernelSetFunctions: 107");
- a->scalex = (unsigned char)args[2];
- a->needRedraw = true;
+ a->setScale((unsigned char)args[2], -1);
break;
case 108: /* create proc_special_palette */
case 109:
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.213
retrieving revision 2.214
diff -u -d -r2.213 -r2.214
--- script_v8.cpp 5 Jan 2004 16:19:13 -0000 2.213
+++ script_v8.cpp 5 Jan 2004 16:30:00 -0000 2.214
@@ -973,8 +973,7 @@
j = pop();
i = pop();
checkRange(31, 0, i, "Illegal palette slot %d");
- a->palette[i] = j;
- a->needRedraw = true;
+ a->setPalette(i, j);
break;
case 0x70: // SO_ACTOR_TALK_COLOR Set actor talk color
a->talkColor = pop();
@@ -986,8 +985,8 @@
a->width = pop();
break;
case 0x73: // SO_ACTOR_SCALE Set scaling of actor
- a->scalex = a->scaley = pop();
- a->needRedraw = true;
+ i = pop();
+ a->setScale(i, i);
break;
case 0x74: // SO_ACTOR_NEVER_ZCLIP
a->forceClip = 0;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.198,1.199 actor.h,1.45,1.46 akos.cpp,1.92,1.93 base-costume.cpp,2.9,2.10 base-costume.h,1.15,1.16 costume.cpp,1.122,1.123 debugger.cpp,1.106,1.107 script_v2.cpp,2.224,2.225 script_v5.cpp,1.218,1.219 script_v6.cpp,1.243,1.244 script_v8.cpp,2.212,2.213 scumm.h,1.347,1.348 string.cpp,1.177,1.178
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.93,1.94 costume.cpp,1.123,1.124 debugger.cpp,1.107,1.108
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list