aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-06-03 07:12:18 +0200
committerStrangerke2014-06-03 07:12:49 +0200
commit5d9e31c708849ef495e07da9271e1039d177a0d4 (patch)
tree9961b7b6e995cea6581443c89098b810f0235902 /engines
parent6d73870431d0a713520f09d7d8eb4f4512651f23 (diff)
downloadscummvm-rg350-5d9e31c708849ef495e07da9271e1039d177a0d4.tar.gz
scummvm-rg350-5d9e31c708849ef495e07da9271e1039d177a0d4.tar.bz2
scummvm-rg350-5d9e31c708849ef495e07da9271e1039d177a0d4.zip
CGE2: Fix rounding error, remove (original) debug code
Diffstat (limited to 'engines')
-rw-r--r--engines/cge2/vga13h.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index cfcf25f802..fb219998de 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -528,9 +528,9 @@ void Sprite::gotoxyz(V2D pos) {
if (!_follow) {
double m = _vm->_eye->_z / (_pos3D._z - _vm->_eye->_z);
- _pos3D._x = (_vm->_eye->_x + V2D::round(_vm->_eye->_x - _pos2D.x) / m);
+ _pos3D._x = V2D::round(_vm->_eye->_x + (_vm->_eye->_x - _pos2D.x) / m);
if (!_constY)
- _pos3D._y = (_vm->_eye->_y + V2D::round(_vm->_eye->_y - _pos2D.y) / m);
+ _pos3D._y = V2D::round(_vm->_eye->_y + (_vm->_eye->_y - _pos2D.y) / m);
}
if (_next && _next->_flags._slav)
@@ -538,9 +538,6 @@ void Sprite::gotoxyz(V2D pos) {
if (_flags._shad)
_prev->gotoxyz(_prev->_pos2D - o + _pos2D);
-
- if (_ref == 141 && _pos3D._y >= 5)
- warning("Sprite::gotoxyz - asm nop");
}
void Sprite::gotoxyz_(V2D pos) {