aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorAlyssa Milburn2011-02-07 16:39:10 +0000
committerAlyssa Milburn2011-02-07 16:39:10 +0000
commit653196640ad5ce4777af3399311866400df02e6a (patch)
tree22a60ab5242bb8faa89134ad95b400cadf1a87be /engines
parenta0c0331bcdb9a0736c8b5fa85de18a0319c675a2 (diff)
downloadscummvm-rg350-653196640ad5ce4777af3399311866400df02e6a.tar.gz
scummvm-rg350-653196640ad5ce4777af3399311866400df02e6a.tar.bz2
scummvm-rg350-653196640ad5ce4777af3399311866400df02e6a.zip
HUGO: Spelling fix.
svn-id: r55804
Diffstat (limited to 'engines')
-rw-r--r--engines/hugo/display.cpp6
-rw-r--r--engines/hugo/display.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/hugo/display.cpp b/engines/hugo/display.cpp
index edf616a503..b258712f28 100644
--- a/engines/hugo/display.cpp
+++ b/engines/hugo/display.cpp
@@ -281,7 +281,7 @@ int16 Screen::mergeLists(rect_t *list, rect_t *blist, const int16 len, int16 ble
rect_t *bp = blist;
for (int16 b = 0; b < blen; b++, bp++) {
if (bp->dx) // blist entry used
- if (isOverlaping(list, bp))
+ if (isOverlapping(list, bp))
coalesce[c++] = b;
}
@@ -623,9 +623,9 @@ bool Screen::isInY(const int16 y, const rect_t *rect) const {
}
/**
-* Check if two rectangles are over lapping
+* Check if two rectangles are overlapping
*/
-bool Screen::isOverlaping(const rect_t *rectA, const rect_t *rectB) const {
+bool Screen::isOverlapping(const rect_t *rectA, const rect_t *rectB) const {
return (isInX(rectA->x, rectB) || isInX(rectA->x + rectA->dx, rectB) || isInX(rectB->x, rectA) || isInX(rectB->x + rectB->dx, rectA)) &&
(isInY(rectA->y, rectB) || isInY(rectA->y + rectA->dy, rectB) || isInY(rectB->y, rectA) || isInY(rectB->y + rectB->dy, rectA));
}
diff --git a/engines/hugo/display.h b/engines/hugo/display.h
index 019496b6e0..29d7bb7722 100644
--- a/engines/hugo/display.h
+++ b/engines/hugo/display.h
@@ -148,7 +148,7 @@ protected:
inline bool isInX(const int16 x, const rect_t *rect) const;
inline bool isInY(const int16 y, const rect_t *rect) const;
- inline bool isOverlaping(const rect_t *rectA, const rect_t *rectB) const;
+ inline bool isOverlapping(const rect_t *rectA, const rect_t *rectB) const;
bool fontLoadedFl[kNumFonts];