aboutsummaryrefslogtreecommitdiff
path: root/engines/draci/surface.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-30 10:45:14 +0000
committerJohannes Schickel2009-09-30 10:45:14 +0000
commitc9ca057ae2d8d3994aba86bb1ded05e0db008188 (patch)
tree55ec41d9c13bd108b41e28f9642ef24d78e6897b /engines/draci/surface.cpp
parent4477f419034b7c606aef7eb7038337b7229cec33 (diff)
downloadscummvm-rg350-c9ca057ae2d8d3994aba86bb1ded05e0db008188.tar.gz
scummvm-rg350-c9ca057ae2d8d3994aba86bb1ded05e0db008188.tar.bz2
scummvm-rg350-c9ca057ae2d8d3994aba86bb1ded05e0db008188.zip
- Adapt parts of the Draci code to match our code formatting guidelines
- Remove use of tabs for formatting, now in nearly all cases tabs are only used for indentation - Use "uint" instead of "unsigned int" in the whole engine for consistency's sake - Strip some trailing tabs and leading whitespaces svn-id: r44478
Diffstat (limited to 'engines/draci/surface.cpp')
-rw-r--r--engines/draci/surface.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/draci/surface.cpp b/engines/draci/surface.cpp
index 872b228797..d56fcffdb6 100644
--- a/engines/draci/surface.cpp
+++ b/engines/draci/surface.cpp
@@ -52,7 +52,6 @@ void Surface::markDirtyRect(Common::Rect r) {
it = _dirtyRects.begin();
while (it != _dirtyRects.end()) {
-
if (it->contains(r))
return;
@@ -129,13 +128,12 @@ void Surface::fill(uint colour) {
/**
* @brief Calculates horizontal center of an object
*
- * @param x The x coordinate of the center
+ * @param x The x coordinate of the center
* @param width The width of the object to be centered (in pixels)
*
* @return The centered x coordinate
*/
uint Surface::centerOnX(uint x, uint width) const {
-
int newX = x - width / 2;
if (newX + width >= (uint)w - 1)
@@ -150,13 +148,12 @@ uint Surface::centerOnX(uint x, uint width) const {
/**
* @brief Calculates vertical center of an object
*
- * @param y The y coordinate of the center
+ * @param y The y coordinate of the center
* @param height The height of the object to be centered (in pixels)
*
* @return The centered y coordinate
*/
uint Surface::centerOnY(uint y, uint height) const {
-
int newY = y - height / 2;
if (newY + height >= (uint)h - 1)
@@ -171,7 +168,6 @@ uint Surface::centerOnY(uint y, uint height) const {
/**
* @brief Returns a Common::Rect corresponding to the surface.
*/
-
Common::Rect Surface::getRect() const {
return Common::Rect(w, h);
}