[Scummvm-cvs-logs] scummvm master -> f19fd06e243fabf5a9244c178e056432c575860b
wjp
wjp at usecode.org
Sun Oct 6 14:25:15 CEST 2013
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ead4e83180 WINTERMUTE: Remove presumably outdated off-by-one correction
f19fd06e24 WINTERMUTE: Remove outdated comment
Commit: ead4e831807950116dfe6d6f1be70c30f9eb48f4
https://github.com/scummvm/scummvm/commit/ead4e831807950116dfe6d6f1be70c30f9eb48f4
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-10-06T05:24:38-07:00
Commit Message:
WINTERMUTE: Remove presumably outdated off-by-one correction
This correction no longer seems to be necessary, and removes an
off-by-one in the J.U.L.I.A. Demo main menu screen.
Changed paths:
engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index 67d8f3f..af0215a 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -419,13 +419,6 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect,
position.left = x + transform._offset.x;
position.top = y + transform._offset.y;
- // Crop off-by-ones:
- if (position.left == -1) {
- position.left = 0; // TODO: Something is wrong
- }
- if (position.top == -1) {
- position.top = 0; // TODO: Something is wrong
- }
if (newRect) {
position.top = y;
position.left = x;
Commit: f19fd06e243fabf5a9244c178e056432c575860b
https://github.com/scummvm/scummvm/commit/f19fd06e243fabf5a9244c178e056432c575860b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-10-06T05:24:42-07:00
Commit Message:
WINTERMUTE: Remove outdated comment
Changed paths:
engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index af0215a..c00dd56 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -400,13 +400,6 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect,
transform._rgbaMod = renderer->_forceAlphaColor;
}
-#if 0 // These are kept for reference if BlendMode is reimplemented at some point.
- if (alphaDisable) {
- SDL_SetTextureBlendMode(_texture, SDL_BLENDMODE_NONE);
- } else {
- SDL_SetTextureBlendMode(_texture, SDL_BLENDMODE_BLEND);
- }
-#endif
// TODO: This _might_ miss the intended behaviour by 1 in each direction
// But I think it fits the model used in Wintermute.
Common::Rect srcRect;
More information about the Scummvm-git-logs
mailing list