Rename dgl's local_{COLS,LINES} so they don't collide with ee

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@492 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Pasi Kallinen 2009-10-18 13:57:12 +00:00
parent a4829f9627
commit c237c27478
3 changed files with 8 additions and 8 deletions

View File

@ -408,7 +408,7 @@ inprogressmenu (int gameid)
while (1)
{
term_resize_check();
max_height = local_LINES - (top_banner_hei + btm_banner_hei) - 1;
max_height = dgl_local_LINES - (top_banner_hei + btm_banner_hei) - 1;
if (max_height < 2) {
free(is_nhext);
free_populated_games(games, len);
@ -470,7 +470,7 @@ inprogressmenu (int gameid)
}
btm = local_LINES-btm_banner_hei-top_banner_hei;
btm = dgl_local_LINES-btm_banner_hei-top_banner_hei;
if (btm > i) btm = i+1;
if (len > 0) {
if (max_height+offset < len)

View File

@ -174,8 +174,8 @@ extern int num_games;
extern mode_t default_fmode;
extern int local_COLS;
extern int local_LINES;
extern int dgl_local_COLS;
extern int dgl_local_LINES;
/* dgamelaunch.c */
extern void create_config(void);

View File

@ -54,7 +54,7 @@ int loggedin = 0;
char *chosen_name;
int num_games = 0;
int local_COLS = -1, local_LINES = -1;
int dgl_local_COLS = -1, dgl_local_LINES = -1;
int curses_resize = 0;
int selected_game = 0;
@ -75,13 +75,13 @@ sigwinch_func(int sig)
void
term_resize_check()
{
if ((COLS == local_COLS) && (LINES == local_LINES) && !curses_resize) return;
if ((COLS == dgl_local_COLS) && (LINES == dgl_local_LINES) && !curses_resize) return;
endwin();
initcurses();
refresh();
local_COLS = COLS;
local_LINES = LINES;
dgl_local_COLS = COLS;
dgl_local_LINES = LINES;
curses_resize = 0;
}