[Scummvm-git-logs] scummvm master -> 56847a1051e80dd2249fdfd08617673d51e02cca
AndywinXp
noreply at scummvm.org
Sun Aug 18 18:23:15 UTC 2024
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:
56847a1051 SCUMM: Fix warning
Commit: 56847a1051e80dd2249fdfd08617673d51e02cca
https://github.com/scummvm/scummvm/commit/56847a1051e80dd2249fdfd08617673d51e02cca
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-18T20:23:09+02:00
Commit Message:
SCUMM: Fix warning
"operator '?:' has lower precedence than '+'; '+' will be evaluated first [-Wparentheses]"
Changed paths:
engines/scumm/verbs.cpp
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 66c2335c507..62587e8eef7 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -1150,7 +1150,7 @@ void ScummEngine::drawVerb(int verb, int mode) {
if (isRtl)
vs->curRect.left = _charset->_str.left;
- vs->curRect.right = pixelXOffset + (_game.version <= 2) ? MIN<int>(vs->curRect.left + (getResourceSize(rtVerb, verb) - 1) * 8, _screenWidth) : _charset->_str.right;
+ vs->curRect.right = pixelXOffset + ((_game.version <= 2) ? MIN<int>(vs->curRect.left + (getResourceSize(rtVerb, verb) - 1) * 8, _screenWidth) : _charset->_str.right);
vs->curRect.bottom = _charset->_str.bottom + pixelYOffset;
vs->oldRect = _charset->_str;
_charset->_str.left = _charset->_str.right;
More information about the Scummvm-git-logs
mailing list