diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 17:28:09 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 17:28:09 +0200 |
| commit | dee1a6bf407649ccd60307e1896f2b27130c344c (patch) | |
| tree | d3747c44c09acbdba74cff252ba998a11cf4d4ef /src/utils/point.h | |
| parent | 1bd16dc9def00ede31a9c7a568e3b8f55bb5ff6f (diff) | |
| parent | 3e218fec3000ab36ce03a0e3a04756bff9484127 (diff) | |
| download | manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.tar.gz manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.tar.bz2 manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.tar.xz manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/game-server/inventory.cpp
src/game-server/inventory.h
src/game-server/item.h
src/game-server/main-game.cpp
src/game-server/skillmanager.cpp
src/utils/point.h
Diffstat (limited to 'src/utils/point.h')
| -rw-r--r-- | src/utils/point.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/point.h b/src/utils/point.h index ccd3d2c6..988b6c5a 100644 --- a/src/utils/point.h +++ b/src/utils/point.h @@ -75,8 +75,8 @@ class Rectangle bool contains(const Point &p) const { - return (p.x >= x && p.x <= x + w && - p.y >= y && p.y <= y + h); + return (p.x >= x && p.x < x + w && + p.y >= y && p.y < y + h); } bool intersects(const Rectangle &r) const |