Update copyright notice

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

diff --git a/src/lib/commands/grin.c b/src/lib/commands/grin.c
index e3c09716580d4e00252402de1389483025465e9d..2f311d212b5a39a80dde986bc0dcd4554c0ddee8 100644 (file)
--- a/src/lib/commands/grin.c
+++ b/src/lib/commands/grin.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,22 +26,15 @@
  *  ---
  *
  *  grin.c: Grind gold bars into dust
- * 
+ *
  *  Known contributors to this file:
- *     
+ *     Markus Armbruster, 2004-2006
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
-#include "product.h"
 #include "commands.h"
+#include "product.h"
 
 int
 grin(void)
@@ -49,12 +42,19 @@ grin(void)
     struct nstr_sect nstr;
     struct sctstr sect;
     char *p;
-    int i, n, qty;
-    int avail;
+    int prd, i, n, qty;
     char buf[1024];
     double grind_eff = 0.8;
-    i_type *ctype = pchr[P_BAR].p_ctype;
-    unsigned short *camt = pchr[P_BAR].p_camt;
+    struct pchrstr *pp;
+    i_type ctype;
+    unsigned camt;
+
+    prd = dchr[SCT_BANK].d_prd;
+    if (prd < 0 || pchr[prd].p_type < 0) {
+       pr("Grinding is disabled.\n");
+       return RET_FAIL;
+    }
+    pp = &pchr[prd];
 
     if ((p = getstarg(player->argp[1], "Sectors? ", buf)) == 0)
        return RET_SYN;
@@ -65,27 +65,28 @@ grin(void)
     qty = atoi(p);
     if (qty < 0)
        return RET_SYN;
+
     while (nxtsct(&nstr, &sect)) {
        if (!player->owner)
            continue;
        if (sect.sct_effic < 60 || sect.sct_own != player->cnum)
            continue;
-       n = sect.sct_item[I_BAR] >= qty ? qty : sect.sct_item[I_BAR];
+
+       /* materials limit */
+       n = MIN(qty, sect.sct_item[pp->p_type]);
        /* work limit */
-       avail = n * 5;
-       if (avail > sect.sct_avail) {
-           n = sect.sct_avail / 5;
-           avail = sect.sct_avail;
-       }
+       n = MIN(n, sect.sct_avail / 5);
        /* space limit */
        for (i = 0; i < MAXPRCON; i++) {
-           if (!camt[i])
+           ctype = pp->p_ctype[i];
+           camt = pp->p_camt[i];
+           if (!camt)
                continue;
-           if (CANT_HAPPEN(ctype[i] <= I_NONE || ctype[i] > I_MAX))
+           if (CANT_HAPPEN(ctype <= I_NONE || ctype > I_MAX))
                continue;
            n = MIN(n,
-                   (double)(ITEM_MAX - sect.sct_item[ctype[i]])
-                   / (camt[i] * grind_eff));
+                   (double)(ITEM_MAX - sect.sct_item[ctype])
+                   / (camt * grind_eff));
        }
 
        if (n > 0) {
@@ -93,13 +94,15 @@ grin(void)
               xyas(sect.sct_x, sect.sct_y, player->cnum));
            sect.sct_item[I_BAR] -= n;
            for (i = 0; i < MAXPRCON; i++) {
-               if (!camt[i])
+               ctype = pp->p_ctype[i];
+               camt = pp->p_camt[i];
+               if (!camt)
                    continue;
-               if (CANT_HAPPEN(ctype[i] <= I_NONE || ctype[i] > I_MAX))
+               if (CANT_HAPPEN(ctype <= I_NONE || ctype > I_MAX))
                    continue;
-               sect.sct_item[ctype[i]] += n * camt[i] * grind_eff;
+               sect.sct_item[ctype] += n * camt * grind_eff;
            }
-           sect.sct_avail -= avail;
+           sect.sct_avail -= n * 5;
            putsect(&sect);
        }
     }