[Scummvm-git-logs] scummvm master -> a76c476b19236a6e7c1a87c63117dddc07a7e010

[sluicebox]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a9b4ec721c CRYO: Add newline to end of eden_graphics.h
a76c476b19 HDB: Use fabs instead of abs for doubles


Commit: a9b4ec721cc865b1b06428f6c81769474b49f039
    https://github.com/scummvm/scummvm/commit/a9b4ec721cc865b1b06428f6c81769474b49f039
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-09-21T16:26:19-07:00

Commit Message:
CRYO: Add newline to end of eden_graphics.h

Changed paths:
    engines/cryo/eden_graphics.h


diff --git a/engines/cryo/eden_graphics.h b/engines/cryo/eden_graphics.h
index 05bb688..429e814 100644
--- a/engines/cryo/eden_graphics.h
+++ b/engines/cryo/eden_graphics.h
@@ -241,4 +241,4 @@ private:
 
 }   // namespace Cryo
 
-#endif // CRYO_EDEN_GRAPHICS_H
\ No newline at end of file
+#endif // CRYO_EDEN_GRAPHICS_H


Commit: a76c476b19236a6e7c1a87c63117dddc07a7e010
    https://github.com/scummvm/scummvm/commit/a76c476b19236a6e7c1a87c63117dddc07a7e010
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-09-21T16:27:58-07:00

Commit Message:
HDB: Use fabs instead of abs for doubles

Fixes VS2015 build

Changed paths:
    engines/hdb/ai-cinematic.cpp


diff --git a/engines/hdb/ai-cinematic.cpp b/engines/hdb/ai-cinematic.cpp
index c592c77..0189e2e 100644
--- a/engines/hdb/ai-cinematic.cpp
+++ b/engines/hdb/ai-cinematic.cpp
@@ -166,8 +166,8 @@ void AI::processCines() {
 			_cameraX += _cine[i]->xv;
 			_cameraY += _cine[i]->yv;
 			debug(3, "C_MOVECAMERA: _cine[%d]->xv: %f, _cine[%d]->yv: %f", i, _cine[i]->xv, i, _cine[i]->yv);
-			debug(3, "C_MOVECAMERA: abs(_cameraX - _cine[i]->x): %f, abs(_cameraY - _cine[i]->y): %f", abs(_cameraX - _cine[i]->x), abs(_cameraY - _cine[i]->y));
-			if (abs(_cameraX - _cine[i]->x) <= 1 && abs(_cameraY - _cine[i]->y) <= 1) {
+			debug(3, "C_MOVECAMERA: abs(_cameraX - _cine[i]->x): %f, abs(_cameraY - _cine[i]->y): %f", fabs(_cameraX - _cine[i]->x), fabs(_cameraY - _cine[i]->y));
+			if (fabs(_cameraX - _cine[i]->x) <= 1 && fabs(_cameraY - _cine[i]->y) <= 1) {
 				_cameraX = _cine[i]->x;
 				_cameraY = _cine[i]->y;
 				complete = true;