aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobia Tesan2013-07-16 01:05:08 +0200
committerTobia Tesan2013-08-01 00:24:43 +0200
commitf872d316784b43e394e3c7c3490181fd465b7ba0 (patch)
tree4840b8956a99663ec6a8a71bcd71b98124926c7b
parent1ecdd2d61ad6dcf809c0cfaa37e7d9bbceb6bad3 (diff)
downloadscummvm-rg350-f872d316784b43e394e3c7c3490181fd465b7ba0.tar.gz
scummvm-rg350-f872d316784b43e394e3c7c3490181fd465b7ba0.tar.bz2
scummvm-rg350-f872d316784b43e394e3c7c3490181fd465b7ba0.zip
WINTERMUTE: Fix type-related warnings in base_surface_osystem.cpp
-rw-r--r--engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index e01a669a2c..e90df52e38 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -361,9 +361,9 @@ bool BaseSurfaceOSystem::displayZoom(int x, int y, Rect32 rect, float zoomX, flo
bool BaseSurfaceOSystem::displayTransform(int x, int y, Rect32 rect, Rect32 newRect, const TransformStruct &transform) {
_rotation = (uint32)transform._angle;
if (transform._angle < 0.0f) {
- warning("Negative rotation: %f %d", transform._angle, _rotation);
+ warning("Negative rotation: %d %d", transform._angle, _rotation);
_rotation = (uint32)(360.0f + transform._angle);
- warning("Negative post rotation: %f %d", transform._angle, _rotation);
+ warning("Negative post rotation: %d %d", transform._angle, _rotation);
}
return drawSprite(x, y, &rect, &newRect, transform);
}
@@ -423,12 +423,13 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect,
// But no checking is in place for that yet.
// TODO: Optimize by not doing alpha-blits if we lack or disable alpha
- bool hasAlpha;
+
+ bool hasAlpha = false;
+
if (_hasAlpha && !transform._alphaDisable) {
hasAlpha = true;
- } else {
- hasAlpha = false;
- }
+ }
+
if (transform._alphaDisable) {
warning("BaseSurfaceOSystem::drawSprite - AlphaDisable ignored");
}