diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/cave.c | 87 | ||||
| -rw-r--r-- | src/externs.h | 4 | ||||
| -rw-r--r-- | src/main-crb.c | 17 | ||||
| -rw-r--r-- | src/main-gtk2.c | 45 | ||||
| -rw-r--r-- | src/main-win.c | 12 | ||||
| -rw-r--r-- | src/main-x11.c | 45 | ||||
| -rw-r--r-- | src/main-xaw.c | 61 | ||||
| -rw-r--r-- | src/z-term.c | 168 | ||||
| -rw-r--r-- | src/z-term.h | 12 |
10 files changed, 0 insertions, 452 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 05c7bcff..ec8e6c40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,6 @@ IF(CMAKE_COMPILER_IS_GNUCC) ENDIF() # Add definitions. -ADD_DEFINITIONS(-DUSE_EGO_GRAPHICS) ADD_DEFINITIONS(-DUSE_TRANSPARENCY) ADD_DEFINITIONS(-DSUPPORT_GAMMA) ADD_DEFINITIONS(-DUSE_PRECISE_CMOVIE) @@ -867,12 +867,8 @@ static byte darker_attrs[16] = #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp, byte *eap, char *ecp) -#else /* USE_EGO_GRAPHICS */ -void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp) -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ void map_info(int y, int x, byte *ap, char *cp) #endif /* USE_TRANSPARENCY */ @@ -943,14 +939,10 @@ void map_info(int y, int x, byte *ap, char *cp) f_ptr = &f_info[feat]; -#ifdef USE_EGO_GRAPHICS - /* Reset attr/char */ *eap = 0; *ecp = 0; -#endif /* USE_EGO_GRAPHICS */ - /**** Layer 1 -- Terrain feature ****/ @@ -994,8 +986,6 @@ void map_info(int y, int x, byte *ap, char *cp) (t_info[t_idx].g_char != 0)) { -#ifdef USE_EGO_GRAPHICS - if (graf_new) { *eap = t_info[t_idx].g_attr; @@ -1007,13 +997,6 @@ void map_info(int y, int x, byte *ap, char *cp) c = t_info[t_idx].g_char; } -#else /* USE_EGO_GRAPHICS */ - - a = t_info[t_idx].g_attr; - c = t_info[t_idx].g_char; - -#endif /* USE_EGO_GRAPHICS */ - } else { @@ -1336,19 +1319,13 @@ void map_info(int y, int x, byte *ap, char *cp) { monster_race *r_ptr = race_inf(m_ptr); -#ifdef USE_EGO_GRAPHICS - /* Reset attr/char */ *eap = 0; *ecp = 0; -#endif /* USE_EGO_GRAPHICS */ - if (use_graphics) { -#ifdef USE_EGO_GRAPHICS - if (graf_new) { monster_ego *re_ptr = &re_info[m_ptr->ego]; @@ -1360,8 +1337,6 @@ void map_info(int y, int x, byte *ap, char *cp) *ecp = re_ptr->g_char; } -#endif /* USE_EGO_GRAPHICS */ - /* Use base monster */ r_ptr = &r_info[m_ptr->r_idx]; } @@ -1469,14 +1444,10 @@ void map_info(int y, int x, byte *ap, char *cp) { monster_race *r_ptr = &r_info[p_ptr->body_monster]; -#ifdef USE_EGO_GRAPHICS - /* Reset attr/char */ *eap = 0; *ecp = 0; -#endif /* USE_EGO_GRAPHICS */ - /* Get the "player" attr */ if (!avoid_other && attr_mutable && (r_ptr->flags1 & RF1_ATTR_MULTI)) { @@ -1526,8 +1497,6 @@ void map_info(int y, int x, byte *ap, char *cp) #endif /* VARIABLE_PLAYER_GRAPH */ -#ifdef USE_EGO_GRAPHICS - case GRAPHICS_ISO: case GRAPHICS_NEW: { @@ -1557,8 +1526,6 @@ void map_info(int y, int x, byte *ap, char *cp) break; } -#endif /* USE_EGO_GRAPHICS */ - } /* Save the info */ @@ -2198,11 +2165,9 @@ void lite_spot(int y, int x) byte ta; char tc; -# ifdef USE_EGO_GRAPHICS byte ea; char ec; -# endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ @@ -2211,8 +2176,6 @@ void lite_spot(int y, int x) { #ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS - /* Examine the grid */ map_info(y, x, &a, (char*)&c, &ta, &tc, &ea, &ec); @@ -2233,30 +2196,6 @@ void lite_spot(int y, int x) Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2, 0, 0, 0, 0); } -# else /* USE_EGO_GRAPHICS */ - - /* Examine the grid */ - map_info(y, x, &a, &c, &ta, &tc); - - /* Hack -- Queue it */ - Term_queue_char(panel_col_of(x), y - panel_row_prt, a, c, ta, tc); - if (use_bigtile) - { - if (a & 0x80) - { - a2 = 255; - c2 = 255; - } - else - { - a2 = TERM_WHITE; - c2 = ' '; - } - Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2, 0, 0); - } - -# endif /* USE_EGO_GRAPHICS */ - #else /* USE_TRANSPARENCY */ /* Examine the grid */ @@ -2318,8 +2257,6 @@ void prt_map(void) #ifdef USE_TRANSPARENCY byte ta; char tc; - -#ifdef USE_EGO_GRAPHICS byte ea; char ec; @@ -2342,27 +2279,7 @@ void prt_map(void) } Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2, 0, 0, 0, 0); } -#else /* USE_EGO_GRAPHICS */ -/* Determine what is there */ - map_info(y, x, &a, &c, &ta, &tc); - /* Efficiency -- Redraw that grid of the map */ - Term_queue_char(panel_col_of(x), y - panel_row_prt, a, c, ta, tc); - if (use_bigtile) - { - if (a & 0x80) - { - a2 = 255; - c2 = 255; - } - else - { - a2 = TERM_WHITE; - c2 = ' '; - } - Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2, 0, 0); - } -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ /* Determine what is there */ map_info(y, x, &a, &c); @@ -2627,11 +2544,7 @@ void display_map(int *cy, int *cx) /* Extract the current attr/char at that map location */ #ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS map_info(j, i, &ta, &tc, &ta, &tc, &ta, &tc); -# else /* USE_EGO_GRAPHICS */ - map_info(j, i, &ta, &tc, &ta, &tc); -# endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ map_info(j, i, &ta, &tc); #endif /* USE_TRANSPARENCY */ diff --git a/src/externs.h b/src/externs.h index 4808a46f..e7f5cf47 100644 --- a/src/externs.h +++ b/src/externs.h @@ -634,11 +634,7 @@ extern bool_ los(int y1, int x1, int y2, int x2); extern bool_ cave_valid_bold(int y, int x); extern bool_ no_lite(void); #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS extern void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp, byte *eap, char *ecp); -#else /* USE_EGO_GRAPHICS */ -extern void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ extern void map_info(int y, int x, byte *ap, char *cp); #endif /* USE_TRANSPARENCY */ diff --git a/src/main-crb.c b/src/main-crb.c index 4aeca8fa..34b735d1 100644 --- a/src/main-crb.c +++ b/src/main-crb.c @@ -2873,14 +2873,9 @@ static errr Term_text_mac(int x, int y, int n, byte a, const char *cp) * Erase "n" characters starting at (x,y) */ #ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS static errr Term_pict_mac(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_mac(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_mac(int x, int y, int n, const byte *ap, const char *cp) #endif /* USE_TRANSPARENCY */ @@ -2924,11 +2919,9 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) #ifdef USE_TRANSPARENCY byte ta = *tap++; char tc = *tcp++; -# ifdef USE_EGO_GRAPHICS byte ea = *eap++; char ec = *ecp++; bool_ has_overlay = (ea && ec); -# endif /* USE_EGO_GRAPHICS */ #endif @@ -2957,10 +2950,8 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) #ifdef USE_TRANSPARENCY int t_col, t_row; Rect terrain_r; -# ifdef USE_EGO_GRAPHICS int e_col, e_row; Rect ego_r; -# endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ /* Row and Col */ @@ -2984,8 +2975,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) terrain_r.right = terrain_r.left + graf_width; terrain_r.bottom = terrain_r.top + graf_height; -# ifdef USE_EGO_GRAPHICS - /* If there's an overlay */ if (has_overlay) { @@ -3000,8 +2989,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) ego_r.bottom = ego_r.top + graf_height; } -# endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* Hardwire CopyBits */ @@ -3065,8 +3052,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) (BitMap*)*pixmap_h, &src_r, &dst_r, transparent, NULL); -# ifdef USE_EGO_GRAPHICS - /* Draw overlay if there's one */ if (has_overlay) { @@ -3075,8 +3060,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) &ego_r, &dst_r, transparent, NULL); } -# endif /* USE_EGO_GRAPHICS */ - break; } } 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, diff --git a/src/main-win.c b/src/main-win.c index dde154b5..d0548d3b 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -2213,11 +2213,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s) * If "graphics" is not available, we simply "wipe" the given grids. */ # ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS static errr Term_pict_win(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_win(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_win(int x, int y, int n, const byte *ap, const char *cp) # endif /* USE_TRANSPARENCY */ @@ -2236,12 +2232,8 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) HDC hdcMask = NULL; -#ifdef USE_EGO_GRAPHICS - int x4, y4; -#endif - # endif /* USE_TRANSPARENCY */ HDC hdc; @@ -2321,7 +2313,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) /* Draw the tile */ BitBlt(hdc, x2, y2, tw2, h2, hdcSrc, x1, y1, SRCPAINT); -#ifdef USE_EGO_GRAPHICS if (ecp[i] != 0 && eap[i] != 0) { x4 = (ecp[i] & 0x7F) * w1; @@ -2333,7 +2324,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) /* Draw the tile */ BitBlt(hdc, x2, y2, tw2, h2, hdcSrc, x4, y4, SRCPAINT); } -#endif } /* Need to stretch */ @@ -2355,7 +2345,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) StretchBlt(hdc, x2, y2, tw2, h2, hdcSrc, x1, y1, w1, h1, SRCPAINT); } -#ifdef USE_EGO_GRAPHICS if (ecp[i] != 0 && eap[i] != 0) { x4 = (ecp[i] & 0x7F) * w1; @@ -2367,7 +2356,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) /* Draw the tile */ StretchBlt(hdc, x2, y2, tw2, h2, hdcSrc, x4, y4, w1, h1, SRCPAINT); } -#endif } } else diff --git a/src/main-x11.c b/src/main-x11.c index c91c837b..4f03b396 100644 --- a/src/main-x11.c +++ b/src/main-x11.c @@ -2564,13 +2564,8 @@ static errr Term_text_x11(int x, int y, int n, byte a, cptr s) * Draw some graphical characters. */ # ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS static errr Term_pict_x11(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_x11(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_x11(int x, int y, int n, const byte *ap, const char *cp) # endif /* USE_TRANSPARENCY */ @@ -2586,12 +2581,10 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) char tc; int x2, y2; -# ifdef USE_EGO_GRAPHICS byte ea; char ec; int x3, y3; bool_ has_overlay; -# endif /* USE_EGO_GRAPHICS */ int k, l; @@ -2625,8 +2618,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) x2 = (tc & 0x7F) * td->fnt->twid; y2 = (ta & 0x7F) * td->fnt->hgt; -# ifdef USE_EGO_GRAPHICS - ea = *eap++; ec = *ecp++; has_overlay = (ea && ec); @@ -2635,22 +2626,9 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) x3 = (ec & 0x7F) * td->fnt->twid; y3 = (ea & 0x7F) * td->fnt->hgt; -# endif /* USE_EGO_GRAPHICS */ - /* Optimise the common case */ if ((x1 == x2) && (y1 == y2)) { -# ifndef USE_EGO_GRAPHICS - - /* Draw object / terrain */ - XPutImage(Metadpy->dpy, td->win->win, - clr[0]->gc, - td->tiles, - x1, y1, - x, y, - td->fnt->twid, td->fnt->hgt); -# else /* !USE_EGO_GRAPHICS */ - /* Draw object / terrain */ if (!has_overlay) { @@ -2691,8 +2669,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) td->fnt->twid, td->fnt->hgt); } -# endif /* !USE_EGO_GRAPHICS */ - } else { @@ -2700,26 +2676,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) /* Mega Hack^2 - assume the top left corner is "black" */ blank = XGetPixel(td->tiles, 0, td->fnt->hgt * 6); -# ifndef USE_EGO_GRAPHICS - - for (k = 0; k < td->fnt->twid; k++) - { - for (l = 0; l < td->fnt->hgt; l++) - { - /* If mask set... */ - if ((pixel = XGetPixel(td->tiles, x1 + k, y1 + l)) == blank) - { - /* Output from the terrain */ - pixel = XGetPixel(td->tiles, x2 + k, y2 + l); - } - - /* Store into the temp storage. */ - XPutPixel(td->TmpImage, k, l, pixel); - } - } - -# else /* !USE_EGO_GRAPHICS */ - for (k = 0; k < td->fnt->twid; k++) { for (l = 0; l < td->fnt->hgt; l++) @@ -2754,7 +2710,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) } } -# endif /* !USE_EGO_GRAPHICS */ /* Draw to screen */ diff --git a/src/main-xaw.c b/src/main-xaw.c index bc9f6d3c..1f74aaf7 100644 --- a/src/main-xaw.c +++ b/src/main-xaw.c @@ -447,14 +447,9 @@ static void AngbandOutputText(AngbandWidget widget, int x, int y, * Draw some graphical characters. */ # ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS static void AngbandOutputPict(AngbandWidget widget, 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 void AngbandOutputPict(AngbandWidget widget, 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 void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, const byte *ap, const char *cp) @@ -473,14 +468,12 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, int x2, y2; -# ifdef USE_EGO_GRAPHICS byte ea; char ec; int x3, y3; bool_ has_overlay; -# endif /* USE_EGO_GRAPHICS */ int k, l; unsigned long pixel, blank; @@ -508,8 +501,6 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, x2 = (tc & 0x7F) * widget->angband.fontwidth; y2 = (ta & 0x7F) * widget->angband.fontheight; -# ifdef USE_EGO_GRAPHICS - ea = *eap++; ec = *ecp++; has_overlay = (ea && ec); @@ -518,25 +509,10 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, x3 = (ec & 0x7F) * widget->angband.fontwidth; y3 = (ea & 0x7F) * widget->angband.fontheight; -# endif /* USE_EGO_GRAPHICS */ - /* Optimise the common case */ if ((x1 == x2) && (y1 == y2)) { -# ifndef USE_EGO_GRAPHICS - - /* Draw object / terrain */ - XPutImage(XtDisplay(widget), XtWindow(widget), - widget->angband.gc[0], - widget->angband.tiles, - x1, y1, - x, y, - widget->angband.fontwidth, - widget->angband.fontheight); - -# else /* !USE_EGO_GRAPHICS */ - /* No overlay */ if (!has_overlay) { @@ -586,8 +562,6 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, widget->angband.fontheight); } -# endif /* !USE_EGO_GRAPHICS */ - } else { @@ -595,30 +569,6 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, blank = XGetPixel(widget->angband.tiles, 0, widget->angband.fontheight * 6); -# ifndef USE_EGO_GRAPHICS - - for (k = 0; k < widget->angband.fontwidth; k++) - { - for (l = 0; l < widget->angband.fontheight; l++) - { - /* If mask set... */ - if ((pixel = XGetPixel(widget->angband.tiles, - x1 + k, y1 + l)) == blank) - { - - /* Output from the terrain */ - pixel = XGetPixel(widget->angband.tiles, - x2 + k, y2 + l); - } - - /* Store into the temp storage. */ - XPutPixel(widget->angband.TmpImage, - k, l, pixel); - } - } - -#else /* !USE_EGO_GRAPHICS */ - for (k = 0; k < widget->angband.fontwidth; k++) { for (l = 0; l < widget->angband.fontheight; l++) @@ -657,8 +607,6 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, } } -#endif /* !USE_EGO_GRAPHICS */ - /* Draw to screen */ /* Draw object / terrain */ @@ -1635,13 +1583,8 @@ static errr Term_text_xaw(int x, int y, int n, byte a, cptr s) * Draw some graphical characters. */ # ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS static errr Term_pict_xaw(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_xaw(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_xaw(int x, int y, int n, const byte *ap, const char *cp) # endif /* USE_TRANSPARENCY */ @@ -1650,11 +1593,7 @@ static errr Term_pict_xaw(int x, int y, int n, const byte *ap, const char *cp) /* Draw the pictures */ # ifdef USE_TRANSPARENCY -# ifdef USE_EGO_GRAPHICS AngbandOutputPict(td->widget, x, y, n, ap, cp, tap, tcp, eap, ecp); -# else /* USE_EGO_GRAPHICS */ - AngbandOutputPict(td->widget, x, y, n, ap, cp, tap, tcp); -# endif /* USE_EGO_GRAPHICS */ # else /* USE_TRANSPARENCY */ AngbandOutputPict(td->widget, x, y, n, ap, cp); # endif /* USE_TRANSPARENCY */ diff --git a/src/z-term.c b/src/z-term.c index 25a25f01..ef4dfeaa 100644 --- a/src/z-term.c +++ b/src/z-term.c @@ -310,8 +310,6 @@ static errr term_win_nuke(term_win *s, int w, int h) C_KILL(s->vta, h * w, byte); C_KILL(s->vtc, h * w, char); -#ifdef USE_EGO_GRAPHICS - /* Free the ego graphics access arrays */ C_KILL(s->ea, h, byte*); C_KILL(s->ec, h, char*); @@ -320,8 +318,6 @@ static errr term_win_nuke(term_win *s, int w, int h) C_KILL(s->vea, h * w, byte); C_KILL(s->vec, h * w, char); -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* Success */ @@ -354,8 +350,6 @@ static errr term_win_init(term_win *s, int w, int h) C_MAKE(s->vta, h * w, byte); C_MAKE(s->vtc, h * w, char); -#ifdef USE_EGO_GRAPHICS - /* Make the ego graphics access arrays */ C_MAKE(s->ea, h, byte*); C_MAKE(s->ec, h, char*); @@ -364,8 +358,6 @@ static errr term_win_init(term_win *s, int w, int h) C_MAKE(s->vea, h * w, byte); C_MAKE(s->vec, h * w, char); -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ @@ -380,13 +372,9 @@ static errr term_win_init(term_win *s, int w, int h) s->ta[y] = s->vta + w * y; s->tc[y] = s->vtc + w * y; -#ifdef USE_EGO_GRAPHICS - s->ea[y] = s->vea + w * y; s->ec[y] = s->vec + w * y; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ } @@ -420,16 +408,12 @@ static errr term_win_copy(term_win *s, term_win *f, int w, int h) byte *s_taa = s->ta[y]; char *s_tcc = s->tc[y]; -#ifdef USE_EGO_GRAPHICS - byte *f_eaa = f->ea[y]; char *f_ecc = f->ec[y]; byte *s_eaa = s->ea[y]; char *s_ecc = s->ec[y]; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ for (x = 0; x < w; x++) @@ -441,10 +425,8 @@ static errr term_win_copy(term_win *s, term_win *f, int w, int h) *s_taa++ = *f_taa++; *s_tcc++ = *f_tcc++; -#ifdef USE_EGO_GRAPHICS *s_eaa++ = *f_eaa++; *s_ecc++ = *f_ecc++; -#endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ } @@ -539,22 +521,14 @@ static errr Term_text_hack(int x, int y, int n, byte a, const char *cp) * Hack -- fake hook for "Term_pict()" (see above) */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS static errr Term_pict_hack(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_hack(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_hack(int x, int y, int n, const byte *ap, const char *cp) #endif /* USE_TRANSPARENCY */ { /* Compiler silliness */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS if (x || y || n || ap || cp || tap || tcp || eap || ecp) return ( -2); -#else /* USE_EGO_GRAPHICS */ -if (x || y || n || ap || cp || tap || tcp) return ( -2); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ if (x || y || n || ap || cp) return ( -2); #endif /* USE_TRANSPARENCY */ @@ -574,11 +548,7 @@ if (x || y || n || ap || cp || tap || tcp) return ( -2); * Assumes given location and values are valid. */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc, byte ea, char ec) -#else /* USE_EGO_GRAPHICS */ -void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc) -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ void Term_queue_char(int x, int y, byte a, char c) #endif /* USE_TRANSPARENCY */ @@ -593,8 +563,6 @@ void Term_queue_char(int x, int y, byte a, char c) byte *scr_taa = &scrn->ta[y][x]; char *scr_tcc = &scrn->tc[y][x]; -#ifdef USE_EGO_GRAPHICS - byte *scr_eaa = &scrn->ea[y][x]; char *scr_ecc = &scrn->ec[y][x]; @@ -603,14 +571,6 @@ void Term_queue_char(int x, int y, byte a, char c) (*scr_taa == ta) && (*scr_tcc == tc) && (*scr_eaa == ea) && (*scr_ecc == ec)) return; -#else /* USE_EGO_GRAPHICS */ - - /* Hack -- Ignore non-changes */ - if ((*scr_aa == a) && (*scr_cc == c) && - (*scr_taa == ta) && (*scr_tcc == tc)) return; - -#endif /* USE_EGO_GRAPHICS */ - #else /* USE_TRANSPARENCY */ /* Hack -- Ignore non-changes */ @@ -627,13 +587,9 @@ void Term_queue_char(int x, int y, byte a, char c) *scr_taa = ta; *scr_tcc = tc; -#ifdef USE_EGO_GRAPHICS - *scr_eaa = ea; *scr_ecc = ec; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* Check for new min/max row info */ @@ -655,11 +611,7 @@ void Term_queue_char(int x, int y, byte a, char c) * It is used to update the map in the game. */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc, byte *ea, char *ec) -#else /* USE_EGO_GRAPHICS */ -void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc) -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ void Term_queue_line(int x, int y, int n, byte *a, char *c) #endif /* USE_TRANSPARENCY */ @@ -677,13 +629,9 @@ void Term_queue_line(int x, int y, int n, byte *a, char *c) byte *scr_taa = &scrn->ta[y][x]; char *scr_tcc = &scrn->tc[y][x]; -#ifdef USE_EGO_GRAPHICS - byte *scr_eaa = &scrn->ea[y][x]; char *scr_ecc = &scrn->ec[y][x]; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ while (n--) @@ -691,34 +639,24 @@ void Term_queue_line(int x, int y, int n, byte *a, char *c) #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS /* Hack -- Ignore non-changes */ if ((*scr_aa == *a) && (*scr_cc == *c) && (*scr_taa == *ta) && (*scr_tcc == *tc) && (*scr_eaa == *ea) && (*scr_ecc == *ec)) -#else /* USE_EGO_GRAPHICS */ - /* Hack -- Ignore non-changes */ - if ((*scr_aa == *a) && (*scr_cc == *c) && - (*scr_taa == *ta) && (*scr_tcc == *tc)) -#endif /* USE_EGO_GRAPHICS */ { x++; a++; c++; ta++; tc++; -#ifdef USE_EGO_GRAPHICS ea++; ec++; -#endif /* USE_EGO_GRAPHICS */ scr_aa++; scr_cc++; scr_taa++; scr_tcc++; -#ifdef USE_EGO_GRAPHICS scr_eaa++; scr_ecc++; -#endif /* USE_EGO_GRAPHICS */ continue; } @@ -726,11 +664,9 @@ void Term_queue_line(int x, int y, int n, byte *a, char *c) *scr_taa++ = *ta++; *scr_tcc++ = *tc++; -#ifdef USE_EGO_GRAPHICS /* Save the "literal" information */ *scr_eaa++ = *ea++; *scr_ecc++ = *ec++; -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ @@ -795,12 +731,9 @@ void Term_queue_chars(int x, int y, int n, byte a, cptr s) byte *scr_taa = Term->scr->ta[y]; char *scr_tcc = Term->scr->tc[y]; -#ifdef USE_EGO_GRAPHICS - byte *scr_eaa = Term->scr->ea[y]; char *scr_ecc = Term->scr->ec[y]; -#endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ /* Queue the attr/chars */ @@ -814,8 +747,6 @@ void Term_queue_chars(int x, int y, int n, byte a, cptr s) int ota = scr_taa[x]; int otc = scr_tcc[x]; -#ifdef USE_EGO_GRAPHICS - int oea = scr_eaa[x]; int oec = scr_ecc[x]; @@ -824,13 +755,6 @@ void Term_queue_chars(int x, int y, int n, byte a, cptr s) (ota == 0) && (otc == 0) && (oea == 0) && (oec == 0)) continue; -#else /* USE_EGO_GRAPHICS */ - - /* Hack -- Ignore non-changes */ - if ((oa == a) && (oc == *s) && (ota == 0) && (otc == 0)) continue; - -#endif /* USE_EGO_GRAPHICS */ - #else /* USE_TRANSPARENCY */ /* Hack -- Ignore non-changes */ @@ -847,13 +771,9 @@ void Term_queue_chars(int x, int y, int n, byte a, cptr s) scr_taa[x] = 0; scr_tcc[x] = 0; -#ifdef USE_EGO_GRAPHICS - scr_taa[x] = 0; scr_tcc[x] = 0; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* Note the "range" of window updates */ @@ -908,8 +828,6 @@ static void Term_fresh_row_pict(int y, int x1, int x2) byte nta; char ntc; -#ifdef USE_EGO_GRAPHICS - byte *old_eaa = Term->old->ea[y]; char *old_ecc = Term->old->ec[y]; @@ -922,8 +840,6 @@ static void Term_fresh_row_pict(int y, int x1, int x2) byte nea; char nec; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ @@ -958,8 +874,6 @@ static void Term_fresh_row_pict(int y, int x1, int x2) nta = scr_taa[x]; ntc = scr_tcc[x]; -#ifdef USE_EGO_GRAPHICS - oea = old_eaa[x]; oec = old_ecc[x]; @@ -971,13 +885,6 @@ static void Term_fresh_row_pict(int y, int x1, int x2) (nta == ota) && (ntc == otc) && (nea == oea) && (nec == oec)) -#else /* USE_EGO_GRAPHICS */ - - /* Handle unchanged grids */ - if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc)) - -#endif /* USE_EGO_GRAPHICS */ - #else /* USE_TRANSPARENCY */ /* Handle unchanged grids */ @@ -990,15 +897,10 @@ static void Term_fresh_row_pict(int y, int x1, int x2) { /* Draw pending attr/char pairs */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx], &scr_taa[fx], &scr_tcc[fx], &scr_eaa[fx], &scr_ecc[fx])); -#else /* USE_EGO_GRAPHICS */ - (void)((*Term->pict_hook)(fx, y, fn, - &scr_aa[fx], &scr_cc[fx], &scr_taa[fx], &scr_tcc[fx])); -#endif #else /* USE_TRANSPARENCY */ (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx])); #endif /* USE_TRANSPARENCY */ @@ -1018,11 +920,8 @@ static void Term_fresh_row_pict(int y, int x1, int x2) old_taa[x] = nta; old_tcc[x] = ntc; -#ifdef USE_EGO_GRAPHICS old_eaa[x] = nea; old_ecc[x] = nec; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* Restart and Advance */ @@ -1034,15 +933,10 @@ static void Term_fresh_row_pict(int y, int x1, int x2) { /* Draw pending attr/char pairs */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx], &scr_taa[fx], &scr_tcc[fx], &scr_eaa[fx], &scr_ecc[fx])); -#else /* USE_EGO_GRAPHICS */ - (void)((*Term->pict_hook)(fx, y, fn, - &scr_aa[fx], &scr_cc[fx], &scr_taa[fx], &scr_tcc[fx])); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx])); #endif /* USE_TRANSPARENCY */ @@ -1078,7 +972,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) byte nta; char ntc; -#ifdef USE_EGO_GRAPHICS byte *old_eaa = Term->old->ea[y]; char *old_ecc = Term->old->ec[y]; byte *scr_eaa = Term->scr->ea[y]; @@ -1088,8 +981,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) char oec; byte nea; char nec; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* The "always_text" flag */ @@ -1129,7 +1020,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) nta = scr_taa[x]; ntc = scr_tcc[x]; -#ifdef USE_EGO_GRAPHICS oea = old_eaa[x]; oec = old_ecc[x]; @@ -1141,13 +1031,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) (nta == ota) && (ntc == otc) && (nea == oea) && (nec == oec)) -#else /* USE_EGO_GRAPHICS */ - -/* Handle unchanged grids */ - if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc)) - -#endif /* USE_EGO_GRAPHICS */ - #else /* USE_TRANSPARENCY */ /* Handle unchanged grids */ @@ -1186,13 +1069,9 @@ static void Term_fresh_row_both(int y, int x1, int x2) old_taa[x] = nta; old_tcc[x] = ntc; -#ifdef USE_EGO_GRAPHICS - old_eaa[x] = nea; old_ecc[x] = nec; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* 2nd byte of bigtile */ @@ -1220,18 +1099,9 @@ static void Term_fresh_row_both(int y, int x1, int x2) #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS - /* Hack -- Draw the special attr/char pair */ (void)((*Term->pict_hook)(x, y, 1, &na, &nc, &nta, &ntc, &nea, &nec)); -#else /* USE_EGO_GRAPHICS */ - -/* Hack -- Draw the special attr/char pair */ - (void)((*Term->pict_hook)(x, y, 1, &na, &nc, &nta, &ntc)); - -#endif /* USE_EGO_GRAPHICS */ - #else /* USE_TRANSPARENCY */ /* Hack -- Draw the special attr/char pair */ @@ -1596,13 +1466,9 @@ errr Term_fresh(void) byte *taa = old->ta[y]; char *tcc = old->tc[y]; -#ifdef USE_EGO_GRAPHICS - byte *eaa = old->ea[y]; char *ecc = old->ec[y]; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ @@ -1618,13 +1484,9 @@ errr Term_fresh(void) *taa++ = na; *tcc++ = nc; -#ifdef USE_EGO_GRAPHICS - *eaa++ = na; *ecc++ = nc; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ } @@ -1669,27 +1531,19 @@ errr Term_fresh(void) byte ota = old_taa[tx]; char otc = old_tcc[tx]; -#ifdef USE_EGO_GRAPHICS - byte *old_eaa = old->ea[ty]; char *old_ecc = old->ec[ty]; byte oea = old_eaa[tx]; char oec = old_ecc[tx]; -#endif /* USE_EGO_GRAPHICS */ - #endif /* USE_TRANSPARENCY */ /* Hack -- use "Term_pict()" always */ if (Term->always_pict) { #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc, &ota, &otc, &oea, &oec)); -#else /* USE_EGO_GRAPHICS */ - (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc, &ota, &otc)); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc)); #endif /* USE_TRANSPARENCY */ @@ -1699,11 +1553,7 @@ errr Term_fresh(void) else if (Term->higher_pict && (oa & 0x80)) { #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc, &ota, &otc, &oea, &oec)); -#else /* USE_EGO_GRAPHICS */ -(void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc, &ota, &otc)); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc)); #endif /* USE_TRANSPARENCY */ @@ -1933,11 +1783,7 @@ errr Term_draw(int x, int y, byte a, char c) /* Queue it for later */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS Term_queue_char(x, y, a, c, 0, 0, 0, 0); -#else /* USE_EGO_GRAPHICS */ -Term_queue_char(x, y, a, c, 0, 0); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ Term_queue_char(x, y, a, c); #endif /* USE_TRANSPARENCY */ @@ -1975,11 +1821,7 @@ errr Term_addch(byte a, char c) /* Queue the given character for display */ #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS Term_queue_char(Term->scr->cx, Term->scr->cy, a, c, 0, 0, 0, 0); -#else /* USE_EGO_GRAPHICS */ - Term_queue_char(Term->scr->cx, Term->scr->cy, a, c, 0, 0); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ Term_queue_char(Term->scr->cx, Term->scr->cy, a, c); #endif /* USE_TRANSPARENCY */ @@ -2111,10 +1953,8 @@ errr Term_erase(int x, int y, int n) byte *scr_taa; char *scr_tcc; -#ifdef USE_EGO_GRAPHICS byte *scr_eaa; char *scr_ecc; -#endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ /* Place cursor */ @@ -2131,10 +1971,8 @@ errr Term_erase(int x, int y, int n) scr_taa = Term->scr->ta[y]; scr_tcc = Term->scr->tc[y]; -#ifdef USE_EGO_GRAPHICS scr_eaa = Term->scr->ea[y]; scr_ecc = Term->scr->ec[y]; -#endif #endif /* USE_TRANSPARENCY */ if (n > 0 && (byte)scr_cc[x] == 255 && scr_aa[x] == 255) @@ -2160,10 +1998,8 @@ errr Term_erase(int x, int y, int n) scr_taa[x] = 0; scr_tcc[x] = 0; -#ifdef USE_EGO_GRAPHICS scr_eaa[x] = 0; scr_ecc[x] = 0; -#endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ /* Track minimum changed column */ @@ -2221,10 +2057,8 @@ errr Term_clear(void) byte *scr_taa = Term->scr->ta[y]; char *scr_tcc = Term->scr->tc[y]; -#ifdef USE_EGO_GRAPHICS byte *scr_eaa = Term->scr->ea[y]; char *scr_ecc = Term->scr->ec[y]; -#endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ /* Wipe each column */ @@ -2237,10 +2071,8 @@ errr Term_clear(void) scr_taa[x] = 0; scr_tcc[x] = 0; -#ifdef USE_EGO_GRAPHICS scr_eaa[x] = 0; scr_ecc[x] = 0; -#endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ } diff --git a/src/z-term.h b/src/z-term.h index bcf1373b..e5371825 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -55,13 +55,11 @@ struct term_win byte *vta; char *vtc; -#ifdef USE_EGO_GRAPHICS byte **ea; char **ec; byte *vea; char *vec; -#endif /* USE_EGO_GRAPHICS */ #endif /* USE_TRANSPARENCY */ @@ -235,11 +233,7 @@ struct term void (*resize_hook)(void); #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS errr (*pict_hook)(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 */ - errr (*pict_hook)(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 */ errr (*pict_hook)(int x, int y, int n, const byte *ap, const char *cp); #endif /* USE_TRANSPARENCY */ @@ -308,15 +302,9 @@ extern int scansubdir_max; extern cptr scansubdir_result[255]; #ifdef USE_TRANSPARENCY -#ifdef USE_EGO_GRAPHICS extern void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc, byte ea, char ec); extern void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc, byte *ea, char *ec); -#else /* USE_EGO_GRAPHICS */ -extern void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc); - -extern void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc); -#endif /* USE_EGO_GRAPHICS */ #else /* USE_TRANSPARENCY */ extern void Term_queue_char(int x, int y, byte a, char c); |