Indented with src/scripts/indent-emp.

[empserver] / src / lib / commands / name.c

diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index ba12fa1942868bf42a4d1b4f8624fe4e63b6921c..41fb770a17605c29206a95ad4bc2cd9050f67861 100644 (file)
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.c
@@ -51,36 +51,33 @@
 int
 name(void)
 {
 int
 name(void)
 {

-       struct  shpstr  ship;
-       s_char  *p;
-       struct nstr_item nb;
-       s_char  buf[1024];
+    struct shpstr ship;
+    s_char *p;
+    struct nstr_item nb;
+    s_char buf[1024];

 
 

-       if (!opt_SHIPNAMES) {
-           pr("Ship naming is not enabled.\n");
+    if (!opt_SHIPNAMES) {
+       pr("Ship naming is not enabled.\n");
+       return RET_FAIL;
+    }
+    if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
+       return RET_SYN;
+    while (nxtitem(&nb, (s_char *)&ship)) {
+       if (!player->owner)
+           continue;
+       p = getstarg(player->argp[2], "Name? ", buf);
+       if (!check_ship_ok(&ship))

            return RET_FAIL;
            return RET_FAIL;

+       if (p == 0 || *p == 0)
+           return RET_SYN;
+       if (!strcmp(p, "~")) {
+           ship.shp_name[0] = 0;
+       } else {
+           strncpy(ship.shp_name, p, MAXSHPNAMLEN - 1);
+           ship.shp_name[MAXSHPNAMLEN - 1] = 0;

        }
        }

-       if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
-               return RET_SYN;
-       while (nxtitem(&nb, (s_char *)&ship)) {
-               if (!player->owner)
-                       continue;
-               p = getstarg(player->argp[2], "Name? ", buf);
-               if (!check_ship_ok(&ship))
-                   return RET_FAIL;
-               if (p == 0 || *p == 0)
-                       return RET_SYN;
-               if (!strcmp(p,"~")) {
-                       ship.shp_name[0] = 0;
-               }
-               else
-               {
-                       strncpy(ship.shp_name,p,MAXSHPNAMLEN - 1);
-                       ship.shp_name[MAXSHPNAMLEN - 1] = 0;
-               }
-               putship(ship.shp_uid,&ship);
-       }
+       putship(ship.shp_uid, &ship);
+    }

 
 

-       return RET_OK;
+    return RET_OK;

 }
 }

-