Added an override for point_in_rect that takes a tpoint argument

wesnoth · Oct 22, 2016 · 374eb2e · 374eb2e · CelticMinstrel · Oct 22, 2016
1 parent 80115b1
commit 374eb2e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/sdl/rect.cpp b/src/sdl/rect.cpp
@@ -12,10 +12,10 @@
    See the COPYING file for more details.
 */
 
+#include "gui/core/point.hpp"
 #include "sdl/rect.hpp"
 #include "sdl/utils.hpp"
 
-
 namespace sdl
 {
 
@@ -31,12 +31,16 @@ SDL_Rect create_rect(const int x, const int y, const int w, const int h)
 	return rect;
 }
 
-
 bool point_in_rect(int x, int y, const SDL_Rect& rect)
 {
 	return x >= rect.x && y >= rect.y && x < rect.x + rect.w && y < rect.y + rect.h;
 }
 
+bool point_in_rect(const gui2::tpoint& point, const SDL_Rect& rect)
+{
+	return point.x >= rect.x && point.y >= rect.y && point.x < rect.x + rect.w && point.y < rect.y + rect.h;
+}
+
 bool rects_overlap(const SDL_Rect& rect1, const SDL_Rect& rect2)
 {
 	return (rect1.x < rect2.x+rect2.w && rect2.x < rect1.x+rect1.w &&

diff --git a/src/sdl/rect.hpp b/src/sdl/rect.hpp
@@ -25,6 +25,9 @@
 
 #include <SDL_rect.h>
 
+namespace gui2 {
+	class tpoint;
+}
 
 namespace sdl
 {
@@ -51,6 +54,8 @@ SDL_Rect create_rect(const int x, const int y, const int w, const int h);
  */
 bool point_in_rect(int x, int y, const SDL_Rect& rect);
 
+bool point_in_rect(const gui2::tpoint& point, const SDL_Rect& rect);
+
 /**
  * Tests whether two rectangles overlap.
  *