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

(move, explore): Simplify computation of destination sector's work and

Browse source 
loyalty to get rid of compiler warnings.
This commit is contained in:
Markus Armbruster 2004-08-24 07:08:59 +00:00
parent c06b330426
commit 01e7ea7916
2 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/commands/move.c
View file

@ -120,15 +120,13 @@ move(void)
xyas(sect.sct_x, sect.sct_y, player->cnum));
return RET_SYN;
}
if (vtype == I_CIVIL) {
work = sect.sct_work;
if (work != 100)
pr("Warning: civil unrest\n");
loyal = sect.sct_loyal;
} else if (vtype == I_MILIT) {
work = 100;
loyal = 0;
}
/* only used when moving civs; but prevent spurious compiler warnings */
work = sect.sct_work;
loyal = sect.sct_loyal;
if (vtype == I_CIVIL && work != 100)
pr("Warning: civil unrest\n");
if (istest)
sprintf(prompt, "Number of %s to test move? ", ip->i_name);
else