Limit exposure of the curses API.

diff --git a/Makefile b/Makefile
index 09f5780b2cd84eea0fffa6590ddff3301aeacfab..c53dee3cea1937030c8b9308e7980736036f9b61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ VERS=1.10
 # Use -g to compile the program for debugging.
 
 #DEBUG = -g -DDEBUG -Wall
-DEBUG = -O2
+DEBUG = -O2 -Wall
 
 # Use -p to profile the program.
 #PROFILE = -p -DPROFILE

diff --git a/NEWS b/NEWS
index c5b182eda923fb2c7ad303c63328d4fa0bec42d4..c5244b20a19f80f601f6efde6f3c290b4d911e6c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
                        vms-empire news
 
 1.10:
-       Fix core dump wehen a satellite bounced off the world edge.
+       Fix core dump when a satellite bounced off the world edge.
        Full ANSIfication of function prototypes (which fixed the 
        sat bug - the code appeasrs to have been tickling some obscure
        bug in the compilation of function calls with K&R-style prototypes).

diff --git a/compmove.c b/compmove.c
index 303fa61adc18a6562197b22a1168ae9ff9481e0e..e2b6bcf723b4550d086f9be510631182e500dd02 100644 (file)
--- a/compmove.c
+++ b/compmove.c
@@ -16,7 +16,6 @@ For each move the user wants us to make, we do the following:
 */
 
 #include <string.h>
-#include <curses.h>    /* Ugh...shouldn't be needed here */
 #include <stdbool.h>
 #include "empire.h"
 #include "extern.h"
@@ -60,7 +59,7 @@ comp_move(int nmoves)
                check_endgame (); /* see if game is over */
 
                topini ();
-               (void) refresh ();
+               (void) redisplay ();
        }
 }
 
@@ -488,7 +487,7 @@ army_move(piece_info_t *obj)
        loc_t new_loc;
        path_map_t path_map2[MAP_SIZE];
        loc_t new_loc2;
-       int cross_cost; /* cost to enter water */
+       int cross_cost = 0; /* cost to enter water */
        
        obj->func = 0; /* army doesn't want a tt */
        if (vmap_at_sea (comp_map, obj->loc)) { /* army can't move? */

diff --git a/display.c b/display.c
index 0970c580d7043ec0852a6f29ffb9a56d7b183a7c..5ae63bc075e0d0813f6ca4c7c2e4f5d7815fee01 100644 (file)
--- a/display.c
+++ b/display.c
@@ -599,6 +599,16 @@ clear_screen(void)
        kill_display ();
 }
 
+/*
+Audible complaint.
+*/
+
+void 
+complain(void)
+{
+       (void) beep ();
+}
+
 /*
 Redraw the screen.
 */

diff --git a/empire.c b/empire.c
index ca51828ae29dd179add6e7fcd1d0740a054c3a0d..5c65935463a8133dd2c07128d26bca590841420a 100644 (file)
--- a/empire.c
+++ b/empire.c
@@ -11,7 +11,6 @@ parser, and the simple commands.
 */
 
 #include <stdio.h>
-#include <curses.h>    /* Ugh...shouldn't be needed here */
 #include "empire.h"
 #include "extern.h"
 
@@ -39,7 +38,7 @@ empire(void) {
        clear_screen (); /* nothing on screen */
        pos_str (7, 0, "EMPIRE, Version 5.00 site Amdahl 1-Apr-1988",0,0,0,0,0,0,0,0);
        pos_str (8, 0, "Detailed directions are in EMPIRE.DOC\n",0,0,0,0,0,0,0,0);
-       (void) refresh ();
+       (void) redisplay ();
 
        if (!restore_game ()) /* try to restore previous game */
                init_game (); /* otherwise init a new game */

diff --git a/extern.h b/extern.h
index 5bea08b293d4d9e4180dd33d5700c1824e050066..be12308cb242bd3377e175ae436950d230e8709c 100644 (file)
--- a/extern.h
+++ b/extern.h
@@ -157,6 +157,7 @@ void init_colors (void);
 #endif /* A_COLOR */
 void redraw (void);
 void clear_screen (void);
+void complain (void);
 void delay (void);
 void close_disp (void);
 void pos_str (int row, int col, char *str, int a, int b, int c, int d, int e, int f, int g, int h);

diff --git a/game.c b/game.c
index 77ba1b5bd77d6169fe909220a8d842ca37ad320e..30c694af82bcfd435aa6056a172dc96237f79dda 100644 (file)
--- a/game.c
+++ b/game.c
@@ -13,7 +13,6 @@ game.c -- Routines to initialize, save, and restore a game.
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <curses.h>    /* Ugh...shouldn't be needed here */
 #include "empire.h"
 #include "extern.h"
 
@@ -764,7 +763,7 @@ replay_movie(void)
                for (c = 0; c < MAP_WIDTH; c += col_inc)
                print_movie_cell (mapbuf, r, c, row_inc, col_inc);
                
-               (void) refresh ();
+               (void) redisplay ();
                delay ();
        }
        (void) fclose (f);

diff --git a/usermove.c b/usermove.c
index ec131a9b85cd814a259af53a2a23db0618cb758d..1f664723599226c463e4506a1a70050a5e6a5dbe 100644 (file)
--- a/usermove.c
+++ b/usermove.c
@@ -12,7 +12,6 @@ usermove.c -- Let the user move her troops.
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <curses.h>    /* Ugh...shouldn't be needed here */
 #include "empire.h"
 #include "extern.h"
 
@@ -88,7 +87,7 @@ user_move(void) {
                }
                if (cur_sector () == sec) { /* is sector displayed? */
                        print_sector_u (sec); /* make screen up-to-date */
-                       (void) refresh (); /* show it to the user */
+                       redisplay (); /* show it to the user */
                }
        }
        if (save_movie) save_movie_screen ();
@@ -135,7 +134,7 @@ piece_move(piece_info_t *obj)
                        ask_user (obj);
                        topini (); /* clear info lines */
                        display_loc_u (obj->loc); /* let user see result */
-                       (void) refresh ();
+                       (void) redisplay ();
                        need_input = FALSE; /* we got it */
                }
                
@@ -553,7 +552,7 @@ void ask_user(piece_info_t *obj)
        case 'P': user_redraw (); break;
        case '?': describe_obj (obj); break;
 
-       default: (void) beep ();
+       default: complain ();
        }
     }
 }
@@ -601,7 +600,7 @@ or carrier.  If not, we beep at the user.
 void
 user_fill(piece_info_t *obj)
 {
-       if (obj->type != TRANSPORT && obj->type != CARRIER) (void) beep ();
+       if (obj->type != TRANSPORT && obj->type != CARRIER) complain ();
        else obj->func = FILL;
 }
 
@@ -638,7 +637,7 @@ user_set_dir(piece_info_t *obj)
        case 'X': obj->func = MOVE_S ; break;
        case 'Z': obj->func = MOVE_SW; break;
        case 'A': obj->func = MOVE_W ; break;
-       default: (void) beep (); break;
+       default: complain (); break;
        }
 }
 
@@ -679,7 +678,7 @@ Set a fighter's function to land at the nearest city.
 void
 user_land(piece_info_t *obj)
 {
-       if (obj->type != FIGHTER) (void) beep ();
+       if (obj->type != FIGHTER) complain ();
        else obj->func = LAND;
 }
 
@@ -700,7 +699,7 @@ Set an army's function to WFTRANSPORT.
 void
 user_transport(piece_info_t *obj)
 {
-       if (obj->type != ARMY) (void) beep ();
+       if (obj->type != ARMY) complain ();
        else obj->func = WFTRANSPORT;
 }
 
@@ -711,7 +710,7 @@ Set an army's function to ARMYATTACK.
 void
 user_armyattack(piece_info_t *obj)
 {
-       if (obj->type != ARMY) (void) beep ();
+       if (obj->type != ARMY) complain ();
        else obj->func = ARMYATTACK;
 }
 
@@ -722,7 +721,7 @@ Set a ship's function to REPAIR.
 void
 user_repair(piece_info_t *obj)
 {
-       if (obj->type == ARMY || obj->type == FIGHTER) (void) beep ();
+       if (obj->type == ARMY || obj->type == FIGHTER) complain ();
        else obj->func = REPAIR;
 }
 
@@ -743,13 +742,13 @@ user_set_city_func(piece_info_t *obj)
 
        cityp = find_city (obj->loc);
        if (!cityp || cityp->owner != USER) {
-               (void) beep ();
+               complain ();
                return;
        }
 
        type = get_piece_name();
        if (type == NOPIECE) {
-               (void) beep ();
+               complain ();
                return;
        }
        
@@ -778,7 +777,7 @@ user_set_city_func(piece_info_t *obj)
                e_city_attack (cityp, type);
                break;
        default: /* bad command? */
-               (void) beep ();
+               complain ();
                break;
        }
 }
@@ -793,7 +792,7 @@ user_build(piece_info_t *obj)
        city_info_t *cityp;
 
        if (user_map[obj->loc].contents != 'O') { /* no user city here? */
-               (void) beep ();
+               complain ();
                return;
        }
        cityp = find_city (obj->loc);