diff options
| -rw-r--r-- | src/main-sdl.c | 6 | ||||
| -rw-r--r-- | src/z-term.c | 22 | ||||
| -rw-r--r-- | src/z-term.h | 4 |
3 files changed, 6 insertions, 26 deletions
diff --git a/src/main-sdl.c b/src/main-sdl.c index 1ab89545..a110efb2 100644 --- a/src/main-sdl.c +++ b/src/main-sdl.c @@ -1061,9 +1061,6 @@ void eraseTerminal(void) * which is not black, then this function must be able to draw * the resulting "blank" correctly. * - * Note that this function must correctly handle "black" text if - * the "always_text" flag is set, if this flag is not set, all the - * "black" text will be handled by the "Term_wipe_xxx()" hook. */ static errr Term_text_sdl(int x, int y, int n, byte a, const char *cp) { @@ -1764,9 +1761,6 @@ static errr term_data_init(term_data *td, int i) /* Use a "soft" cursor */ t->soft_cursor = TRUE; - /* Picture routine flags */ - t->always_text = FALSE; - /* Hooks */ t->xtra_hook = Term_xtra_sdl; t->curs_hook = Term_curs_sdl; diff --git a/src/z-term.c b/src/z-term.c index 1a16b093..db4aea66 100644 --- a/src/z-term.c +++ b/src/z-term.c @@ -194,8 +194,7 @@ * * The "Term->wipe_hook" hook provides this package with a simple way * to "erase", starting at "x,y", the next "n" grids. This hook assumes - * that the input is valid. This hook is required, unless the setting - * of the "always_text" flag makes it optional. + * that the input is valid. * * The "Term->text_hook" hook provides this package with a simple way * to "draw", starting at "x,y", the "n" chars contained in "cp", using @@ -498,9 +497,6 @@ static void Term_fresh_row_text(int y, int x1, int x2) byte *scr_aa = Term->scr->a[y]; char *scr_cc = Term->scr->c[y]; - /* The "always_text" flag */ - int always_text = Term->always_text; - /* Pending length */ int fn = 0; @@ -534,7 +530,7 @@ static void Term_fresh_row_text(int y, int x1, int x2) if (fn) { /* Draw pending chars (normal) */ - if (fa || always_text) + if (fa) { (void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx])); } @@ -564,7 +560,7 @@ static void Term_fresh_row_text(int y, int x1, int x2) if (fn) { /* Draw the pending chars */ - if (fa || always_text) + if (fa) { (void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx])); } @@ -591,7 +587,7 @@ static void Term_fresh_row_text(int y, int x1, int x2) if (fn) { /* Draw pending chars (normal) */ - if (fa || always_text) + if (fa) { (void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx])); } @@ -661,14 +657,8 @@ static void Term_fresh_row_text(int y, int x1, int x2) * the "Term_wipe()" function is used to display all "black" text, such * as the default "spaces" created by "Term_clear()" and "Term_erase()". * - * Note that the "Term->always_text" flag will disable the use of the - * "Term_wipe()" function hook entirely, and force all text, even text - * drawn in the color "black", to be explicitly drawn. This is useful - * for machines which implement "Term_wipe()" by just drawing spaces. - * * Note that if no "black" text is ever drawn, and if "attr_blank" is - * not "zero", then the "Term_wipe" hook will never be used, even if - * the "Term->always_text" flag is not set. + * not "zero", then the "Term_wipe" hook will never be used. * * This function does nothing unless the "Term" is "mapped", which allows * certain systems to optimize the handling of "closed" windows. @@ -788,7 +778,7 @@ errr Term_fresh(void) char oc = old_cc[tx]; /* Hack -- restore the actual character */ - if (oa || Term->always_text) + if (oa) { (void)((*Term->text_hook)(tx, ty, 1, oa, &oc)); } diff --git a/src/z-term.h b/src/z-term.h index 875f13bb..60d2ad94 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -71,9 +71,6 @@ struct term_win * - Flag "soft_cursor" * This "term" uses a "software" cursor * - * - Flag "always_text" - * Use the "Term_text()" routine for invisible text - * * * * @@ -126,7 +123,6 @@ struct term bool_ total_erase; bool_ icky_corner; bool_ soft_cursor; - bool_ always_text; char *key_queue; u16b key_head; |