libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-26 03:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source 
svn-id: r17840
This commit is contained in:
Travis Howell 2005-04-27 14:47:10 +00:00
parent 8545634aaa
commit 7c3cfae122
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scumm/script_v100he.cpp
View File

@ -589,7 +589,7 @@ void ScummEngine_v100he::o100_arrayOps() {
debug(1,"o100_arrayOps: case %d", subOp);
switch (subOp) {
case 35: // SO_ASSIGN_STRING
case 35:
decodeScriptString(string);
len = resStrLen(string) + 1;
ah = defineArray(array, kStringArray, 0, 0, 0, len);
@ -737,8 +737,9 @@ void ScummEngine_v100he::o100_loadSBNG() {
}
void ScummEngine_v100he::o100_dim2dimArray() {
int a, b, data;
int type = fetchScriptByte();
int data, dim1end, dim2end;
byte type = fetchScriptByte();
switch (type) {
case 41: // SO_BIT_ARRAY
data = kBitArray;
@ -762,9 +763,9 @@ void ScummEngine_v100he::o100_dim2dimArray() {
error("o100_dim2dimArray: default case %d", type);
}
b = pop();
a = pop();
defineArray(fetchScriptWord(), data, 0, a, 0, b);
dim1end = pop();
dim2end = pop();
defineArray(fetchScriptWord(), data, 0, dim2end, 0, dim1end);
}
void ScummEngine_v100he::o100_dimArray() {
@ -801,7 +802,7 @@ void ScummEngine_v100he::o100_dimArray() {
}
void ScummEngine_v100he::o100_unknownE0() {
int id, unk1, unk2, x, x1, y1, type;
int id, unk1, unk2, x, x1, y1;
unk2 = pop();
id = pop();
@ -814,16 +815,13 @@ void ScummEngine_v100he::o100_unknownE0() {
switch (subOp) {
case 1:
type = 2;
unknownE0(x1, y1, x, unk1, unk2, type, id);
unknownE0(x1, y1, x, unk1, unk2, 2, id);
break;
case 20:
type = 1;
unknownE0(x1, y1, x, unk1, unk2, type, id);
unknownE0(x1, y1, x, unk1, unk2, 1, id);
break;
case 40:
type = 3;
unknownE0(x1, y1, x, unk1, unk2, type, id);
unknownE0(x1, y1, x, unk1, unk2, 3, id);
break;
default:
error("o100_unknownE0: default case %d", subOp);

13
scumm/script_v72he.cpp
View File

@ -1534,7 +1534,7 @@ void ScummEngine_v72he::o72_arrayOps() {
dim2start++;
}
break;
case 194: // SO_ASSIGN_STRING
case 194:
decodeScriptString(string);
len = resStrLen(string) + 1;
ah = defineArray(array, kStringArray, 0, 0, 0, len);
@ -1619,8 +1619,9 @@ void ScummEngine_v72he::o72_dimArray() {
void ScummEngine_v72he::o72_dim2dimArray() {
int a, b, data;
int type = fetchScriptByte();
int data, dim1end, dim2end;
byte type = fetchScriptByte();
switch (type) {
case 2: // SO_BIT_ARRAY
data = kBitArray;
@ -1644,9 +1645,9 @@ void ScummEngine_v72he::o72_dim2dimArray() {
error("o72_dim2dimArray: default case %d", type);
}
b = pop();
a = pop();
defineArray(fetchScriptWord(), data, 0, a, 0, b);
dim1end = pop();
dim2end = pop();
defineArray(fetchScriptWord(), data, 0, dim2end, 0, dim1end);
}
void ScummEngine_v72he::o72_traceStatus() {

11
scumm/script_v80he.cpp
View File

@ -745,7 +745,7 @@ void ScummEngine_v80he::unknownE0Helper(int x, int y, int flags) {
}
void ScummEngine_v80he::o80_unknownE0() {
int id, unk1, unk2, x, x1, y1, type;
int id, unk1, unk2, x, x1, y1;
unk2 = pop();
id = pop();
@ -758,16 +758,13 @@ void ScummEngine_v80he::o80_unknownE0() {
switch (subOp) {
case 55:
type = 2;
unknownE0(x1, y1, x, unk1, unk2, type, id);
unknownE0(x1, y1, x, unk1, unk2, 2, id);
break;
case 63:
type = 3;
unknownE0(x1, y1, x, unk1, unk2, type, id);
unknownE0(x1, y1, x, unk1, unk2, 3, id);
break;
case 66:
type = 1;
unknownE0(x1, y1, x, unk1, unk2, type, id);
unknownE0(x1, y1, x, unk1, unk2, 1, id);
break;
default:
error("o80_unknownE0: default case %d", subOp);