summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/defines.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-07 17:32:26 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-07 17:32:26 +0000
commitee653d2656b747a8b8426fafc55c7c1cff008871 (patch)
tree527f7ed8f8a53532963f8d5eeb18fc91acf3c193 /crawl-ref/source/defines.h
parent23931ce20599deb7cac821f41964d232855e7133 (diff)
downloadcrawl-ref-ee653d2656b747a8b8426fafc55c7c1cff008871.tar.gz
crawl-ref-ee653d2656b747a8b8426fafc55c7c1cff008871.zip
Added support for Unicode characters in the map display with ncursesw (enabled
by setting UNICODE_GLYPHS=y in makefile.unix). Removed the (1,1) offset between map and grid. Both map and grid are now in sync. Store object indexes instead of raw characters in env.map so that players can change charsets and have the display update immediately. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1552 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/defines.h')
-rw-r--r--crawl-ref/source/defines.h27
1 files changed, 5 insertions, 22 deletions
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index 5b8bb6200c..9f8beea1ba 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -88,11 +88,11 @@
// Note: these boundaries are exclusive for the zone the player can move/dig,
// and are inclusive for the area that we display on the map.
// Note: that the right (bottom) boundary is one smaller here.
-#define X_BOUND_1 BOUNDARY_BORDER
+#define X_BOUND_1 (-1 + BOUNDARY_BORDER)
#define X_BOUND_2 (GXM - BOUNDARY_BORDER)
#define X_WIDTH (X_BOUND_2 - X_BOUND_1 + 1)
-#define Y_BOUND_1 BOUNDARY_BORDER
+#define Y_BOUND_1 (-1 + BOUNDARY_BORDER)
#define Y_BOUND_2 (GYM - BOUNDARY_BORDER)
#define Y_WIDTH (Y_BOUND_2 - Y_BOUND_1 + 1)
@@ -112,26 +112,9 @@
#define LOS_RADIUS 8
#define ENV_SHOW_OFFSET (LOS_RADIUS + 1)
#define ENV_SHOW_DIAMETER (ENV_SHOW_OFFSET * 2 + 1)
-#define LOS_SX 8
-#define LOS_EX 25
-#define LOS_SY 1
-#define LOS_EY 17
-
-#define VIEW_SX 1
-#define VIEW_EX 33
-#define VIEW_SY 1
-#define VIEW_EY 17
-
-#define VIEW_WIDTH (VIEW_EX - VIEW_SX + 1)
-#define VIEW_HEIGHT (VIEW_EY - VIEW_SY + 1)
-
-#define VIEW_Y_DIFF (((VIEW_EX - VIEW_SX + 1) - (VIEW_EY - VIEW_SY + 1)) / 2)
-
-// View centre must be the same as LOS centre.
-// VIEW_CX == 17
-#define VIEW_CX ((VIEW_SX + VIEW_EX) / 2)
-// VIEW_CY == 9
-#define VIEW_CY ((VIEW_SY + VIEW_EY) / 2)
+
+#define VIEW_MIN_WIDTH 33
+#define VIEW_MIN_HEIGHT 17
// max traps per level
#define MAX_TRAPS 30