diff options
author | Filippos Karapetis | 2011-12-13 01:14:26 +0200 |
---|---|---|
committer | Filippos Karapetis | 2011-12-13 01:14:26 +0200 |
commit | 1994bf73ce382057b166b49db203f19d5ac25cb6 (patch) | |
tree | 5021eb19cba1aec2f62257304cad69245ea49451 /engines/dreamweb/pathfind.cpp | |
parent | b27a6e72ad63441c561866682bdebb0059db56a3 (diff) | |
download | scummvm-rg350-1994bf73ce382057b166b49db203f19d5ac25cb6.tar.gz scummvm-rg350-1994bf73ce382057b166b49db203f19d5ac25cb6.tar.bz2 scummvm-rg350-1994bf73ce382057b166b49db203f19d5ac25cb6.zip |
DREAMWEB: 'lineroutine', 'increment1', 'increment2' are only used inside bresenhams()
Diffstat (limited to 'engines/dreamweb/pathfind.cpp')
-rw-r--r-- | engines/dreamweb/pathfind.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp index f6591d4666..212d61e6e2 100644 --- a/engines/dreamweb/pathfind.cpp +++ b/engines/dreamweb/pathfind.cpp @@ -230,33 +230,35 @@ void DreamBase::bresenhams() { } uint16 delta1, delta2; + byte lineRoutine; + if (deltaY > deltaX) { - data.byte(kLineroutine) = 1; + lineRoutine = 1; delta1 = deltaY; delta2 = deltaX; } else { - data.byte(kLineroutine) = 0; + lineRoutine = 0; delta1 = deltaX; delta2 = deltaY; } - data.word(kIncrement1) = delta2 * 2; + uint16 increment1 = delta2 * 2; + uint16 increment2 = delta2 * 2 - delta1 * 2; int16 remainder = delta2 * 2 - delta1; - data.word(kIncrement2) = delta2 * 2 - delta1 * 2; ++delta1; int8 x = (int8)startX; int8 y = (int8)startY; data.byte(kLinelength) = delta1; - if (data.byte(kLineroutine) != 1) { + if (lineRoutine != 1) { for (; delta1; --delta1) { lineData->x = x; lineData->y = y; ++lineData; ++x; if (remainder < 0) { - remainder += data.word(kIncrement1); + remainder += increment1; } else { - remainder += data.word(kIncrement2); + remainder += increment2; y += increment; } } @@ -267,9 +269,9 @@ void DreamBase::bresenhams() { ++lineData; y += increment; if (remainder < 0) { - remainder += data.word(kIncrement1); + remainder += increment1; } else { - remainder += data.word(kIncrement2); + remainder += increment2; ++x; } } |