diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-20 01:49:07 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-20 01:49:07 +0000 |
| commit | e11ef227c885bc08467a0b8ced4e8cad8675d5a0 (patch) | |
| tree | 3f006b73dbf8aadb6d044bf0da172ae7ab660dec /crawl-ref | |
| parent | d89d2d6b352ea604241c3b4b89e714ff4112df22 (diff) | |
| download | crawl-ref-e11ef227c885bc08467a0b8ced4e8cad8675d5a0.tar.gz crawl-ref-e11ef227c885bc08467a0b8ced4e8cad8675d5a0.zip | |
A bit of tile code cleanup.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3303 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/libgui.cc | 20 | ||||
| -rw-r--r-- | crawl-ref/source/tiles.h | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc index 083852321e..153d48f47d 100644 --- a/crawl-ref/source/libgui.cc +++ b/crawl-ref/source/libgui.cc @@ -58,16 +58,16 @@ extern void TileInitWin(); // Main window WinClass *win_main; // Regions -TextRegionClass *region_crt = NULL; -MapRegionClass *region_map = NULL; -TileRegionClass *region_tile = NULL; -TextRegionClass *region_stat = NULL; -TextRegionClass *region_msg = NULL; -TextRegionClass *region_dngn = NULL; -TextRegionClass *region_xmap = NULL; -TextRegionClass *region_tip = NULL; - -TileRegionClass *region_item = NULL; +TextRegionClass *region_crt = NULL; +MapRegionClass *region_map = NULL; +TileRegionClass *region_tile = NULL; +TextRegionClass *region_stat = NULL; +TextRegionClass *region_msg = NULL; +TextRegionClass *region_dngn = NULL; +TextRegionClass *region_xmap = NULL; +TextRegionClass *region_tip = NULL; + +TileRegionClass *region_item = NULL; TileRegionClass *region_item2 = NULL; // Raw tile images diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index db647ed6bc..a7b99711aa 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -94,10 +94,10 @@ void TileNewLevel(bool first_time); // display inventry void TileDrawInvData(int n, int flag, int *tiles, int *num, - int *idx, int *iflags); + int *idx, int *iflags); void TileDrawOneItem(int region, int i, char key, int idx, - int tile, int num, bool floor, - bool select, bool equip, bool tried, bool cursed); + int tile, int num, bool floor, + bool select, bool equip, bool tried, bool cursed); void TileRedrawInv(int region); void TileClearInv(int region); void TileMoveInvCursor(int ix); @@ -166,14 +166,14 @@ enum tile_flags #define TILEI_FLAG_CURSE 0x1000 #define TILEI_FLAG_CURSOR 0x2000 -#define TILEP_GENDER_MALE 0 +#define TILEP_SHOW_EQUIP 0x1000 + +#define TILEP_GENDER_MALE 0 #define TILEP_GENDER_FEMALE 1 #define TILEP_M_DEFAULT 0 #define TILEP_M_LOADING 1 -#define TILEP_SHOW_EQUIP 0x1000 - enum TilePlayerFlagCut { TILEP_FLAG_HIDE, |