Use bools and enums where appropriate.

diff --git a/compmove.c b/compmove.c
index 3695768668f051d1b961f34d46633f99f6ab470e..39b27806320bbf318637e1316169ac613ffcd2ba 100644 (file)
--- a/compmove.c
+++ b/compmove.c
@@ -1115,7 +1115,7 @@ check_endgame(void)
        announce ("\nreceiving battle information. You can display what");
        announce ("\nthey've learned with the ''E'' command.");
        resigned = true;
-       win = 2;
+       win = ratio_win;
        automove = false;
     }
     else if (ncomp_city == 0 && ncomp_army == 0) {
@@ -1124,7 +1124,7 @@ check_endgame(void)
        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;
+       win = wipeout_win;
        automove = false;
     }
     else if (nuser_city == 0 && nuser_army == 0) {

diff --git a/empire.h b/empire.h
index 11665bf0a158ec0b9769cbd965b16b46b60841ff..3a6046801217f1d0f1ada00182f24dd06f8e2c17 100644 (file)
--- a/empire.h
+++ b/empire.h
@@ -261,3 +261,7 @@ typedef struct {
        long len; /* number of items in list */
        long list[MAP_SIZE]; /* list of locations */
 } perimeter_t;
+
+enum win_t {no_win, wipeout_win, ratio_win};
+
+/* end */

diff --git a/game.c b/game.c
index d2d132b4e2770b3ad704c0695fcaf6257124d873..f0de9d282ee05c38515a6d5c6c97f1a7abc59a95 100644 (file)
--- a/game.c
+++ b/game.c
@@ -44,7 +44,7 @@ void init_game(void)
     print_vmap = false;
     trace_pmap = false;
     save_movie = false;
-    win = 0;
+    win = no_win;
     date = 0; /* no date yet */
     user_score = 0;
     comp_score = 0;

diff --git a/map.c b/map.c
index 43fdb99947034acffa3a1d0b81cf4e701aaa4a66..aaacb22a5f725cf21ce57fb7729a02162df72869 100644 (file)
--- a/map.c
+++ b/map.c
@@ -481,7 +481,7 @@ constant and 'memcpy'.
 */
 
 static path_map_t pmap_init[MAP_SIZE];
-static int init_done = 0;
+static bool init_done = false;
 
 STATIC void
 start_perimeter(path_map_t *pmap, perimeter_t *perim, loc_t loc, int terrain)
@@ -490,7 +490,7 @@ start_perimeter(path_map_t *pmap, perimeter_t *perim, loc_t loc, int terrain)
     if (!init_done) {
        int i;
        
-       init_done = 1;
+       init_done = true;
        for (i = 0; i < MAP_SIZE; i++) {
            pmap_init[i].cost = INFINITY; /* everything lies outside perim */
            pmap_init[i].terrain = T_UNKNOWN;