From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 10 Mar 2004 13:22:48 +0000 (+0000)
Subject: (pln_equip, mission_pln_equip): Rename item to itype.  Use struct
X-Git-Tag: v4.2.14~49
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=e3390b9e0dd98cd06657d2e71bc6a63c895406db

(pln_equip, mission_pln_equip): Rename item to itype.  Use struct
ichrstr member i_vtype instead of pointer arithmetic to map from
`struct ichrstr *' to item type.  No functional changes.
---

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 349b63eaf..0e23b6817 100644
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -1266,7 +1266,7 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
     struct sctstr sect;
     int type;
     s_char *ptr;
-    int item;
+    int itype;
     int rval;
     int vec[I_MAX + 1];
 
@@ -1292,32 +1292,32 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
     vec[I_PETROL] -= pcp->pl_fuel;
     rval = 0;
     if (!(flags & P_F)) {
-	item = 0;
+	itype = 0;
 	needed = 0;
 	switch (mission) {
 	case 's':
 	case 'p':
 	    if (pp->pln_nuketype == -1) {
-		item = I_SHELL;
+		itype = I_SHELL;
 		needed = pp->pln_load;
 	    }
 	    break;
 	case 't':
 	    if ((pcp->pl_flags & P_C) == 0 || ip == 0)
 		break;
-	    item = ip - ichr;
+	    itype = ip->i_vtype;
 	    needed = (pp->pln_load * 2) / ip->i_lbs;
 	    break;
 	case 'd':
 	    if ((pcp->pl_flags & P_C) == 0 || ip == 0)
 		break;
-	    item = ip - ichr;
+	    itype = ip->i_vtype;
 	    needed = (pp->pln_load * 2) / ip->i_lbs;
 	    break;
 	case 'a':
 	    if ((pcp->pl_flags & (P_V | P_C)) == 0)
 		break;
-	    item = I_MILIT;
+	    itype = I_MILIT;
 	    needed = pp->pln_load / ip->i_lbs;
 	    break;
 	case 'n':
@@ -1326,26 +1326,26 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
 	    break;
 	case 'i':		/* missile interception */
 	    if (pp->pln_load) {
-		item = I_SHELL;
+		itype = I_SHELL;
 		needed = pp->pln_load;
 	    }
 	    break;
 	default:
 	    break;
 	}
-	if (rval < 0 || (item && needed <= 0)) {
+	if (rval < 0 || (itype && needed <= 0)) {
 	    return -1;
 	}
-	if ((vec[item] < needed) && (item == I_SHELL))
-	    vec[item] += supply_commod(plp->plane.pln_own,
-				       plp->plane.pln_x, plp->plane.pln_y,
-				       I_SHELL, needed);
-	if (vec[item] < needed) {
+	if (vec[itype] < needed && (itype == I_SHELL))
+	    vec[itype] += supply_commod(plp->plane.pln_own,
+					plp->plane.pln_x, plp->plane.pln_y,
+					I_SHELL, needed);
+	if (vec[itype] < needed) {
 	    return -1;
 	} else {
-	    vec[item] -= needed;
+	    vec[itype] -= needed;
 	}
-	if (item == I_SHELL && (mission == 's' || mission == 'p'))
+	if (itype == I_SHELL && (mission == 's' || mission == 'p'))
 	    plp->bombs = needed;
 	else
 	    plp->misc = needed;
diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index a6fc77e61..277d9e429 100644
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -522,7 +522,7 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
     struct sctstr sect;
     int type;
     s_char *ptr;
-    int item;
+    int itype;
     int rval;
     int vec[I_MAX + 1];
     int own;
@@ -561,31 +561,31 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
     vec[I_PETROL] -= pcp->pl_fuel;
     rval = 0;
     if ((flags & P_F) == 0) {
-	item = 0;
+	itype = 0;
 	needed = 0;
 	switch (mission) {
 	case 's':
 	case 'p':
 	    if (pp->pln_nuketype == -1) {
-		item = I_SHELL;
+		itype = I_SHELL;
 		needed = pp->pln_load;
 	    }
 	    break;
 	case 't':
 	    if ((pcp->pl_flags & P_C) == 0 || ip == 0)
 		break;
-	    item = ip - ichr;
+	    itype = ip->i_vtype;
 	    needed = (pp->pln_load * 2) / ip->i_lbs;
 	    break;
 	case 'd':
-	    item = ip - ichr;
+	    itype = ip->i_vtype;
 	    needed = (pp->pln_load * 2) / ip->i_lbs;
 	    /* Is this mine dropping excursion? */
-	    if ((item == I_SHELL) && (pcp->pl_flags & P_MINE))
+	    if (itype == I_SHELL && (pcp->pl_flags & P_MINE))
 		break;
 	    /* Is this a cargo drop? */
 	    if ((pcp->pl_flags & P_C) == 0 || ip == 0) {
-		item = 0;
+		itype = 0;
 		needed = 0;
 		break;
 	    }
@@ -593,7 +593,7 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
 	case 'a':
 	    if ((pcp->pl_flags & (P_V | P_C)) == 0)
 		break;
-	    item = I_MILIT;
+	    itype = I_MILIT;
 	    needed = pp->pln_load / ip->i_lbs;
 	    break;
 	case 'n':
@@ -603,24 +603,24 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
 	default:
 	    break;
 	}
-	if (rval < 0 || (item && needed <= 0)) {
+	if (rval < 0 || (itype && needed <= 0)) {
 	    pr("%s can't contribute to mission\n", prplane(pp));
 	    return -1;
 	}
 #if 0
 	/* Supply is broken somewhere, so don't use it for now */
-	if ((vec[item] < needed) && (item == I_SHELL))
-	    vec[item] += supply_commod(plp->plane.pln_own,
-				       plp->plane.pln_x, plp->plane.pln_y,
-				       I_SHELL, needed);
+	if (vec[itype] < needed && itype == I_SHELL)
+	    vec[itype] += supply_commod(plp->plane.pln_own,
+					plp->plane.pln_x, plp->plane.pln_y,
+					I_SHELL, needed);
 #endif
-	if (vec[item] < needed) {
-	    pr("Not enough %s for %s\n", ichr[item].i_name, prplane(pp));
+	if (vec[itype] < needed) {
+	    pr("Not enough %s for %s\n", ichr[itype].i_name, prplane(pp));
 	    return -1;
 	} else {
-	    vec[item] -= needed;
+	    vec[itype] -= needed;
 	}
-	if (item == I_SHELL && (mission == 's' || mission == 'p'))
+	if (itype == I_SHELL && (mission == 's' || mission == 'p'))
 	    plp->bombs = needed;
 	else
 	    plp->misc = needed;