diff options
author | Travis Howell | 2005-04-12 07:52:15 +0000 |
---|---|---|
committer | Travis Howell | 2005-04-12 07:52:15 +0000 |
commit | eed70f3dbac9cea01375b3351aa4702d510cfbe5 (patch) | |
tree | bb5b2de4cdbf63a2c9f735aa945a0d5a7be3ee7d /scumm | |
parent | 03f07f7f8ab1844fd8e197d607b6e4203f4d5f3a (diff) | |
download | scummvm-rg350-eed70f3dbac9cea01375b3351aa4702d510cfbe5.tar.gz scummvm-rg350-eed70f3dbac9cea01375b3351aa4702d510cfbe5.tar.bz2 scummvm-rg350-eed70f3dbac9cea01375b3351aa4702d510cfbe5.zip |
Cleanup
svn-id: r17564
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/script_v72he.cpp | 2 | ||||
-rw-r--r-- | scumm/script_v80he.cpp | 75 |
2 files changed, 25 insertions, 52 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index a78b073100..f308b2d140 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -2093,7 +2093,7 @@ void ScummEngine_v72he::o72_readINI() { default: 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() { diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index d12d9b75c0..c0413ddd0f 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -473,7 +473,7 @@ void ScummEngine_v80he::o80_readConfigFile() { default: 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() { @@ -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) { 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 var_4, var_8, var_C; - - // edx is never set? - edx = 0; - - ebx = 0; - var_C = 0; + int eax, ebx, ecx, edx, esi; + int var_4, var_8, var_C, y; if (unk2 < 0) { unk2 = -unk2; @@ -617,38 +611,17 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int unk2 = 1; } - eax = x; - ecx = x1; - - esi = unk1; - y = y1; - - eax -= ecx; - esi -= y; + var_4 = unk1 - y1; + var_8 = x - x1; - var_8 = eax; - var_4 = esi; - - edp = eax; - eax = esi; - - edp ^= edx; - edp -= edx; - - eax ^= edx; - eax -= edx; - - esi = edp; - - y1 = eax; + x = x1; + y = var_4; - if (eax > edp) { - esi = eax; + esi = var_8; + if (var_4 > var_8) { + esi = var_4; } - x = x1; - x1 = 0; - if (type == 2) { Actor *a = derefActorSafe(id, "unknownE0"); a->drawActorToBackBuf(x1, y1); @@ -664,10 +637,14 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int unknownE0Helper(x1, y1, id); } + x1 = 0; + ebx = 0; + edx = 0; + var_C = 0; for (int i = 0; i <= esi; i++) { ecx = x1; - eax = y1; - ebx += edp; + eax = y; + ebx += var_8; ecx += eax; eax ^= eax; @@ -678,31 +655,27 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int edx -= esi; eax = 1; - int tmp = edx; - edx = x; - if (tmp >= 0) { - edx++; + if (edx >= 0) { + x++; } else { - edx--; + x--; } - - x = edx; } + if (ecx > esi) { eax = var_4; - ecx -= esi; + x1 -= esi; - x1 = ecx; if (eax >= 0) { y++; } else { y--; } + } else { + if (eax == 0) + continue; } - if (eax == 0) - continue; - ecx = var_C; eax = ecx; eax /= unk2; |