Global changes for qt, qt4, amiga, x11 and curses.
This commit is contained in:
@@ -58,7 +58,7 @@ curses_create_window(int width, int height, orient orientation)
|
||||
|
||||
if ((orientation == UP) || (orientation == DOWN) ||
|
||||
(orientation == LEFT) || (orientation == RIGHT)) {
|
||||
if (invent || (moves > 1)) {
|
||||
if (g.invent || (g.moves > 1)) {
|
||||
map_border = curses_window_has_border(MAP_WIN);
|
||||
curses_get_window_xy(MAP_WIN, &mapx, &mapy);
|
||||
curses_get_window_size(MAP_WIN, &maph, &mapw);
|
||||
@@ -92,7 +92,7 @@ curses_create_window(int width, int height, orient orientation)
|
||||
starty = (term_rows / 2) - (height / 2);
|
||||
break;
|
||||
case UP:
|
||||
if (invent || (moves > 1)) {
|
||||
if (g.invent || (g.moves > 1)) {
|
||||
startx = (mapw / 2) - (width / 2) + mapx + mapb_offset;
|
||||
} else {
|
||||
startx = 0;
|
||||
@@ -101,7 +101,7 @@ curses_create_window(int width, int height, orient orientation)
|
||||
starty = mapy + mapb_offset;
|
||||
break;
|
||||
case DOWN:
|
||||
if (invent || (moves > 1)) {
|
||||
if (g.invent || (g.moves > 1)) {
|
||||
startx = (mapw / 2) - (width / 2) + mapx + mapb_offset;
|
||||
} else {
|
||||
startx = 0;
|
||||
@@ -117,7 +117,7 @@ curses_create_window(int width, int height, orient orientation)
|
||||
starty = term_rows - height;
|
||||
break;
|
||||
case RIGHT:
|
||||
if (invent || (moves > 1)) {
|
||||
if (g.invent || (g.moves > 1)) {
|
||||
startx = (mapw + mapx + (mapb_offset * 2)) - width;
|
||||
} else {
|
||||
startx = term_cols - width;
|
||||
@@ -167,7 +167,7 @@ curses_refresh_nethack_windows()
|
||||
map_window = curses_get_nhwin(MAP_WIN);
|
||||
inv_window = curses_get_nhwin(INV_WIN);
|
||||
|
||||
if ((moves <= 1) && !invent) {
|
||||
if ((g.moves <= 1) && !g.invent) {
|
||||
/* Main windows not yet displayed; refresh base window instead */
|
||||
touchwin(stdscr);
|
||||
refresh();
|
||||
|
||||
Reference in New Issue
Block a user