[Scummvm-git-logs] scummvm master -> 086ce0befab1e226ad3b06e3d19ae338d2ccb1a9

[lephilousophe]

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:
086ce0befa ULTIMA8: Fix int vs. int32 discrepancy


Commit: 086ce0befab1e226ad3b06e3d19ae338d2ccb1a9
    https://github.com/scummvm/scummvm/commit/086ce0befab1e226ad3b06e3d19ae338d2ccb1a9
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-03-08T13:16:37+01:00

Commit Message:
ULTIMA8: Fix int vs. int32 discrepancy

Changed paths:
    engines/ultima/ultima8/world/super_sprite_process.cpp


diff --git a/engines/ultima/ultima8/world/super_sprite_process.cpp b/engines/ultima/ultima8/world/super_sprite_process.cpp
index e0b913ace3..4a267336e2 100644
--- a/engines/ultima/ultima8/world/super_sprite_process.cpp
+++ b/engines/ultima/ultima8/world/super_sprite_process.cpp
@@ -292,7 +292,7 @@ void SuperSpriteProcess::makeBulletSplash(const Point3 &pt) {
 	firetypedat->makeBulletSplashShapeAndPlaySound(pt.x, pt.y, pt.z);
 }
 
-static bool _pointOutOfMap(const int pt[3], int maxxy) {
+static bool _pointOutOfMap(const int32 pt[3], int32 maxxy) {
 	return (pt[0] < 0     || pt[1] < 0     || pt[2] < 0 ||
 			pt[0] > maxxy || pt[1] > maxxy || pt[2] > 255);
 }
@@ -321,7 +321,7 @@ void SuperSpriteProcess::hitAndFinish() {
 		end[0] += xstep;
 		end[1] += ystep;
 		end[2] += zstep;
-		const int mapmax = map->getChunkSize() * MAP_NUM_CHUNKS;
+		const int32 mapmax = map->getChunkSize() * MAP_NUM_CHUNKS;
 		if (_pointOutOfMap(start, mapmax) || _pointOutOfMap(end, mapmax))
 			break;
 	}