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

No functional changes.
This commit is contained in:
Ron Koenderink 2007-01-20 12:56:55 +00:00
parent 0fda2a608a
commit 4091c380f1

View file

@ -180,19 +180,14 @@ 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) stopping |= shp_nav_one_sector(unit_list, dir,
shp_view(unit_list); player->cnum, *together);
else { if (stopping != 2) {
stopping |= shp_nav_one_sector(unit_list, dir, *pt++ = dirch[dir];
player->cnum, *together); *pt = '\0';
if (stopping != 2) {
*pt++ = dirch[dir];
*pt = '\0';
}
} }
} else } else
stopping |= stopping |=
@ -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);