[Scummvm-git-logs] scummvm master -> 32e2a5b42070d5347520206081ac12b0dfcdb425
OMGPizzaGuy
noreply at scummvm.org
Wed Oct 11 01:38:48 UTC 2023
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:
32e2a5b420 ULTIMA8: Fix build
Commit: 32e2a5b42070d5347520206081ac12b0dfcdb425
https://github.com/scummvm/scummvm/commit/32e2a5b42070d5347520206081ac12b0dfcdb425
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-10-10T20:38:31-05:00
Commit Message:
ULTIMA8: Fix build
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 590d3a05396..129e268b870 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -48,6 +48,9 @@ namespace Ultima8 {
typedef Std::list<Item *> item_list;
+const int INT_MAX_VALUE = 0x7fffffff;
+const int INT_MIN_VALUE = -INT_MAX_VALUE - 1;
+
CurrentMap::CurrentMap() : _currentMap(0), _eggHatcher(0),
_fastXMin(-1), _fastYMin(-1), _fastXMax(-1), _fastYMax(-1) {
for (unsigned int i = 0; i < MAP_NUM_CHUNKS; i++) {
@@ -742,8 +745,8 @@ PositionInfo CurrentMap::getPositionInfo(const Box &target, const Box &start, ui
ShapeInfo::SI_ROOF);
static const uint32 blockflagmask = (ShapeInfo::SI_SOLID | ShapeInfo::SI_DAMAGING);
- int32 floorz = INT32_MIN;
- int32 roofz = INT32_MAX;
+ int32 floorz = INT_MIN_VALUE;
+ int32 roofz = INT_MAX_VALUE;
int minx = ((target._x - target._xd) / _mapChunkSize) - 1;
int maxx = (target._x / _mapChunkSize) + 1;
More information about the Scummvm-git-logs
mailing list