[Scummvm-git-logs] scummvm master -> bfd8c8ed8cea064ab1240a3bdb152cc7df7a3f65
athrxx
athrxx at scummvm.org
Mon Aug 16 16:29:59 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:
bfd8c8ed8c SCUMM: whitespace
Commit: bfd8c8ed8cea064ab1240a3bdb152cc7df7a3f65
https://github.com/scummvm/scummvm/commit/bfd8c8ed8cea064ab1240a3bdb152cc7df7a3f65
Author: athrxx (athrxx at scummvm.org)
Date: 2021-08-16T18:29:47+02:00
Commit Message:
SCUMM: whitespace
Changed paths:
engines/scumm/charset.cpp
engines/scumm/script_v6.cpp
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 7c53c63a85..997e6f16fb 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -474,7 +474,7 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text, uint strLenMax) {
// which would result in a different width result.
// This has never been observed in the game though, and
// as such, we don't handle it.
- text += 4;
+ text += 4;
break;
case 'c':
text += 5;
@@ -1889,7 +1889,7 @@ void CharsetRendererMac::printCharInternal(int chr, int color, bool shadow, int
_macFonts[_curId].drawChar(&_vm->_textSurface, chr, x + 2, y + 2, 0);
_macFonts[_curId].drawChar(_vm->_macScreen, chr, x + 2, y + 2, shadowColor);
- }
+ }
}
_macFonts[_curId].drawChar(&_vm->_textSurface, chr, x + 1, y + 1, 0);
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index a718b507ef..57d2db4ef7 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1421,7 +1421,7 @@ void ScummEngine_v6::o6_getAnimateVariable() {
// We fix that by forcing Pete to play the return animation
// regardless if the ball's foul or not.
if ((_game.id == GID_BASEBALL2001 || _game.id == GID_BASEBALL2003) && \
- _currentRoom == ((_game.id == GID_BASEBALL2001) ? 4 : 3) && \
+ _currentRoom == ((_game.id == GID_BASEBALL2001) ? 4 : 3) && \
vm.slot[_currentScript].number == 2105 && \
a->_costume == ((_game.id == GID_BASEBALL2001) ? 107 : 99) && \
// Room variable 5 to ensure this workaround executes only once at
More information about the Scummvm-git-logs
mailing list