diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-18 17:47:21 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-18 17:47:21 +0000 |
| commit | 8b88fbd2166388611430cf0036e988b3e24adbd4 (patch) | |
| tree | bdc145d04d6c16ce8dbd549a7f1ae2bf0da17d00 /crawl-ref/source/tiles.h | |
| parent | 1b7d49de6031caab5a0ef6210ebb3e7c6b625d5c (diff) | |
| download | crawl-ref-8b88fbd2166388611430cf0036e988b3e24adbd4.tar.gz crawl-ref-8b88fbd2166388611430cf0036e988b3e24adbd4.zip | |
Making mouse-over region larger on Linux.
Reformatting mouse-over messages to be consistent.
More tile code cleanup and dead code removal.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3299 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tiles.h')
| -rw-r--r-- | crawl-ref/source/tiles.h | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index 0a6ffdc7ea..dc04817f69 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -17,8 +17,6 @@ int tileidx_zap(int color); int tile_idx_unseen_terrain(int x, int y, int what); int tile_unseen_flag(const coord_def& gc); -#define simple_iso_tile(x) (x) - // Player tile related void tilep_race_default(int race, int gender, int level, int *parts); void tilep_job_default(int job, int gender, int *parts); @@ -67,6 +65,9 @@ int get_floor_tile_idx(); int get_floor_special_tile_idx(); void tile_init_flavor(); +void tile_set_force_redraw_tiles(bool redraw); +void tile_set_force_redraw_inv(bool redraw); + /**************************************/ /* tile2.cc image manipulation */ /**************************************/ @@ -120,7 +121,6 @@ void TileInitItems(); // load wall tiles void TileLoadWall(bool wizard); -//�^�C�g�� void TileDrawTitle(); // monster+weapon tile @@ -130,26 +130,29 @@ int get_base_idx_from_mcache(int tile_idx); int get_clean_map_idx(int tile_idx); /* Flags for drawing routines */ -// MAY_STAB, FLAG_STAB, and FLAG_PET are mutually exclusive -#define TILE_FLAG_MAY_STAB 0xC000 // May stab brand is always fg -#define TILE_FLAG_STAB 0x8000 // Stab brand is always fg -#define TILE_FLAG_PET 0x4000 //pet is always fg - -#define TILE_FLAG_NET 0x2000 //nets are always in fg -#define TILE_FLAG_FLYING 0x1000 //flying object is always fg -#define TILE_FLAG_S_UNDER 0x800 //fg - -#define TILE_FLAG_CURSOR 0xc000 //cursor is always bg -#define TILE_FLAG_CURSOR1 0x8000 //cursor is always bg -#define TILE_FLAG_CURSOR2 0x4000 //cursor is always bg -#define TILE_FLAG_CURSOR3 0xc000 //cursor is always bg -#define TILE_FLAG_CURSOR0 0x0000 //cursor is always bg - -#define TILE_FLAG_UNSEEN 0x2000 //unseen flag is set to bg -#define TILE_FLAG_MM_UNSEEN 0x1000 -#define TILE_FLAG_RAY 0x800 - -#define TILE_FLAG_MASK 0x07ff +enum tile_flags +{ + // Foreground flags + TILE_FLAG_S_UNDER = 0x00000800, + TILE_FLAG_FLYING = 0x00001000, + TILE_FLAG_NET = 0x00002000, + TILE_FLAG_PET = 0x00004000, + TILE_FLAG_STAB = 0x00008000, + TILE_FLAG_MAY_STAB = 0x0000C000, + + // Background flags + TILE_FLAG_RAY = 0x00000800, + TILE_FLAG_MM_UNSEEN = 0x00001000, + TILE_FLAG_UNSEEN = 0x00002000, + TILE_FLAG_CURSOR0 = 0x00000000, + TILE_FLAG_CURSOR1 = 0x00008000, + TILE_FLAG_CURSOR2 = 0x00004000, + TILE_FLAG_CURSOR3 = 0x0000C000, + TILE_FLAG_CURSOR = 0x0000C000, + + // General + TILE_FLAG_MASK = 0x000007FF +}; #define TILEI_FLAG_SELECT 0x100 |