empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(V_CIVIL, V_MILIT, V_SHELL, V_GUN, V_PETROL, V_IRON, V_DUST, V_BAR,

Browse source 
V_FOOD, V_OIL, V_LCM, V_HCM, V_UW, V_RAD, V_ITEM): Remove, use item
types instead.
This commit is contained in:
Markus Armbruster 2004-08-17 16:12:31 +00:00
parent 09def8f156
commit 8ef7f35a56
17 changed files with 64 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/subs/attsub.c
View file

@ -2554,7 +2554,7 @@ ask_move_in_off(struct combat *off, struct combat *def)
}
if (dam) {
left = commdamage(num_mil, dam, V_MILIT);
left = commdamage(num_mil, dam, I_MILIT);
if (left < num_mil) {
if (left) {
pr("%d of the mil you were moving were destroyed!\nOnly %d mil made it to %s\n", num_mil - left, left, xyas(def->x, def->y, player->cnum));

4
src/lib/subs/lndsub.c
View file

@ -1134,9 +1134,9 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
}
/* Note we check would_abandon first because we don't want
to always have to do these checks */
if (would_abandon(&osect, V_CIVIL, 0, &(llp->land))) {
if (would_abandon(&osect, I_CIVIL, 0, &(llp->land))) {
stop = 0;
if (!want_to_abandon(&osect, V_CIVIL, 0, &(llp->land))) {
if (!want_to_abandon(&osect, I_CIVIL, 0, &(llp->land))) {
stop = 1;
}
/* now check stuff */

4
src/lib/subs/plnsub.c
View file

@ -292,7 +292,7 @@ pln_dropoff(struct emp_qelem *list, struct ichrstr *ip, coord tx, coord ty,
xyas(tx, ty, player->cnum));
return;
}
if (ip->i_vtype == V_CIVIL && sectp->sct_own != sectp->sct_oldown) {
if (ip->i_vtype == I_CIVIL && sectp->sct_own != sectp->sct_oldown) {
pr("%s is occupied. Your civilians suffer from identity crisis and die.\n",
xyas(tx, ty, player->cnum));
return;
@ -621,7 +621,7 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
own = sect.sct_oldown;
}
if (ip) {
if (ip->i_vtype == V_CIVIL) {
if (ip->i_vtype == I_CIVIL) {
if (pp->pln_own != own) {
pr("You don't control those civilians!\n");
return -1;