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

[mduggan]

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:
1008e51d29 ULTIMA8: Fix clipping of map chunks
fa94c252d9 ULTIMA8: Fix sweepTest that I broke before


Commit: 1008e51d294884bf1eaa962f55877402e185d07d
    https://github.com/scummvm/scummvm/commit/1008e51d294884bf1eaa962f55877402e185d07d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-04-25T21:23:17+09:00

Commit Message:
ULTIMA8: Fix clipping of map chunks

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


diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index 0448925895..c8e8b50518 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -423,10 +423,10 @@ void CurrentMap::unsetChunkFast(int32 cx, int32 cy) {
 }
 
 void CurrentMap::clipMapChunks(int &minx, int &maxx, int &miny, int &maxy) const {
-	CLIP(minx, 0, MAP_NUM_CHUNKS - 1);
-	CLIP(maxx, 0, MAP_NUM_CHUNKS - 1);
-	CLIP(miny, 0, MAP_NUM_CHUNKS - 1);
-	CLIP(maxy, 0, MAP_NUM_CHUNKS - 1);
+	minx = CLIP(minx, 0, MAP_NUM_CHUNKS - 1);
+	maxx = CLIP(maxx, 0, MAP_NUM_CHUNKS - 1);
+	miny = CLIP(miny, 0, MAP_NUM_CHUNKS - 1);
+	maxy = CLIP(maxy, 0, MAP_NUM_CHUNKS - 1);
 }
 
 void CurrentMap::areaSearch(UCList *itemlist, const uint8 *loopscript,


Commit: fa94c252d98a462c338fe62e6aeafb005b1f6a26
    https://github.com/scummvm/scummvm/commit/fa94c252d98a462c338fe62e6aeafb005b1f6a26
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-04-25T21:47:53+09:00

Commit Message:
ULTIMA8: Fix sweepTest that I broke before

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


diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index c8e8b50518..fe560874b3 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -924,6 +924,8 @@ bool CurrentMap::sweepTest(const int32 start[3], const int32 end[3],
 		ext[i] = dims[i] / 2;
 		centre[i] = start[i] - ext[i];
 	}
+	// Z is opposite direction to x and y..
+	centre[2] = start[2] + ext[2];
 
 //	pout << "Sweeping from (" << -ext[0] << ", " << -ext[1] << ", " << -ext[2] << ")" << Std::endl;
 //	pout << "              (" << ext[0] << ", " << ext[1] << ", " << ext[2] << ")" << Std::endl;