diff options
author | Lars Persson | 2005-06-21 22:08:21 +0000 |
---|---|---|
committer | Lars Persson | 2005-06-21 22:08:21 +0000 |
commit | 1c69696a9a8878971c4fa925b074498dab757857 (patch) | |
tree | d8f4f2cfea1a3e01bb7f5f5c58fb812d8029ca96 /scumm/logic_he.cpp | |
parent | 4564f0d3bf0d40f5a2ca125df0682969adc8431c (diff) | |
download | scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.tar.gz scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.tar.bz2 scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.zip |
Patches needed to build for SYMBIAN32 WINS/GCC added.
Test built for Symbian and run on P910i without any major problems.
Test built for MSVC6. Changed parts seems to compile ok but there are some problems with MSVC6 and some of the targets which the EPOC build does n't support (KYRA,SAGA).
svn-id: r18430
Diffstat (limited to 'scumm/logic_he.cpp')
-rw-r--r-- | scumm/logic_he.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/scumm/logic_he.cpp b/scumm/logic_he.cpp index db1a88ec85..9909fbb0a3 100644 --- a/scumm/logic_he.cpp +++ b/scumm/logic_he.cpp @@ -401,8 +401,9 @@ int32 LogicHEfunshop::dispatch(int op, int numArgs, int32 *args) { void LogicHEfunshop::op_1004(int32 *args) { double data[8], at, sq; int32 x, y; + int i=0; - for (int i = 0; i <= 6; i += 2) { + for (i = 0; i <= 6; i += 2) { data[i] = getFromArray(args[0], 0, 519 + i); data[i + 1] = getFromArray(args[0], 0, 519 + i + 1); } @@ -414,14 +415,14 @@ void LogicHEfunshop::op_1004(int32 *args) { return; } - for (int i = 0; i <= 6; i += 2) { + for (i = 0; i <= 6; i += 2) { data[i] -= (double)x; data[i + 1] -= (double)y; } double a1 = (double)args[1] * DEG2RAD; - for (int i = 0; i <= 6; i += 2) { + for (i = 0; i <= 6; i += 2) { at = atan2(data[i + 1], data[i]); sq = hypot(data[i + 1], data[i]); @@ -435,14 +436,14 @@ void LogicHEfunshop::op_1004(int32 *args) { int minx = 2; int miny = 3; - for (int i = 0; i <= 6; i += 2) { + for (i = 0; i <= 6; i += 2) { if (data[i] < data[minx]) minx = i; if (data[i + 1] < data[miny]) miny = i + 1; } - for (int i = 0; i <= 6; i += 2) { + for (i = 0; i <= 6; i += 2) { data[i] -= data[minx]; data[i + 1] -= data[miny]; @@ -454,8 +455,8 @@ void LogicHEfunshop::op_1004(int32 *args) { void LogicHEfunshop::op_1005(int32 *args) { double data[8]; double args1, args2; - - for (int i = 520; i <= 526; i += 2) { + int i=0; + for (i = 520; i <= 526; i += 2) { data[i - 520] = getFromArray(args[0], 0, i - 1); data[i - 520 + 1] = getFromArray(args[0], 0, i); } @@ -463,12 +464,12 @@ void LogicHEfunshop::op_1005(int32 *args) { args1 = args[1] * 0.01 + 1; args2 = args[2] * 0.01 + 1; - for (int i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) { data[2 * i] *= args1; data[2 * i + 1] *= args2; } - for (int i = 520; i <= 526; i += 2) { + for (i = 520; i <= 526; i += 2) { putInArray(args[0], 0, i - 1, scumm_round(data[i - 520])); putInArray(args[0], 0, i, scumm_round(data[i - 520 + 1])); } |