commands: Rename the command functions

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

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index 781246480265e6892c67d6919ee1e75f1baed1f7..80683694a160c04c45452c4005624a6792a78d49 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2018, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
  *     Chad Zabel, 1994
  *     Steve McClure, 1998-2000
  *     Ron Koenderink, 2003-2009
- *     Markus Armbruster, 2003-2017
+ *     Markus Armbruster, 2003-2018
  */
 
 #include <config.h>
@@ -63,7 +63,7 @@ static int edit_plane(struct plnstr *, char *, char *);
 static int edit_nuke(struct nukstr *, char *, char *);
 
 int
-edit(void)
+c_edit(void)
 {
     union empobj_storage item;
     char *what;
@@ -1001,6 +1001,8 @@ edit_land(struct lndstr *land, char *key, char *p)
        break;
     case 'F':
        arg = LIMIT_TO(arg, 0, 127);
+       if (land->lnd_ship >= 0 || land->lnd_land >= 0)
+           arg = 0;
        divine_unit_change((struct empobj *)land, "Fortification",
                           arg != land->lnd_harden, arg - land->lnd_harden,
                           "from %d to %d", land->lnd_harden, arg);
@@ -1133,6 +1135,16 @@ edit_plane(struct plnstr *plane, char *key, char *p)
                           "from %d to %d", plane->pln_tech, arg);
        pln_set_tech(plane, arg);
        break;
+    case 'F':
+       arg = LIMIT_TO(arg, 0, 127);
+       if (!(pcp->pl_flags & P_M)
+           || plane->pln_ship >= 0 || plane->pln_land >= 0)
+           arg = 0;
+       divine_unit_change((struct empobj *)plane, "Fortification",
+                          arg != plane->pln_harden, arg - plane->pln_harden,
+                          "from %d to %d", plane->pln_harden, arg);
+       plane->pln_harden = arg;
+       break;
     case 'r':
        arg = LIMIT_TO(arg, 0, pl_range(pcp, plane->pln_tech));
        divine_unit_change((struct empobj *)plane, "Range",
@@ -1174,6 +1186,8 @@ edit_plane(struct plnstr *plane, char *key, char *p)
        divine_flag_change((struct empobj *)plane, "Flags",
                           plane->pln_flags, arg, plane_flags);
        plane->pln_flags = arg;
+       if (pln_is_in_orbit(plane))
+           plane->pln_ship = plane->pln_land = -1;
        break;
     default:
        pr("huh? (%s)\n", key);