Factor out common fortress fire code into fort_fire()

[empserver] / src / lib / subs / shpsub.c

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index bed6d02f06111b93e998f90da29c101e4c4ab108..0691a58d27e2c5d2cb6a2253e5c9d0e3759f8e62 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -587,8 +587,6 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
     struct nstr_sect ns;
     struct sctstr fsect;
     int trange, range;
-    double guneff;
-    int shell, gun;
     int dam;
     int totdam = 0;
     signed char notified[MAXNOC];
@@ -625,28 +623,14 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
     while (nxtsct(&ns, &fsect)) {
        if (!notified[fsect.sct_own])
            continue;
-       gun = fsect.sct_item[I_GUN];
-       if (gun < 1)
-           continue;
        range = roundrange(fortrange(&fsect));
        trange = mapdist(newx, newy, fsect.sct_x, fsect.sct_y);
        if (trange > range)
            continue;
-       if (fsect.sct_item[I_MILIT] < 5)
-           continue;
-       shell = fsect.sct_item[I_SHELL];
-       if (shell < 1)
-           shell += supply_commod(fsect.sct_own, fsect.sct_x, fsect.sct_y,
-                                  I_SHELL, 1);
-       if (shell < 1)
-           continue;
-       shell--;
-       fsect.sct_item[I_SHELL] = shell;
+       dam = fort_fire(&fsect);
        putsect(&fsect);
-       if (gun > 7)
-           gun = 7;
-       guneff = landgun((int)fsect.sct_effic, gun);
-       dam = (int)guneff;
+       if (dam < 0)
+           continue;
        totdam += dam;
        mpr(victim, "Incoming fire does %d damage!\n", dam);
 /*