From 9d339661c8646f2ddb598a8490b34a45f928edb8 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 17:39:39 +0100 Subject: Change in_bounds* and panel_contains macros to functions in util.cc --- src/defines.h | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/defines.h') diff --git a/src/defines.h b/src/defines.h index 3d87df47..c5ec3a20 100644 --- a/src/defines.h +++ b/src/defines.h @@ -3385,33 +3385,6 @@ - - -/* - * Determines if a map location is fully inside the outer walls - */ -#define in_bounds(Y,X) \ - (((Y) > 0) && ((X) > 0) && ((Y) < cur_hgt-1) && ((X) < cur_wid-1)) - -/* - * Determines if a map location is on or inside the outer walls - */ -#define in_bounds2(Y,X) \ - (((Y) >= 0) && ((X) >= 0) && ((Y) < cur_hgt) && ((X) < cur_wid)) - - -/* - * Determines if a map location is currently "on screen" -RAK- - * Note that "panel_contains(Y,X)" always implies "in_bounds2(Y,X)". - */ -#define panel_contains(Y,X) \ - (((Y) >= panel_row_min) && ((Y) <= panel_row_max) && \ - ((X) >= panel_col_min) && ((X) <= panel_col_max)) - - - - - /*** Color constants ***/ -- cgit v1.2.3