diff options
| author | Filippos Karapetis | 2014-12-03 00:53:36 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-03 00:53:36 +0200 |
| commit | 61f654e4eee90d761c06583a67dc9631db9d0d29 (patch) | |
| tree | aaedd1e8739dbb4b89fb19028f9535514deb3e94 | |
| parent | 11d41ace02ce84ab40de2ae315a106950579e2bd (diff) | |
| download | scummvm-rg350-61f654e4eee90d761c06583a67dc9631db9d0d29.tar.gz scummvm-rg350-61f654e4eee90d761c06583a67dc9631db9d0d29.tar.bz2 scummvm-rg350-61f654e4eee90d761c06583a67dc9631db9d0d29.zip | |
ZVISION: Explicitly define which version of atan2() to use
This is needed by MSVC
| -rw-r--r-- | engines/zvision/graphics/render_table.cpp | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/controls/safe_control.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp index 629cbde3cf..5500b50ba8 100644 --- a/engines/zvision/graphics/render_table.cpp +++ b/engines/zvision/graphics/render_table.cpp @@ -200,7 +200,7 @@ void RenderTable::generateTiltLookupTable() { float fovInRadians = (_tiltOptions.fieldOfView * M_PI / 180.0f); float cylinderRadius = halfWidth / tan(fovInRadians); - _tiltOptions.gap = cylinderRadius * atan2(halfHeight / cylinderRadius, 1.0) * _tiltOptions.linearScale; + _tiltOptions.gap = cylinderRadius * atan2((float)(halfHeight / cylinderRadius), 1.0f) * _tiltOptions.linearScale; for (uint y = 0; y < _numRows; ++y) { diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp index de1ece5b19..66ab53085f 100644 --- a/engines/zvision/scripting/controls/safe_control.cpp +++ b/engines/zvision/scripting/controls/safe_control.cpp @@ -181,7 +181,7 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P Common::Point tmp = backgroundImageSpacePos - _center; - float dd = atan2(tmp.x, tmp.y) * 57.29578; + float dd = atan2((float)tmp.x, (float)tmp.y) * 57.29578; int16 dp_state = 360 / _statesCount; |