From 41a2a62273139be0a7524aec3289dd39ccd4660c Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 11 Aug 2020 13:11:15 +0200
Subject: [PATCH] fairland: Drop option -o

With -o, fairland doesn't add resources.  This is pretty redundant;
the deity can unset resources with "edit l * i 0 g 0 f 0 c 0 u 0".
Drop the option.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---
 man/fairland.6      |  4 ----
 src/util/fairland.c | 17 +++--------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/man/fairland.6 b/man/fairland.6
index 0157c0e7..1daabd0c 100644
--- a/man/fairland.6
+++ b/man/fairland.6
@@ -40,10 +40,6 @@ Help.  Print brief usage information and exit.
 .B \-i
 islands will crash into each other and merge
 .TP
-.B \-o
-do not set the resources.  If you use this flag, then you will need to
-set the resources yourself.
-.TP
 .B \-q
 run quietly without printing anything to the terminal
 .TP
diff --git a/src/util/fairland.c b/src/util/fairland.c
index 4fd894eb..24eadd6c 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -109,9 +109,6 @@
 #include "version.h"
 #include "xy.h"
 
-/* define ORE 1 to add resources, define ORE 0 if you want to use another
-   program to add the resources */
-static int ORE = 1;
 static int quiet = 0;
 
 /* If you don't specify these command line arguments, then these are the
@@ -245,7 +242,7 @@ main(int argc, char *argv[])
 
     program_name = argv[0];
 
-    while ((opt = getopt(argc, argv, "e:hioqR:s:v")) != EOF) {
+    while ((opt = getopt(argc, argv, "e:hiqR:s:v")) != EOF) {
 	switch (opt) {
 	case 'e':
 	    config_file = optarg;
@@ -253,9 +250,6 @@ main(int argc, char *argv[])
 	case 'i':
 	    DISTINCT_ISLANDS = 0;
 	    break;
-	case 'o':
-	    ORE = 0;
-	    break;
 	case 'q':
 	    quiet = 1;
 	    break;
@@ -312,8 +306,7 @@ main(int argc, char *argv[])
     qprint("\nelevating land...\n");
     create_elevations();
     qprint("designating sectors...\n");
-    if (ORE)
-	qprint("adding resources...\n");
+    qprint("adding resources...\n");
     if (!write_newcap_script())
 	exit(1);
 
@@ -331,8 +324,6 @@ main(int argc, char *argv[])
     output();
     qprint("\n\nA script for adding all the countries can be found in \"%s\".\n",
 	   outfile);
-    if (!ORE)
-	qprint("\t*** Resources have not been added ***\n");
     exit(0);
 }
 
@@ -382,7 +373,6 @@ usage(void)
 	   "  -e CONFIG-FILE  configuration file\n"
 	   "                  (default %s)\n"
 	   "  -i              islands may merge\n"
-	   "  -o              don't set resources\n"
 	   "  -q              quiet\n"
 	   "  -R SEED         seed for random number generator\n"
 	   "  -s SCRIPT       name of script to create (default %s)\n"
@@ -1142,8 +1132,7 @@ write_sects(void)
 	    sct->sct_elev = total;
 	    sct->sct_newtype = sct->sct_type;
 	    sct->sct_dterr = own[sct->sct_x][y] + 1;
-	    if (ORE)
-		add_resources(sct);
+	    add_resources(sct);
 	}
     }
     set_coastal_flags();