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

diff --git a/dgamelaunch.c b/dgamelaunch.c
index 83a0869951dbb76641e8bbadefdcc9da0c85d443..3cdf07ed53e975c4fe15bceaf88888067231145b 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -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)

diff --git a/dgamelaunch.h b/dgamelaunch.h
index e9b59583d60ab8b1b500d6737029a29098ddb895..4d4a793661c78ea0732f2b355866d9568efe2e86 100644 (file)
--- a/dgamelaunch.h
+++ b/dgamelaunch.h
@@ -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);

diff --git a/dgl-common.c b/dgl-common.c
index 4c97caa5c159bef26d6c4959cd06d92f4145b904..9432b3c4ebabac9b3122980906d991c2c125d548 100644 (file)
--- a/dgl-common.c
+++ b/dgl-common.c
@@ -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;
 }