[Scummvm-git-logs] scummvm master -> 7a2c33623ae91010bc73a77b4c8659008bc70f1a
Strangerke
Strangerke at scummvm.org
Sun May 30 06:33:45 UTC 2021
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:
7a2c33623a TRECISION: Fix some failed template arguments deduction on buildbot
Commit: 7a2c33623ae91010bc73a77b4c8659008bc70f1a
https://github.com/scummvm/scummvm/commit/7a2c33623ae91010bc73a77b4c8659008bc70f1a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2021-05-30T07:33:38+01:00
Commit Message:
TRECISION: Fix some failed template arguments deduction on buildbot
Changed paths:
engines/trecision/3d.cpp
diff --git a/engines/trecision/3d.cpp b/engines/trecision/3d.cpp
index 63fcca5e89..58a8f1f47d 100644
--- a/engines/trecision/3d.cpp
+++ b/engines/trecision/3d.cpp
@@ -641,7 +641,7 @@ void Renderer3D::drawCharacter(uint8 flag) {
// rearranged light values so they can be viewed
for (int a = 0; a < vertexNum; ++a)
- _vVertex[a]._angle = CLIP(_vVertex[a]._angle, 0, 180);
+ _vVertex[a]._angle = CLIP<int32>(_vVertex[a]._angle, 0, 180);
// Calculate the distance of the character from the room
tx = camera->_ex - actor->_px;
@@ -682,8 +682,8 @@ void Renderer3D::drawCharacter(uint8 flag) {
actor->_lim[2] = MIN(y2d, actor->_lim[2]);
actor->_lim[3] = MAX(y2d, actor->_lim[3]);
- actor->_lim[4] = MIN(_vVertex[a]._z, actor->_lim[4]);
- actor->_lim[5] = MAX(_vVertex[a]._z, actor->_lim[5]);
+ actor->_lim[4] = MIN<int32>(_vVertex[a]._z, actor->_lim[4]);
+ actor->_lim[5] = MAX<int32>(_vVertex[a]._z, actor->_lim[5]);
++curVertex;
}
More information about the Scummvm-git-logs
mailing list