diff options
author | Strangerke | 2014-02-16 18:41:25 +0100 |
---|---|---|
committer | Strangerke | 2014-02-16 18:41:25 +0100 |
commit | 81f0a5dc4247ee8b78170427ef23e48024ec4d76 (patch) | |
tree | 87162122607cb4bb6ddaa461bef782fdb2394fe9 /engines/wintermute/graphics | |
parent | 85b3526860aae9db8366f48ad1a9122d89dab88c (diff) | |
download | scummvm-rg350-81f0a5dc4247ee8b78170427ef23e48024ec4d76.tar.gz scummvm-rg350-81f0a5dc4247ee8b78170427ef23e48024ec4d76.tar.bz2 scummvm-rg350-81f0a5dc4247ee8b78170427ef23e48024ec4d76.zip |
WINTERMUTE: Janitorial - Remove trailing spaces
Diffstat (limited to 'engines/wintermute/graphics')
-rw-r--r-- | engines/wintermute/graphics/transform_struct.cpp | 72 | ||||
-rw-r--r-- | engines/wintermute/graphics/transparent_surface.cpp | 8 | ||||
-rw-r--r-- | engines/wintermute/graphics/transparent_surface.h | 6 |
3 files changed, 43 insertions, 43 deletions
diff --git a/engines/wintermute/graphics/transform_struct.cpp b/engines/wintermute/graphics/transform_struct.cpp index 822c06f42f..aa440e55ac 100644 --- a/engines/wintermute/graphics/transform_struct.cpp +++ b/engines/wintermute/graphics/transform_struct.cpp @@ -40,47 +40,47 @@ void TransformStruct::init(Point32 zoom, uint32 angle, Point32 hotspot, bool alp } TransformStruct::TransformStruct(int32 zoomX, int32 zoomY, uint32 angle, int32 hotspotX, int32 hotspotY, TSpriteBlendMode blendMode, uint32 rgbaMod, bool mirrorX, bool mirrorY, int32 offsetX, int32 offsetY) { - init(Point32(zoomX, zoomY), - angle, - Point32(hotspotX, hotspotY), - false, - blendMode, - rgbaMod, - mirrorX, mirrorY, + init(Point32(zoomX, zoomY), + angle, + Point32(hotspotX, hotspotY), + false, + blendMode, + rgbaMod, + mirrorX, mirrorY, Point32(offsetX, offsetY)); } TransformStruct::TransformStruct(float zoomX, float zoomY, uint32 angle, int32 hotspotX, int32 hotspotY, TSpriteBlendMode blendMode, uint32 rgbaMod, bool mirrorX, bool mirrorY, int32 offsetX, int32 offsetY) { - init(Point32((int32)(zoomX / 100.0 * kDefaultZoomX), - (int32)(zoomY / 100.0 * kDefaultZoomY)), - angle, - Point32(hotspotX, hotspotY), - false, - blendMode, - rgbaMod, - mirrorX, mirrorY, + init(Point32((int32)(zoomX / 100.0 * kDefaultZoomX), + (int32)(zoomY / 100.0 * kDefaultZoomY)), + angle, + Point32(hotspotX, hotspotY), + false, + blendMode, + rgbaMod, + mirrorX, mirrorY, Point32(offsetX, offsetY)); } TransformStruct::TransformStruct(int32 zoomX, int32 zoomY, TSpriteBlendMode blendMode, uint32 rgbaMod, bool mirrorX, bool mirrorY) { - init(Point32(zoomX, zoomY), - kDefaultAngle, - Point32(kDefaultHotspotX, kDefaultHotspotY), - false, - blendMode, - rgbaMod, - mirrorX, - mirrorY, + init(Point32(zoomX, zoomY), + kDefaultAngle, + Point32(kDefaultHotspotX, kDefaultHotspotY), + false, + blendMode, + rgbaMod, + mirrorX, + mirrorY, Point32(kDefaultOffsetX, kDefaultOffsetY)); } TransformStruct::TransformStruct(int32 zoomX, int32 zoomY, uint32 angle, int32 hotspotX, int32 hotspotY) { - init(Point32(zoomX, zoomY), - angle, - Point32(hotspotX, hotspotY), - true, - BLEND_NORMAL, - kDefaultRgbaMod, + init(Point32(zoomX, zoomY), + angle, + Point32(hotspotX, hotspotY), + true, + BLEND_NORMAL, + kDefaultRgbaMod, false, false, Point32(kDefaultOffsetX, kDefaultOffsetY)); } @@ -99,13 +99,13 @@ TransformStruct::TransformStruct(int32 numTimesX, int32 numTimesY) { } TransformStruct::TransformStruct() { - init(Point32(kDefaultZoomX, kDefaultZoomY), - kDefaultAngle, - Point32(kDefaultHotspotX, kDefaultHotspotY), - true, - BLEND_NORMAL, - kDefaultRgbaMod, - false, false, + init(Point32(kDefaultZoomX, kDefaultZoomY), + kDefaultAngle, + Point32(kDefaultHotspotX, kDefaultHotspotY), + true, + BLEND_NORMAL, + kDefaultRgbaMod, + false, false, Point32(kDefaultOffsetX, kDefaultOffsetY)); } diff --git a/engines/wintermute/graphics/transparent_surface.cpp b/engines/wintermute/graphics/transparent_surface.cpp index 79722439bd..e8628ef6a6 100644 --- a/engines/wintermute/graphics/transparent_surface.cpp +++ b/engines/wintermute/graphics/transparent_surface.cpp @@ -356,7 +356,7 @@ void doBlitBinaryFast(byte *ino, byte *outo, uint32 width, uint32 height, uint32 * @color colormod in 0xAARRGGBB format - 0xFFFFFFFF for no colormod */ -template<class Blender> +template<class Blender> void doBlit(byte *ino, byte *outo, uint32 width, uint32 height, uint32 pitch, int32 inStep, int32 inoStep, uint32 color) { Blender b; byte *in; @@ -769,7 +769,7 @@ TransparentSurface *TransparentSurface::scale(uint16 newWidth, uint16 newHeight) assert(sax && say); /* - * Precalculate row increments + * Precalculate row increments */ int spixelw = (srcW - 1); int spixelh = (srcH - 1); @@ -789,8 +789,8 @@ TransparentSurface *TransparentSurface::scale(uint16 newWidth, uint16 newHeight) csx += sx; /* Guard from overflows */ - if (csx > ssx) { - csx = ssx; + if (csx > ssx) { + csx = ssx; } } diff --git a/engines/wintermute/graphics/transparent_surface.h b/engines/wintermute/graphics/transparent_surface.h index 1f3827d1a9..51a3dfe4cc 100644 --- a/engines/wintermute/graphics/transparent_surface.h +++ b/engines/wintermute/graphics/transparent_surface.h @@ -131,13 +131,13 @@ struct TransparentSurface : public Graphics::Surface { int width = -1, int height = -1, TSpriteBlendMode blend = BLEND_NORMAL); void applyColorKey(uint8 r, uint8 g, uint8 b, bool overwriteAlpha = false); - + /** * @brief Scale function; this returns a transformed version of this surface after rotation and * scaling. Please do not use this if angle != 0, use rotoscale. * * @param newWidth the resulting width. - * @param newHeight the resulting height. + * @param newHeight the resulting height. * @see TransformStruct */ TransparentSurface *scale(uint16 newWidth, uint16 newHeight) const; @@ -147,7 +147,7 @@ struct TransparentSurface : public Graphics::Surface { * scaling. Please do not use this if angle == 0, use plain old scaling function. * * @param transform a TransformStruct wrapping the required info. @see TransformStruct - * + * */ TransparentSurface *rotoscale(const TransformStruct &transform) const; AlphaType getAlphaMode() const; |