More display-code isolation.

diff --git a/compmove.c b/compmove.c
index 5ee71bfdc7bc0ff9d9f9a0736ada03abdbb5d891..cdd84905274099848a724aa597e107267cca3139 100644 (file)
--- a/compmove.c
+++ b/compmove.c
@@ -1153,28 +1153,28 @@ check_endgame () { /* see if game is over */
                error ("you wish to smash the rest of the enemy? ",0,0,0,0,0,0,0,0);
 
                if (get_chx() !=  'Y') empend ();
-               (void) addstr ("\nThe enemy inadvertantly revealed its code used for");
-               (void) addstr ("\nreceiving battle information. You can display what");
-               (void) addstr ("\nthey've learned with the ''E'' command.");
+               announce ("\nThe enemy inadvertantly revealed its code used for");
+               announce ("\nreceiving battle information. You can display what");
+               announce ("\nthey've learned with the ''E'' command.");
                resigned = TRUE;
                win = 2;
                automove = FALSE;
        }
        else if (ncomp_city == 0 && ncomp_army == 0) {
                clear_screen ();
-               (void) addstr ("The enemy is incapable of defeating you.\n");
-               (void) addstr ("You are free to rape the empire as you wish.\n");
-               (void) addstr ("There may be, however, remnants of the enemy fleet\n");
-               (void) addstr ("to be routed out and destroyed.\n");
+               announce ("The enemy is incapable of defeating you.\n");
+               announce ("You are free to rape the empire as you wish.\n");
+               announce ("There may be, however, remnants of the enemy fleet\n");
+               announce ("to be routed out and destroyed.\n");
                win = 1;
                automove = FALSE;
        }
        else if (nuser_city == 0 && nuser_army == 0) {
                clear_screen ();
-               (void) addstr ("You have been rendered incapable of\n");
-               (void) addstr ("defeating the rampaging enemy fascists! The\n");
-               (void) addstr ("empire is lost. If you have any ships left, you\n");
-               (void) addstr ("may attempt to harass enemy shipping.");
+               announce ("You have been rendered incapable of\n");
+               announce ("defeating the rampaging enemy fascists! The\n");
+               announce ("empire is lost. If you have any ships left, you\n");
+               announce ("may attempt to harass enemy shipping.");
                win = 1;
                automove = FALSE;
        }

diff --git a/display.c b/display.c
index 57674c127e50d6a36847a601288f29226b9bd4d1..81ac92b6c8d5cf905aefb00685f92c83fa4f6081 100644 (file)
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.10 2006/07/25 16:43:14 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: display.c,v 1.11 2006/07/25 16:51:22 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -50,6 +50,13 @@ void init_colors()
 }
 #endif /* A_COLOR */
 
+/*
+Used for win announcements 
+ */
+void announce (char *msg) {
+    (void) addstr (msg);
+}
+
 /*
 This routine is called when the current display has been
 trashed and no sector is shown on the screen.

diff --git a/extern.h b/extern.h
index ae71ec085a12410b5fdbcd498ee18ba2cd97a60f..9b7c8b66c73ea4047986681f0b7419d646d8452e 100644 (file)
--- a/extern.h
+++ b/extern.h
@@ -1,4 +1,4 @@
-/* $Id: extern.h,v 1.8 2006/07/25 15:59:54 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
+/* $Id: extern.h,v 1.9 2006/07/25 16:43:14 esr Exp esr $  - (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -140,6 +140,7 @@ int vmap_at_sea (view_map_t *vmap, long loc);
 int rmap_at_sea (long loc);
 
 /* display routines */
+void announce (char *);
 void redisplay();
 void kill_display ();
 void sector_change ();

diff --git a/term.c b/term.c
index 67a823d6b384b92f6adcb19de80d885f4979e30a..576adab5b237d74ac93b239c470c3409cda708bb 100644 (file)
--- a/term.c
+++ b/term.c
@@ -468,13 +468,5 @@ loc_disp (int loc)
   for (i = COL_DIGITS; i > 0; i--) {
     nrow *= 10; }
   move (LINES - 1, 0);
-  /*
-  {
-    char junkbuf[STRSIZE];
-    (void) snprintf (junkbuf, STRSIZE, "loc: %d, row: %d, col: %d, nrow: %d, nrow+col: %d", loc, row, col, nrow, nrow + col);
-    (void) addstr (junkbuf);
-    napms(500);
-  }
-  */
   return nrow + col;
 }

diff --git a/usermove.c b/usermove.c
index d85888567cccc22832fa1cc58fe0bd94ad66c2f7..20ab45cb3b46a1690173f9ca8152950377c9668e 100644 (file)
--- a/usermove.c
+++ b/usermove.c
@@ -13,6 +13,7 @@ usermove.c -- Let the user move her troops.
 
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "empire.h"
 #include "extern.h"