aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-12-11 10:14:06 +0100
committerWillem Jan Palenstijn2011-12-11 10:14:06 +0100
commit36b8a60eda5db6a9b3597a00ac9184eb608b9ae9 (patch)
tree4df7a25fa777ec474c372134b6e2fd06b57725b7 /engines
parent6b226d5943b61e700a8ec7a3099c99f654f13b89 (diff)
downloadscummvm-rg350-36b8a60eda5db6a9b3597a00ac9184eb608b9ae9.tar.gz
scummvm-rg350-36b8a60eda5db6a9b3597a00ac9184eb608b9ae9.tar.bz2
scummvm-rg350-36b8a60eda5db6a9b3597a00ac9184eb608b9ae9.zip
DREAMWEB: Properly fix workoutFrames regression
Diffstat (limited to 'engines')
-rw-r--r--engines/dreamweb/pathfind.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index bd7412fc7d..f6591d4666 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -278,17 +278,17 @@ void DreamBase::bresenhams() {
void DreamBase::workoutFrames() {
byte tmp;
- uint16 diffx, diffy;
+ int diffx, diffy;
// We have to use signed arithmetic here because these values can
// be slightly negative when walking off-screen
- int lineStartX = data.word(kLinestartx);
- int lineStartY = data.word(kLinestarty);
- int lineEndX = data.word(kLineendx);
- int lineEndY = data.word(kLineendy);
+ int lineStartX = (int16)data.word(kLinestartx);
+ int lineStartY = (int16)data.word(kLinestarty);
+ int lineEndX = (int16)data.word(kLineendx);
+ int lineEndY = (int16)data.word(kLineendy);
- diffx = ABS(lineStartX -lineEndX);
+ diffx = ABS(lineStartX - lineEndX);
diffy = ABS(lineStartY - lineEndY);
if (diffx < diffy) {