Avoid SCT_TYPE_MAX, use ARRAY_SIZE() instead

[empserver] / src / lib / commands / budg.c

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index dfc0fa5bd598563324781173660358bf86092ebf..028133dc401fd8386a9c906824a3ef981b14fee4 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
  *     Thomas Ruschak, 1992
  *     Ville Virrankoski, 1995
  *     Steve McClure, 1997-2000
- *     Markus Armbruster, 2004-2016
+ *     Markus Armbruster, 2004-2020
  */
 
 #include <config.h>
@@ -61,7 +61,7 @@ budg(void)
        { "Sector building", "sector" },
        { "Sector maintenance", "sector" }
     };
-    int i;
+    unsigned i;
     struct budget *budget;
     int income, expenses, taxes;
     struct natstr *np;
@@ -76,7 +76,7 @@ budg(void)
     income = expenses = 0;
 
     pr("Sector Type\t\t\tProduction\t\t\t    Cost\n");
-    for (i = 0; i <= SCT_TYPE_MAX; i++) {
+    for (i = 0; i < ARRAY_SIZE(budget->prod); i++) {
        if (!budget->prod[i].money)
            continue;
        pr("%-17s\t\t", dchr[i].d_name);
@@ -132,7 +132,7 @@ budg(void)
     pr("Estimated new treasury%s\n",
        dotsprintf(buf, "%50d", np->nat_money + income - expenses));
     if (np->nat_money + income - expenses < 0 && !player->god) {
-       pr("After processsing sectors, you will be broke!\n");
+       pr("After processing sectors, you will be broke!\n");
        pr("Sectors will not produce, distribute, or deliver!\n\n");
     }
 
@@ -156,31 +156,24 @@ calc_all(void)
     budget->start_money = budget->money = np->nat_money;
     bp = bp_alloc();
 
+    prep_ships(etu, bp);
+    prep_planes(etu, bp);
+    prep_lands(etu, bp);
     prepare_sects(etu, bp);
-    for (i = 0; i < MAXNOC; i++) {
-       prep_ships(etu, i);
-       prep_planes(etu, i);
-       prep_lands(etu, i);
-       pay_reserve(getnatp(i), etu);
-    }
+    pay_reserve(np, etu);
 
     /* Maintain ships, planes and land units */
-    for (i = 0; i < MAXNOC; i++) {
-       prod_ship(etu, i, bp, 0);
-       prod_plane(etu, i, bp, 0);
-       prod_land(etu, i, bp, 0);
-    }
+    prod_ship(etu, bp, 0);
+    prod_plane(etu, bp, 0);
+    prod_land(etu, bp, 0);
 
     /* Produce */
-    for (i = 0; i < MAXNOC; i++)
-       produce_sect(getnatp(i), etu, bp);
+    produce_sect(etu, bp);
 
     /* Build ships, planes and land units */
-    for (i = 0; i < MAXNOC; i++) {
-       prod_ship(etu, i, bp, 1);
-       prod_plane(etu, i, bp, 1);
-       prod_land(etu, i, bp, 1);
-    }
+    prod_ship(etu, bp, 1);
+    prod_plane(etu, bp, 1);
+    prod_land(etu, bp, 1);
 
     if (CANT_HAPPEN(np->nat_money != budget->start_money))
        np->nat_money = budget->start_money;