[Scummvm-git-logs] scummvm master -> 4f6b97b4e6b1dcfad8ce3517df2f1b5a17b965f1
AndywinXp
noreply at scummvm.org
Mon Sep 25 19:47:57 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:
4f6b97b4e6 SWORD1: Fix unsigned/signed int16 mismatch
Commit: 4f6b97b4e6b1dcfad8ce3517df2f1b5a17b965f1
https://github.com/scummvm/scummvm/commit/4f6b97b4e6b1dcfad8ce3517df2f1b5a17b965f1
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-09-25T18:05:42+02:00
Commit Message:
SWORD1: Fix unsigned/signed int16 mismatch
Changed paths:
engines/sword1/logic.cpp
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 1cda6d61040..d45c84157e7 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -1876,17 +1876,17 @@ void Logic::plotRouteGrid(Object *megaObject) {
// Parse the grid lines...
for (int j = 0; j < _router->_nBars; j++) {
- _router->_bars[j].x1 = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].y1 = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].x2 = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].y2 = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].xmin = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].ymin = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].xmax = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].ymax = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].dx = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].dy = _resMan->readUint16(fPolygrid); fPolygrid += 2;
- _router->_bars[j].co = _resMan->readUint32(fPolygrid); fPolygrid += 4;
+ _router->_bars[j].x1 = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].y1 = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].x2 = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].y2 = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].xmin = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].ymin = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].xmax = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].ymax = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].dx = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].dy = (int16)_resMan->readUint16(fPolygrid); fPolygrid += 2;
+ _router->_bars[j].co = (int16)_resMan->readUint32(fPolygrid); fPolygrid += 4;
}
// Parse the node points...
More information about the Scummvm-git-logs
mailing list