More factoring out of the display interface.

diff --git a/display.c b/display.c
index 99abea7ee1c0cb763441890b31b46e62111cd9c8..9e46067893d7dd7cf0676f74695e18b3d9766afb 100644 (file)
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.8 2002/04/19 09:17:01 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: display.c,v 1.9 2006/07/25 15:59:54 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -564,6 +564,11 @@ clear_screen () {
 Redraw the screen.
 */
 
+void 
+redisplay () {
+       (void) refresh ();
+}
+
 void
 redraw () {
        (void) clearok (curscr, TRUE);

diff --git a/empire.c b/empire.c
index dadd14a9a15c04f9b5cf0d0d6e49ce8cc8e4f023..db5e75a7eb66950d95ff3c19f2bb311c1ebc3e3e 100644 (file)
--- a/empire.c
+++ b/empire.c
@@ -1,4 +1,4 @@
-/* $Id: empire.c,v 1.4 2000/07/28 05:12:51 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: empire.c,v 1.5 2006/07/25 15:59:54 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -13,12 +13,19 @@ parser, and the simple commands.
 */
 
 #include <stdio.h>
-#include <curses.h>
 #include "empire.h"
 #include "extern.h"
 
 void c_examine(), c_movie();
 
+/*
+ * 03a 01Apr88 aml .Hacked movement algorithms for computer.
+ * 02b 01Jun87 aml .First round of bug fixes.
+ * 02a 01Jan87 aml .Translated to C.
+ * 01b 27May85 cal .Fixed round number update bug. Made truename simple.
+ * 01a 01Sep83 cal .Taken from a Decus tape
+ */
+
 void
 empire () {
        void do_command();
@@ -31,8 +38,7 @@ empire () {
        rndini (); /* init random number generator */
 
        clear_screen (); /* nothing on screen */
-       (void) move (7, 0);
-       version ();
+       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 ();
 
@@ -50,7 +56,7 @@ empire () {
            }
            else {
                prompt (0,0,0,0,0,0,0,0,0); /* blank top line */
-               (void) refresh ();
+               void redisplay();
                prompt ("Your orders? ",0,0,0,0,0,0,0,0);
                order = get_chx (); /* get a command */
                do_command (order);
@@ -152,11 +158,9 @@ char orders;
                if (resigned || debug) replay_movie ();
                else error ("You cannot watch movie until computer resigns.",0,0,0,0,0,0,0,0);
                break;
-       
+
        case 'Z': /* print compressed map */
-               (void) clear ();
                print_zoom (user_map);
-               (void) refresh ();
                break;
 
        case '\014': /* redraw the screen */

diff --git a/extern.h b/extern.h
index 978fdf9eb63013a4a42494b05a4768e07b3940ac..ae71ec085a12410b5fdbcd498ee18ba2cd97a60f 100644 (file)
--- a/extern.h
+++ b/extern.h
@@ -1,4 +1,4 @@
-/* $Id: extern.h,v 1.7 2006/07/25 15:19:49 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: extern.h,v 1.8 2006/07/25 15:59:54 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -139,7 +139,9 @@ int rmap_shore (long loc);
 int vmap_at_sea (view_map_t *vmap, long loc);
 int rmap_at_sea (long loc);
 
-void kill_display (); /* display routines */
+/* display routines */
+void redisplay();
+void kill_display ();
 void sector_change ();
 int cur_sector ();
 long cur_cursor ();
@@ -230,7 +232,6 @@ void ksend1 (char *buf, char *a, int b, int c, int d, int e, int f, int g, int h
 void ttinit ();
 void assert (char *expression, char *file, int line);
 void empend ();
-void version ();
 char upper (char c);
 void tupper (char *str);
 void check ();

diff --git a/util.c b/util.c
index f7efa50b756f1e7214c4a71452b4e494a5c8392a..e53670b4b7d9847b02718bd21789c56d543face7 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $Id: util.c,v 1.4 2006/07/25 15:20:30 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: util.c,v 1.5 2006/07/25 15:59:54 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -80,19 +80,6 @@ empend ()
        exit (0);
 }
 
-/*
- * 03a 01Apr88 aml .Hacked movement algorithms for computer.
- * 02b 01Jun87 aml .First round of bug fixes.
- * 02a 01Jan87 aml .Translated to C.
- * 01b 27May85 cal .Fixed round number update bug. Made truename simple.
- * 01a 01Sep83 cal .Taken from a Decus tape
- */
-
-void
-version ()
-{
-        (void) addstr ("EMPIRE, Version 5.00 site Amdahl 1-Apr-1988");
-}
 
 /*
 Here is a little routine to perform consistency checking on the