diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-25 16:28:18 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-25 16:28:18 +0000 |
| commit | 94f5e22fbf155edf0571d69741cafdddf48cf27d (patch) | |
| tree | 5fdd69546031f4d8ab81b81a9f06b2bf1673afb1 /crawl-ref/source/tile2.cc | |
| parent | bf3c2bf4c360a72920b73406bd069d004c9585b4 (diff) | |
| download | crawl-ref-94f5e22fbf155edf0571d69741cafdddf48cf27d.tar.gz crawl-ref-94f5e22fbf155edf0571d69741cafdddf48cf27d.zip | |
Applying static method conventions to acr.cc and items.cc - this resulted
in removing several unused functions from the latter file.
Renaming tiles options show_items and title_screen to tile_show_items
and tile_title_screen. And as usual, cleaning up tiles code some more.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3876 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile2.cc')
| -rw-r--r-- | crawl-ref/source/tile2.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index 40aef67d96..3d466581ec 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -172,10 +172,10 @@ const int tcache_oy_normal[TCACHE_KIND_NORMAL] = {0}; const int tcache_nlayer_normal[TCACHE_KIND_NORMAL] = {1}; #define TREGION_0_NORMAL 0 -const int region_sx_normal[1]={0}; -const int region_sy_normal[1]={0}; -const int region_wx_normal[1]={TILE_X}; -const int region_wy_normal[1]={TILE_Y}; +const int region_sx_normal[1] = {0}; +const int region_sy_normal[1] = {0}; +const int region_wx_normal[1] = {TILE_X}; +const int region_wy_normal[1] = {TILE_Y}; // ISO mode sink mask static char *sink_mask; @@ -307,7 +307,7 @@ void TileInit() for (k = 0; k < tcache_kind; k++) { - screen_tcach_idx[k]= (int *)malloc(sizeof(int)* tile_xmax * tile_ymax); + screen_tcach_idx[k] = (int *)malloc(sizeof(int)* tile_xmax * tile_ymax); tcache[k] = (tile_cache *)malloc(sizeof(tile_cache)*max_tcache); for (x = 0; x < tile_xmax * tile_ymax; x++) screen_tcach_idx[k][x] = -1; @@ -346,7 +346,7 @@ void TileResizeScreen(int x0, int y0) for (k = 0; k < tcache_kind; k++) { free(screen_tcach_idx[k]); - screen_tcach_idx[k]= (int *)malloc(sizeof(int)* tile_xmax * tile_ymax); + screen_tcach_idx[k] = (int *)malloc(sizeof(int)* tile_xmax * tile_ymax); free(tcache[k]); tcache[k] = (tile_cache *)malloc(sizeof(tile_cache)*max_tcache); @@ -835,9 +835,10 @@ int TileDrawCursor(int x, int y, int cflag) return oldc; } -void TileDrawBolt(int x, int y, int fg){ +void TileDrawBolt(int x, int y, int fg) +{ - t1buf[x+1][y+1]=fg | TILE_FLAG_FLYING; + t1buf[x+1][y+1] = fg | TILE_FLAG_FLYING; _update_single_grid(x, y); } @@ -1459,7 +1460,7 @@ static bool _draw_doll(img_type img, dolls_data *doll, bool force_redraw = false // Hack: change overlay order of boots/skirts for (i = 0; i < TILEP_PARTS_TOTAL; i++) - p_order2[i]=p_order[i]; + p_order2[i] = p_order[i]; // swap boot and leg-armor if (parts2[TILEP_PART_LEG] < TILEP_LEG_SKIRT_OFS) @@ -1583,7 +1584,7 @@ static void _load_doll_data(const char *fn, dolls_data *dolls, int max, void TilePlayerEdit() { - const int p_lines[PARTS_ITEMS]= + const int p_lines[PARTS_ITEMS] = { TILEP_SELECT_DOLL, TILEP_PART_BASE, @@ -1599,7 +1600,7 @@ void TilePlayerEdit() TILEP_PART_CLOAK }; - const char *p_names[PARTS_ITEMS]= + const char *p_names[PARTS_ITEMS] = { " Index:", " Gendr:", |