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

(sail_nav_fleet): Prevent a large fleet from sailing through

Browse source 
a canal.  Ensure only ships with M_CANAL can navigate a
canal.
This commit is contained in:
Ron Koenderink 2006-01-18 01:08:55 +00:00
parent 14d94c2509
commit 2088eab228
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/lib/update/sail.c
View file

@ -216,6 +216,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
natid own; natid own;
struct emp_qelem ship_list; struct emp_qelem ship_list;
int dir; int dir;
int canal = 1;
#ifdef SAILDEBUG #ifdef SAILDEBUG
switch (fltp->real_q) { switch (fltp->real_q) {
@ -238,9 +239,27 @@ sail_nav_fleet(struct fltheadstr *fltp)
wu(0, fltp->own, " %d", fe->num); wu(0, fltp->own, " %d", fe->num);
wu(0, fltp->own, "\n"); wu(0, fltp->own, "\n");
#endif #endif
for (fe = fltp->head; fe; fe = fe->next) {
sp = getshipp(fe->num);
if (sp->shp_item[I_MILIT] == 0 && sp->shp_item[I_CIVIL] == 0) {
wu(0, fltp->own,
" ship #%d (%s) is crewless and can't go on\n",
fe->num, cname(fe->own));
error = 1;
} else if (!(mchr[sp->shp_type].m_flags & M_CANAL))
canal = 0;
}
if (error)
return 0;
sectp = getsectp(fltp->x, fltp->y); sectp = getsectp(fltp->x, fltp->y);
switch (shp_check_nav(sectp)) { switch (shp_check_nav(sectp)) {
case CN_NAVIGABLE: case CN_NAVIGABLE:
if (IS_BIG_CITY(sectp->sct_type) && !canal) {
wu(0, fltp->own,
"Your fleet lead by %d is too big to fit through the canal.\n",
fltp->leader);
return 0;
}
break; break;
case CN_CONSTRUCTION: case CN_CONSTRUCTION:
case CN_LANDLOCKED: case CN_LANDLOCKED:
@ -249,17 +268,6 @@ sail_nav_fleet(struct fltheadstr *fltp)
fltp->leader); fltp->leader);
return 0; return 0;
} }
for (fe = fltp->head; fe; fe = fe->next) {
sp = getshipp(fe->num);
if (sp->shp_item[I_MILIT] == 0 && sp->shp_item[I_CIVIL] == 0) {
wu(0, fltp->own,
" ship #%d (%s) is crewless and can't go on\n",
fe->num, cname(fe->own));
error = 1;
}
}
if (error)
return 0;
sp = getshipp(fltp->leader); sp = getshipp(fltp->leader);
own = sp->shp_own; own = sp->shp_own;
fltp_to_list(fltp, &ship_list); /* hack -KHS 1995 */ fltp_to_list(fltp, &ship_list); /* hack -KHS 1995 */