nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

H2344 fix backout (trunk only)

Browse Source 
Undo the win/tty/wintty.c bands of the H2344 fix until the fix is fixed.  I
didn't take out the type changes to hopefully avoid putting people through
a full recompile.
This commit is contained in:
keni
2011-12-11 21:58:29 +00:00
parent 2a2e2b299e
commit 9c1268d581
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/tty/wintty.c
+22 -1
View File
@@ -1714,7 +1714,11 @@ struct WinDesc *cw;
n = 0; n = 0;
} }
tty_curs(window, 1, n++); tty_curs(window, 1, n++);
#ifdef H2344_BROKEN
cl_end(); cl_end();
#else
if (cw->offx) cl_end();
#endif
if (cw->data[i]) { if (cw->data[i]) {
attr = cw->data[i][0] - 1; attr = cw->data[i][0] - 1;
if (cw->offx) { if (cw->offx) {
@@ -1738,10 +1742,12 @@ struct WinDesc *cw;
} }
} }
if (i == cw->maxrow) { if (i == cw->maxrow) {
#ifdef H2344_BROKEN
if(cw->type == NHW_TEXT){ if(cw->type == NHW_TEXT){
tty_curs(BASE_WINDOW, 0, (int)ttyDisplay->cury+1); tty_curs(BASE_WINDOW, 0, (int)ttyDisplay->cury+1);
cl_eos(); cl_eos();
} }
#endif
tty_curs(BASE_WINDOW, (int)cw->offx + 1, tty_curs(BASE_WINDOW, (int)cw->offx + 1,
(cw->type == NHW_TEXT) ? (int) ttyDisplay->rows - 1 : n); (cw->type == NHW_TEXT) ? (int) ttyDisplay->rows - 1 : n);
cl_end(); cl_end();
@@ -1793,14 +1799,29 @@ tty_display_nhwindow(window, blocking)
/*FALLTHRU*/ /*FALLTHRU*/
case NHW_MENU: case NHW_MENU:
cw->active = 1; cw->active = 1;
#ifdef H2344_BROKEN
/* XXX this is the block that messes up corner win for player selection
(at least when undoing the patch one piece at a time from the start
of the file)
*/
cw->offx = (cw->type==NHW_TEXT) cw->offx = (cw->type==NHW_TEXT)
? 0 ? 0
: min(10, ttyDisplay->cols - cw->maxcol - 1); : min(10, ttyDisplay->cols - cw->maxcol - 1);
#else
/* avoid converting to uchar before calculations are finished */
cw->offx = (uchar) (int)
max((int) 10, (int) (ttyDisplay->cols - cw->maxcol - 1));
#endif
if(cw->type == NHW_MENU) if(cw->type == NHW_MENU)
cw->offy = 0; cw->offy = 0;
if(ttyDisplay->toplin == 1) if(ttyDisplay->toplin == 1)
tty_display_nhwindow(WIN_MESSAGE, TRUE); tty_display_nhwindow(WIN_MESSAGE, TRUE);
if(cw->maxrow >= (int) ttyDisplay->rows) { #ifdef H2344_BROKEN
if(cw->maxrow >= (int) ttyDisplay->rows)
#else
if(cw->offx == 10 || cw->maxrow >= (int) ttyDisplay->rows)
#endif
{
cw->offx = 0; cw->offx = 0;
if(cw->offy) { if(cw->offy) {
tty_curs(window, 1, 0); tty_curs(window, 1, 0);