thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source 
svn-id: r17564
This commit is contained in:
Travis Howell 2005-04-12 07:52:15 +00:00
parent 03f07f7f8a
commit eed70f3dba
2 changed files with 26 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/script_v72he.cpp
View file

@ -2093,7 +2093,7 @@ void ScummEngine_v72he::o72_readINI() {
default: default:
error("o72_readINI: default type %d", type); error("o72_readINI: default type %d", type);
} }
debug(1, "o72_readINI (%d) %s", type, option); debug(0, "o72_readINI (%d) %s", type, option);
} }
void ScummEngine_v72he::o72_writeINI() { void ScummEngine_v72he::o72_writeINI() {

77
scumm/script_v80he.cpp
View file

@ -473,7 +473,7 @@ void ScummEngine_v80he::o80_readConfigFile() {
default: default:
error("o80_readConfigFile: default type %d", type); error("o80_readConfigFile: default type %d", type);
} }
debug(1, "o80_readConfigFile: Filename %s Section %s Name %s", filename, section, name); debug(0, "o80_readConfigFile: Filename %s Section %s Name %s", filename, section, name);
} }
void ScummEngine_v80he::o80_writeConfigFile() { void ScummEngine_v80he::o80_writeConfigFile() {
@ -601,14 +601,8 @@ void ScummEngine_v80he::o80_drawWizPolygon() {
void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int type, int id) { void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int type, int id) {
debug(0,"unknownE0: x1 %d y1 %d x %d unk1 %d, unk2 %d type %d id %d", x1, y1, x, unk1, unk2, type, id); debug(0,"unknownE0: x1 %d y1 %d x %d unk1 %d, unk2 %d type %d id %d", x1, y1, x, unk1, unk2, type, id);
int eax, ebx, ecx, y, edp, edx, esi; int eax, ebx, ecx, edx, esi;
int var_4, var_8, var_C; int var_4, var_8, var_C, y;
// edx is never set?
edx = 0;
ebx = 0;
var_C = 0;
if (unk2 < 0) { if (unk2 < 0) {
unk2 = -unk2; unk2 = -unk2;
@ -617,37 +611,16 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int
unk2 = 1; unk2 = 1;
} }
eax = x; var_4 = unk1 - y1;
ecx = x1; var_8 = x - x1;
esi = unk1;
y = y1;
eax -= ecx;
esi -= y;
var_8 = eax;
var_4 = esi;
edp = eax;
eax = esi;
edp ^= edx;
edp -= edx;
eax ^= edx;
eax -= edx;
esi = edp;
y1 = eax;
if (eax > edp) {
esi = eax;
}
x = x1; x = x1;
x1 = 0; y = var_4;
esi = var_8;
if (var_4 > var_8) {
esi = var_4;
}
if (type == 2) { if (type == 2) {
Actor *a = derefActorSafe(id, "unknownE0"); Actor *a = derefActorSafe(id, "unknownE0");
@ -664,10 +637,14 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int
unknownE0Helper(x1, y1, id); unknownE0Helper(x1, y1, id);
} }
x1 = 0;
ebx = 0;
edx = 0;
var_C = 0;
for (int i = 0; i <= esi; i++) { for (int i = 0; i <= esi; i++) {
ecx = x1; ecx = x1;
eax = y1; eax = y;
ebx += edp; ebx += var_8;
ecx += eax; ecx += eax;
eax ^= eax; eax ^= eax;
@ -678,31 +655,27 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int
edx -= esi; edx -= esi;
eax = 1; eax = 1;
int tmp = edx; if (edx >= 0) {
edx = x; x++;
if (tmp >= 0) {
edx++;
} else { } else {
edx--; x--;
} }
x = edx;
} }
if (ecx > esi) { if (ecx > esi) {
eax = var_4; eax = var_4;
ecx -= esi; x1 -= esi;
x1 = ecx;
if (eax >= 0) { if (eax >= 0) {
y++; y++;
} else { } else {
y--; y--;
} }
} else {
if (eax == 0)
continue;
} }
if (eax == 0)
continue;
ecx = var_C; ecx = var_C;
eax = ecx; eax = ecx;
eax /= unk2; eax /= unk2;