Update copyright notice

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

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index 037a41f4ecb4eee632617b7f3b58c831a8411deb..598fef08304270774d3c3bdedf718455db063f1a 100644 (file)
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.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
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -34,18 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
+#include "commands.h"
 #include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "path.h"
-#include "commands.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 fly(void)
@@ -55,7 +48,7 @@ fly(void)
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct shpstr ship;
     int cno;
     struct nstr_item ni_bomb;
@@ -66,8 +59,8 @@ fly(void)
     int wantflags;
     struct sctstr ap_sect;
     int dst_type;
-    s_char *dst_ptr;
-    s_char buf[1024];
+    void *dst_ptr;
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
@@ -95,21 +88,21 @@ fly(void)
     if (pln_onewaymission(&target, &cno, &wantflags) < 0)
        return RET_SYN;
     if (cno < 0) {
-       dst_ptr = (s_char *)&target;
+       dst_ptr = &target;
        dst_type = EF_SECTOR;
     } else {
        getship(cno, &ship);
-       dst_ptr = (s_char *)&ship;
+       dst_ptr = &ship;
        dst_type = EF_SHIP;
     }
 
-    if (ip && ip->i_vtype == I_CIVIL && target.sct_own != target.sct_oldown) {
+    if (ip && ip->i_uid == I_CIVIL && target.sct_own != target.sct_oldown) {
        pr("Can't fly civilians into occupied sectors.\n");
        return RET_FAIL;
     }
 
     ap_to_target = strlen(flightpath);
-    if (*(flightpath + strlen(flightpath) - 1) == 'h')
+    if (flightpath[ap_to_target - 1] == 'h')
        ap_to_target--;
     pr("range to target is %d\n", ap_to_target);
     /*