Fix trailing whitespace

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

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index 6856eea8af488189c3917404a28846b8c37cd58b..b17712da4761940fb6e90d0dcf8aad4e7b2baafa 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,36 +26,28 @@
  *  ---
  *
  *  edit.c: Edit things (sectors, ships, planes, units, nukes, countries)
- * 
+ *
  *  Known contributors to this file:
  *     David Muir Sharnoff
  *     Chad Zabel, 1994
  *     Steve McClure, 1998-2000
  *     Ron Koenderink, 2003-2004
- *     Markus Armbruster, 2003-2006
+ *     Markus Armbruster, 2003-2008
  */
 
 #include <config.h>
 
 #include <ctype.h>
 #include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
-#include "plane.h"
-#include "ship.h"
 #include "land.h"
+#include "lost.h"
+#include "news.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
 
 #define END -1
 
@@ -199,12 +191,16 @@ edit(void)
                return err;
            break;
        case 'l':
+           if (!check_sect_ok(&sect))
+               return RET_FAIL;
            if ((err = doland(thing, arg, ptr, &sect)) != RET_OK)
                return err;
            if (!putsect(&sect))
                return RET_FAIL;
            break;
        case 's':
+           if (!check_ship_ok(&ship))
+               return RET_FAIL;
            if ((err = doship(thing, arg, ptr, &ship)) != RET_OK)
                return err;
            if (!ef_ensure_space(EF_SHIP, ship.shp_uid, 50))
@@ -213,6 +209,8 @@ edit(void)
                return RET_FAIL;
            break;
        case 'u':
+           if (!check_land_ok(&land))
+               return RET_FAIL;
            if ((err = dounit(thing, arg, ptr, &land)) != RET_OK)
                return err;
            if (!ef_ensure_space(EF_LAND, land.lnd_uid, 50))
@@ -221,6 +219,8 @@ edit(void)
                return RET_FAIL;
            break;
        case 'p':
+           if (!check_plane_ok(&plane))
+               return RET_FAIL;
            if ((err = doplane(thing, arg, ptr, &plane)) != RET_OK)
                return err;
            if (!ef_ensure_space(EF_PLANE, plane.pln_uid, 50))
@@ -307,8 +307,6 @@ prnat(struct natstr *np)
     pr("Happiness <H>: %.2f\n", np->nat_level[NAT_HLEV]);
     pr("Money <M>: $%6ld\n", np->nat_money);
     pr("Telegrams <t>: %6d\n", np->nat_tgms);
-    if (opt_DEMANDUPDATE)
-       pr("Updates missed <U>: %d\n", np->nat_missed);
     if (opt_HIDDEN) {
        pr("Countries contacted: ");
        for (i = 0; i < MAXNOC; i++) {
@@ -334,7 +332,6 @@ pr_plane(struct plnstr *plane)
     pr("Flags <f>: %d\n", plane->pln_flags);
     pr("Ship <s>: %d\t\t", plane->pln_ship);
     pr("Land Unit <y>: %d\t", plane->pln_land);
-    pr("Nuke Type <n>: %d\n", plane->pln_nuketype);
 }
 
 static void
@@ -348,7 +345,6 @@ pr_land(struct lndstr *land)
     pr("Tech <t>: %d\t\t", land->lnd_tech);
     pr("Army <a>: %.1s\n", &land->lnd_army);
     pr("Fortification <F>: %d\t", land->lnd_harden);
-    pr("Fuel <B>: %d\n", land->lnd_fuel);
     pr("Land unit <Y>: %d\n", land->lnd_land);
     pr("Ship <S>: %d\t\t", land->lnd_ship);
     pr("Radius <P>: %d\n", land->lnd_rad_max);
@@ -388,9 +384,6 @@ pr_ship(struct shpstr *ship)
     pr("Efficiency <E>: %d\n", ship->shp_effic);
     pr("Mobility <M>: %d\t\t", ship->shp_mobil);
     pr("Fleet <F>: %.1s\n", &ship->shp_fleet);
-    /* could depend on opt_FUEL - but a deity might want to set this
-       up before enabling the option */
-    pr("Fuel <B>: %d\n", ship->shp_fuel);
     pr("Retreat path <R>: '%s'\t\tRetreat Flags <W>: %d\n",
        ship->shp_rpath, ship->shp_rflags);
     pr("Plague Stage <a>: %d\t\t",ship->shp_pstage);
@@ -460,15 +453,6 @@ doland(char op, int arg, char *p, struct sctstr *sect)
     int new, old;
     int des;
     switch (op) {
-    case 'C':
-       warn_deprecated(op);
-       if (arg < 0)
-           return RET_SYN;
-       sect->sct_coastal = (arg ? 1 : 0);
-       pr("Coastal flag of %s changed to %d\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          sect->sct_coastal);
-       break;
     case 'o':
        if (arg < 0)
            return RET_SYN;
@@ -477,8 +461,6 @@ doland(char op, int arg, char *p, struct sctstr *sect)
           xyas(sect->sct_x, sect->sct_y, player->cnum),
           cname(sect->sct_own), sect->sct_own, cname(newown), newown);
        if (sect->sct_own) {
-           makelost(EF_SECTOR, sect->sct_own, 0,
-                    sect->sct_x, sect->sct_y);
            wu(player->cnum, sect->sct_own,
               "Sector %s lost to deity intervention\n",
               xyas(sect->sct_x, sect->sct_y, sect->sct_own));
@@ -486,7 +468,6 @@ doland(char op, int arg, char *p, struct sctstr *sect)
        benefit(sect->sct_own, 0);
        sect->sct_own = newown;
        if (newown) {
-           makenotlost(EF_SECTOR, newown, 0, sect->sct_x, sect->sct_y);
            wu(player->cnum, newown,
               "Sector %s gained from deity intervention\n",
               xyas(sect->sct_x, sect->sct_y, sect->sct_own));
@@ -560,10 +541,12 @@ doland(char op, int arg, char *p, struct sctstr *sect)
     case 'X':
        old = sect->sct_che_target;
        new = errcheck(arg, 0, MAXNOC - 1);
-       pr("Old owner of %s changed from %s (#%d) to %s (#%d).\n",
+       pr("Che target of %s changed from %s (#%d) to %s (#%d).\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
           cname(old), old, cname(new), new);
        sect->sct_che_target = new;
+       if (new == 0)
+           sect->sct_che = 0;
        break;
     case 'p':
        old = sect->sct_pstage;
@@ -601,6 +584,7 @@ doland(char op, int arg, char *p, struct sctstr *sect)
            return RET_SYN;
        sect->sct_x = newx;
        sect->sct_y = newy;
+       ef_set_uid(EF_SECTOR, &sect, XYOFFSET(newx, newy));
        break;
     case 'D':
        if (!sarg_xy(p, &newx, &newy))
@@ -619,7 +603,7 @@ doland(char op, int arg, char *p, struct sctstr *sect)
        pr("Designation for sector %s changed from %c to %c\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
           dchr[sect->sct_type].d_mnem, dchr[des].d_mnem);
-       set_coastal(sect, des);
+       set_coastal(sect, sect->sct_type, des);
        sect->sct_type = des;
        break;
     case 'S':
@@ -716,7 +700,7 @@ docountry(char op, int arg, char *p, struct natstr *np)
        np->nat_yorg = newy;
        break;
     case 's':
-       np->nat_stat = (nat_status)errcheck(arg, STAT_UNUSED, STAT_GOD);
+       np->nat_stat = errcheck(arg, STAT_UNUSED, STAT_GOD);
        break;
     case 'u':
        arg = errcheck(arg, 0, m_m_p_d);
@@ -751,9 +735,6 @@ docountry(char op, int arg, char *p, struct natstr *np)
           np->nat_level[NAT_HLEV], farg);
        np->nat_level[NAT_HLEV] = farg;
        break;
-    case 'U':
-       np->nat_missed = arg;
-       break;
     default:
        pr("huh? (%c)\n", op);
        break;
@@ -782,16 +763,8 @@ doship(char op, int arg, char *p, struct shpstr *ship)
     case 'W':
        ship->shp_rflags = arg;
        break;
-    case 'H':
-       warn_deprecated(op);
-       ship->shp_nchoppers = arg;
-       break;
-    case 'X':
-       warn_deprecated(op);
-       ship->shp_nxlight = arg;
-       break;
     case 'U':
-       ship->shp_uid = arg;
+       ef_set_uid(EF_SHIP, ship, arg);
        break;
     case 'O':
        if (ship->shp_own)
@@ -800,17 +773,9 @@ doship(char op, int arg, char *p, struct shpstr *ship)
        if (arg && arg < MAXNOC) {
            wu(player->cnum, (natid)arg,
               "%s given to you by deity intervention!\n", prship(ship));
-           makelost(EF_SHIP, ship->shp_own, ship->shp_uid,
-                    ship->shp_x, ship->shp_y);
            ship->shp_own = (natid)arg;
-           makenotlost(EF_SHIP, ship->shp_own, ship->shp_uid,
-                       ship->shp_x, ship->shp_y);
-       } else if (!arg) {
+       } else if (!arg)
            ship->shp_effic = 0;
-           makelost(EF_SHIP, ship->shp_own, ship->shp_uid,
-                    ship->shp_x, ship->shp_y);
-           ship->shp_own = (natid)0;
-       }
        break;
     case 'L':
        if (!sarg_xy(p, &newx, &newy))
@@ -830,7 +795,7 @@ doship(char op, int arg, char *p, struct shpstr *ship)
        ship->shp_mobil = arg;
        break;
     case 'B':
-       ship->shp_fuel = errcheck(arg, 0, 255);
+       warn_deprecated(op);
        break;
     case 'F':
        if (p[0] == '~')
@@ -842,14 +807,6 @@ doship(char op, int arg, char *p, struct shpstr *ship)
            return RET_FAIL;
        }
        break;
-    case 'Y':
-       warn_deprecated(op);
-       ship->shp_nland = errcheck(arg, 0, 100);
-       break;
-    case 'P':
-       warn_deprecated(op);
-       ship->shp_nplane = errcheck(arg, 0, 100);
-       break;
     case 'c':
        ship->shp_item[I_CIVIL] = arg;
        break;
@@ -907,7 +864,7 @@ dounit(char op, int arg, char *p, struct lndstr *land)
        land->lnd_land = arg;
        break;
     case 'U':
-       land->lnd_uid = arg;
+       ef_set_uid(EF_LAND, land, arg);
        break;
     case 'O':
        if (land->lnd_own)
@@ -917,17 +874,9 @@ dounit(char op, int arg, char *p, struct lndstr *land)
        if (arg && arg < MAXNOC) {
            wu(player->cnum, (natid)arg,
               "%s given to you by deity intervention!\n", prland(land));
-           makelost(EF_LAND, land->lnd_own, land->lnd_uid,
-                    land->lnd_x, land->lnd_y);
            land->lnd_own = (natid)arg;
-           makenotlost(EF_LAND, land->lnd_own, land->lnd_uid,
-                       land->lnd_x, land->lnd_y);
-       } else if (!arg) {
-           makelost(EF_LAND, land->lnd_own, land->lnd_uid,
-                    land->lnd_x, land->lnd_y);
+       } else if (!arg)
            land->lnd_effic = 0;
-           land->lnd_own = (natid)0;
-       }
        break;
     case 'L':
        if (!sarg_xy(p, &newx, &newy))
@@ -960,11 +909,7 @@ dounit(char op, int arg, char *p, struct lndstr *land)
        land->lnd_harden = errcheck(arg, 0, 255);
        break;
     case 'B':
-       land->lnd_fuel = errcheck(arg, 0, 255);
-       break;
-    case 'X':
        warn_deprecated(op);
-       land->lnd_nxlight = arg;
        break;
     case 'S':
        land->lnd_ship = arg;
@@ -1035,10 +980,10 @@ doplane(char op, int arg, char *p, struct plnstr *plane)
 
     switch (op) {
     case 'n':
-       plane->pln_nuketype = arg;
+       warn_deprecated(op);
        break;
     case 'U':
-       plane->pln_uid = arg;
+       ef_set_uid(EF_PLANE, plane, arg);
        break;
     case 'l':
        if (!sarg_xy(p, &newx, &newy))
@@ -1052,19 +997,11 @@ doplane(char op, int arg, char *p, struct plnstr *plane)
               "%s taken from you by deity intervention!\n",
               prplane(plane));
        if (arg && arg < MAXNOC) {
-           makelost(EF_PLANE, plane->pln_own, plane->pln_uid,
-                    plane->pln_x, plane->pln_y);
            plane->pln_own = (natid)arg;
-           makenotlost(EF_PLANE, plane->pln_own, plane->pln_uid,
-                       plane->pln_x, plane->pln_y);
            wu(player->cnum, plane->pln_own,
               "%s given to you by deity intervention!\n", prplane(plane));
-       } else if (!arg) {
+       } else if (!arg)
            plane->pln_effic = 0;
-           makelost(EF_PLANE, plane->pln_own, plane->pln_uid,
-                    plane->pln_x, plane->pln_y);
-           plane->pln_own = (natid)0;
-       }
        break;
     case 'e':
        plane->pln_effic = errcheck(arg, PLANE_MINEFF, 100);
@@ -1087,14 +1024,6 @@ doplane(char op, int arg, char *p, struct plnstr *plane)
            return RET_FAIL;
        }
        break;
-    case 'a':
-       warn_deprecated(op);
-       plane->pln_att = arg;
-       break;
-    case 'd':
-       warn_deprecated(op);
-       plane->pln_def = arg;
-       break;
     case 'r':
        plane->pln_range = (unsigned char)arg;
        break;