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

(do_unit_move): Move the shp_view() code in the switch case.

Browse source 
No functional changes.
This commit is contained in:
Ron Koenderink 2007-01-20 12:56:55 +00:00
parent 0fda2a608a
commit 4091c380f1
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/commands/navi.c
View file

@ -180,20 +180,15 @@ do_unit_move(struct emp_qelem *unit_list, int *together,
} }
if (cp == NULL || *cp == '\0') if (cp == NULL || *cp == '\0')
cp = &dirch[DIR_STOP]; cp = &dirch[DIR_STOP];
dir = chkdir(*cp, DIR_STOP, leader->ef_type == EF_SHIP ? dir = chkdir(*cp, DIR_STOP, DIR_LAST);
DIR_VIEW : DIR_LAST);
if (dir >= 0) { if (dir >= 0) {
if (leader->ef_type == EF_SHIP) { if (leader->ef_type == EF_SHIP) {
if (dir == DIR_VIEW)
shp_view(unit_list);
else {
stopping |= shp_nav_one_sector(unit_list, dir, stopping |= shp_nav_one_sector(unit_list, dir,
player->cnum, *together); player->cnum, *together);
if (stopping != 2) { if (stopping != 2) {
*pt++ = dirch[dir]; *pt++ = dirch[dir];
*pt = '\0'; *pt = '\0';
} }
}
} else } else
stopping |= stopping |=
lnd_mar_one_sector(unit_list, dir, player->cnum, lnd_mar_one_sector(unit_list, dir, player->cnum,
@ -277,6 +272,11 @@ do_unit_move(struct emp_qelem *unit_list, int *together,
skip = 1; skip = 1;
player->btused++; player->btused++;
continue; continue;
case 'v':
if (leader->ef_type != EF_SHIP)
break;
shp_view(unit_list);
continue;
} }
direrr("`%c' to stop", direrr("`%c' to stop",
leader->ef_type == EF_SHIP ? ", `%c' to view" : NULL, NULL); leader->ef_type == EF_SHIP ? ", `%c' to view" : NULL, NULL);