[Scummvm-git-logs] scummvm master -> 2ca3b14fb9682dbdca443d52c6ba610d9568e4a1

[bluegr]

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

Summary:
2ca3b14fb9 NANCY: Fix build failure on MSVC x86


Commit: 2ca3b14fb9682dbdca443d52c6ba610d9568e4a1
    https://github.com/scummvm/scummvm/commit/2ca3b14fb9682dbdca443d52c6ba610d9568e4a1
Author: elasota (ejlasota at gmail.com)
Date: 2023-08-07T10:27:14+03:00

Commit Message:
NANCY: Fix build failure on MSVC x86

Changed paths:
    engines/nancy/action/raycastpuzzle.cpp


diff --git a/engines/nancy/action/raycastpuzzle.cpp b/engines/nancy/action/raycastpuzzle.cpp
index f4d44508e2c..f316d1478a5 100644
--- a/engines/nancy/action/raycastpuzzle.cpp
+++ b/engines/nancy/action/raycastpuzzle.cpp
@@ -1323,8 +1323,8 @@ void RaycastPuzzle::drawMaze() {
 
 	// Draw walls
 	for (int x = viewBounds.left; x <= viewBounds.right; ++x) {
-		int columnAngleForX = _wallCastColumnAngles[x];
-		int rotatedColumnAngleForX = columnAngleForX + _playerRotation;
+		int32 columnAngleForX = _wallCastColumnAngles[x];
+		int32 rotatedColumnAngleForX = columnAngleForX + _playerRotation;
 		clampRotation(rotatedColumnAngleForX);
 
 		float rayStartX = _playerX;
@@ -1334,17 +1334,17 @@ void RaycastPuzzle::drawMaze() {
 		float angleCos = (float)_cosTable[rotatedColumnAngleForX] * 1024.0;
 
 		if (angleSin == 0.0) {
-			angleSin = 0.001;
+			angleSin = 0.001f;
 		}
 
 		if (angleCos == 0.0) {
-			angleCos = 0.001;
+			angleCos = 0.001f;
 		}
 
 		float angleAtan = angleCos / angleSin;
 
 		if (angleAtan == 0.0) {
-			angleAtan = 0.001;
+			angleAtan = 0.001f;
 		}
 
 		bool isBehindTransparentWall = false;
@@ -1751,8 +1751,8 @@ void RaycastPuzzle::drawMaze() {
 
 	// Draw floors and ceilings
 	// TODO exit does not get rendered correctly
-	int leftAngle = _playerRotation + _leftmostAngle;
-	int rightAngle = _playerRotation + _rightmostAngle;
+	int32 leftAngle = _playerRotation + _leftmostAngle;
+	int32 rightAngle = _playerRotation + _rightmostAngle;
 
 	clampRotation(leftAngle);
 	clampRotation(rightAngle);