diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-03-03 20:59:35 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-03-29 20:57:25 +0200 |
| commit | c033064404865fd1cccad23e36ce195fca92c64d (patch) | |
| tree | b65994d89f9cb022b6b437f85763718296b791d4 /src/main-gtk2.c | |
| parent | 1eaf454bd4f6c1f36391552cc1fc7188f9901f7e (diff) | |
Refactor: EGO_GRAPHICS compile-time flag always set
Diffstat (limited to 'src/main-gtk2.c')
| -rw-r--r-- | src/main-gtk2.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/src/main-gtk2.c b/src/main-gtk2.c index c0e22c7b..10188657 100644 --- a/src/main-gtk2.c +++ b/src/main-gtk2.c @@ -2711,8 +2711,6 @@ static void overlay_tiles_2( } -# ifdef USE_EGO_GRAPHICS - /* * XXX XXX Low level graphics helper * Draw a tile at (e_x, e_y) over one at (s_x, s_y) over another one @@ -2759,8 +2757,6 @@ static void overlay_tiles_3( } } -# endif /* USE_EGO_GRAPHICS */ - # endif /* USE_TRANSPARENCY */ @@ -2770,18 +2766,11 @@ static void overlay_tiles_3( * Draw "n" tiles/characters starting at (x,y) */ # ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS static errr Term_pict_gtk( int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -# else /* USE_EGO_GRAPHICS */ -static errr Term_pict_gtk( - int x, int y, int n, - const byte *ap, const char *cp, - const byte *tap, const char *tcp) -# endif /* USE_EGO_GRAPHICS */ # else /* USE_TRANSPARENCY */ static errr Term_pict_gtk( int x, int y, int n, @@ -2833,15 +2822,11 @@ static errr Term_pict_gtk( char tc; int t_x, t_y; -# ifdef USE_EGO_GRAPHICS - byte ea; char ec; int e_x = 0, e_y = 0; bool_ has_overlay; -# endif /* USE_EGO_GRAPHICS */ - # endif /* USE_TRANSPARENCY */ @@ -2855,15 +2840,11 @@ static errr Term_pict_gtk( ta = *tap++; tc = *tcp++; -# ifdef USE_EGO_GRAPHICS - /* Overlay attr/char */ ea = *eap++; ec = *ecp++; has_overlay = (ea && ec); -# endif /* USE_EGO_GRAPHICS */ - # endif /* USE_TRANSPARENCY */ /* Row and Col */ @@ -2876,8 +2857,6 @@ static errr Term_pict_gtk( t_y = (((byte)ta & 0x7F) % tile_rows) * td->tile_hgt; t_x = (((byte)tc & 0x7F) % tile_cols) * td->tile_wid; -# ifdef USE_EGO_GRAPHICS - /* Overlay Row and Col */ if (has_overlay) { @@ -2885,8 +2864,6 @@ static errr Term_pict_gtk( e_x = (((byte)ec & 0x7F) % tile_cols) * td->tile_wid; } -# endif /* USE_EGO_GRAPHICS */ - # ifdef USE_DOUBLE_TILES @@ -2909,8 +2886,6 @@ static errr Term_pict_gtk( ((s_x == t_x) && (s_y == t_y))) { -# ifdef USE_EGO_GRAPHICS - /* The simplest possible case - no overlay */ if (!has_overlay) { @@ -2939,17 +2914,6 @@ static errr Term_pict_gtk( gdk_flush(); } -# else /* USE_EGO_GRAPHICS */ - - /* Draw the tile */ - gdk_draw_rgb_image_2( - TERM_DATA_DRAWABLE(td), td->gc, td->tiles, - s_x, s_y, - d_x, d_y, - td->tile_wid, td->tile_hgt); - -# endif /* USE_EGO_GRAPHICS */ - } /* @@ -2959,13 +2923,6 @@ static errr Term_pict_gtk( else { -# ifndef USE_EGO_GRAPHICS - - /* Draw mon/PC/obj over terrain */ - overlay_tiles_2(td, s_x, s_y, t_x, t_y); - -# else /* !USE_EGO_GRAPHICS */ - /* No overlay */ if (!has_overlay) { @@ -2981,8 +2938,6 @@ static errr Term_pict_gtk( t_x, t_y); } -# endif /* !USE_EGO_GRAPHICS */ - /* Draw it */ gdk_draw_rgb_image_2( TERM_DATA_DRAWABLE(td), td->gc, td->trans_buf, |