diff options
| author | Matthew Hoops | 2011-05-19 18:37:24 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-19 18:38:09 -0400 |
| commit | 5fdf2796d6542db5ae05774bbbe792923c67b68b (patch) | |
| tree | 8fbfcbb932e81929c57e6b0d10e49f9b069415ff /graphics | |
| parent | 1ee5ef9c6fd335ca00901e32dc3e05ba8474403b (diff) | |
| download | scummvm-rg350-5fdf2796d6542db5ae05774bbbe792923c67b68b.tar.gz scummvm-rg350-5fdf2796d6542db5ae05774bbbe792923c67b68b.tar.bz2 scummvm-rg350-5fdf2796d6542db5ae05774bbbe792923c67b68b.zip | |
GRAPHICS: Cleanup formatting
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/surface.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/graphics/surface.cpp b/graphics/surface.cpp index 772ec12e54..cee8e61438 100644 --- a/graphics/surface.cpp +++ b/graphics/surface.cpp @@ -90,13 +90,13 @@ void Surface::hLine(int x, int y, int x2, uint32 color) { if (format.bytesPerPixel == 1) { byte *ptr = (byte *)getBasePtr(x, y); - memset(ptr, (byte)color, x2-x+1); + memset(ptr, (byte)color, x2 - x + 1); } else if (format.bytesPerPixel == 2) { uint16 *ptr = (uint16 *)getBasePtr(x, y); - Common::set_to(ptr, ptr + (x2-x+1), (uint16)color); + Common::set_to(ptr, ptr + (x2 - x + 1), (uint16)color); } else if (format.bytesPerPixel == 4) { uint32 *ptr = (uint32 *)getBasePtr(x, y); - Common::set_to(ptr, ptr + (x2-x+1), color); + Common::set_to(ptr, ptr + (x2 - x + 1), color); } else { error("Surface::hLine: bytesPerPixel must be 1, 2, or 4"); } @@ -125,7 +125,7 @@ void Surface::vLine(int x, int y, int y2, uint32 color) { uint16 *ptr = (uint16 *)getBasePtr(x, y); while (y++ <= y2) { *ptr = (uint16)color; - ptr += pitch/2; + ptr += pitch / 2; } } else if (format.bytesPerPixel == 4) { @@ -157,7 +157,7 @@ void Surface::fillRect(Common::Rect r, uint32 color) { } else if (format.bytesPerPixel == 4) { useMemset = false; } else if (format.bytesPerPixel != 1) { - error("Surface::fillRect: bytesPerPixel must be 1, 2 or 4"); + error("Surface::fillRect: bytesPerPixel must be 1, 2, or 4"); } if (useMemset) { @@ -171,7 +171,7 @@ void Surface::fillRect(Common::Rect r, uint32 color) { uint16 *ptr = (uint16 *)getBasePtr(r.left, r.top); while (height--) { Common::set_to(ptr, ptr + width, (uint16)color); - ptr += pitch/2; + ptr += pitch / 2; } } else { uint32 *ptr = (uint32 *)getBasePtr(r.left, r.top); @@ -184,10 +184,10 @@ void Surface::fillRect(Common::Rect r, uint32 color) { } void Surface::frameRect(const Common::Rect &r, uint32 color) { - hLine(r.left, r.top, r.right-1, color); - hLine(r.left, r.bottom-1, r.right-1, color); - vLine(r.left, r.top, r.bottom-1, color); - vLine(r.right-1, r.top, r.bottom-1, color); + hLine(r.left, r.top, r.right - 1, color); + hLine(r.left, r.bottom - 1, r.right - 1, color); + vLine(r.left, r.top, r.bottom - 1, color); + vLine(r.right - 1, r.top, r.bottom - 1, color); } void Surface::move(int dx, int dy, int height) { |