[Scummvm-cvs-logs] scummvm master -> 559fda409dc3fad9d4058e6d7bde8802211fa781
fingolfin
max at quendi.de
Mon May 9 15:18:06 CEST 2011
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:
559fda409d SCI: Line wrap some comments
Commit: 559fda409dc3fad9d4058e6d7bde8802211fa781
https://github.com/scummvm/scummvm/commit/559fda409dc3fad9d4058e6d7bde8802211fa781
Author: Max Horn (max at quendi.de)
Date: 2011-05-09T05:46:17-07:00
Commit Message:
SCI: Line wrap some comments
Changed paths:
engines/sci/graphics/picture.cpp
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index 7209084..8cdd462 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -509,9 +509,11 @@ void GfxPicture::drawVectorData(byte *data, int dataSize) {
memcpy(&EGApriority, &vector_defaultEGApriority, sizeof(vector_defaultEGApriority));
if (g_sci->getGameId() == GID_ICEMAN) {
- // WORKAROUND: we remove certain visual&priority lines in underwater rooms of iceman, when not dithering the
- // picture. Normally those lines aren't shown, because they share the same color as the dithered
- // fill color combination. When not dithering, those lines would appear and get distracting.
+ // WORKAROUND: we remove certain visual&priority lines in underwater
+ // rooms of iceman, when not dithering the picture. Normally those
+ // lines aren't shown, because they share the same color as the
+ // dithered fill color combination. When not dithering, those lines
+ // would appear and get distracting.
if ((_screen->isUnditheringEnabled()) && ((_resourceId >= 53 && _resourceId <= 58) || (_resourceId == 61)))
icemanDrawFix = true;
}
@@ -618,14 +620,17 @@ void GfxPicture::drawVectorData(byte *data, int dataSize) {
}
break;
- // Pattern opcodes are handled in sierra sci1.1+ as actual NOPs and normally they definitely should not occur
- // inside picture data for such games
+ // Pattern opcodes are handled in sierra sci1.1+ as actual NOPs and
+ // normally they definitely should not occur inside picture data for
+ // such games.
case PIC_OP_SET_PATTERN:
if (_resourceType >= SCI_PICTURE_TYPE_SCI11) {
if (g_sci->getGameId() == GID_SQ4) {
- // WORKAROUND: For SQ4 / for some pictures handle this like a terminator
- // This picture includes garbage data, first a set pattern w/o parameter and then short pattern
- // I guess that garbage is a left over from the sq4-floppy (sci1) to sq4-cd (sci1.1) conversion
+ // WORKAROUND: For SQ4 / for some pictures handle this like
+ // a terminator. This picture includes garbage data, first a
+ // set pattern w/o parameter and then short pattern. I guess
+ // that garbage is a left over from the sq4-floppy (sci1) to
+ // sq4-cd (sci1.1) conversion.
switch (_resourceId) {
case 35:
case 381:
@@ -857,7 +862,8 @@ void GfxPicture::vectorGetPatternTexture(byte *data, int &curPos, int16 pattern_
}
}
-// Do not replace w/ some generic code. This algo really needs to behave exactly as the one from sierra
+// WARNING: Do not replace the following code with something else, like generic
+// code. This algo really needs to behave exactly as the one from sierra.
void GfxPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, byte control) {
Port *curPort = _ports->getPort();
Common::Stack<Common::Point> stack;
More information about the Scummvm-git-logs
mailing list