From 139086fd20dee7a258f0fd9781709ffb02daa8ba Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Sun, 21 Jan 2007 12:28:40 +0000 Subject: [PATCH] (do_unit_move): Combine the two length checks and type check for printing the ship path into one if statement. No functional changes. --- src/lib/commands/navi.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c index af50ba0a..d65ec198 100644 --- a/src/lib/commands/navi.c +++ b/src/lib/commands/navi.c @@ -116,10 +116,9 @@ do_unit_move(struct emp_qelem *unit_list, int *together, if (QEMPTY(unit_list)) { pr("No %s left\n", type == EF_SHIP ? "ships" : "lands"); - if (strlen(pathtaken) > 0) { + if (type == EF_SHIP && strlen(pathtaken) > 1) { pathtaken[strlen(pathtaken) - 1] = '\0'; - if (type == EF_SHIP && strlen(pathtaken) > 0) - pr("Path taken: %s\n", pathtaken); + pr("Path taken: %s\n", pathtaken); } return RET_OK; } @@ -149,10 +148,9 @@ do_unit_move(struct emp_qelem *unit_list, int *together, if (QEMPTY(unit_list)) { pr("No %s left\n", type == EF_SHIP ? "ships" : "lands"); - if (strlen(pathtaken) > 0) { + if (type == EF_SHIP && strlen(pathtaken) > 1) { pathtaken[strlen(pathtaken) - 1] = '\0'; - if (type == EF_SHIP && strlen(pathtaken) > 0) - pr("Path taken: %s\n", pathtaken); + pr("Path taken: %s\n", pathtaken); } return RET_OK; } @@ -287,10 +285,9 @@ do_unit_move(struct emp_qelem *unit_list, int *together, pr("`d' to drop mines, and `m' to minesweep\n"); stopping = 1; } - if (strlen(pathtaken) > 0) { + if (type == EF_SHIP && strlen(pathtaken) > 1) { pathtaken[strlen(pathtaken) - 1] = '\0'; - if (type == EF_SHIP && strlen(pathtaken) > 0) - pr("Path taken: %s\n", pathtaken); + pr("Path taken: %s\n", pathtaken); } return RET_OK; }