Update copyright notice.

[empserver] / include / ship.h

diff --git a/include/ship.h b/include/ship.h
index 1b265e9c407aed8afc66cf9f03bab6b915760b68..d88d0c6c899a4157462e972012910314d72ac7f2 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -177,9 +177,9 @@ struct mchrstr {
 #define M_ANTIMISSILE   bit(20)        /* Shoot down missile */
 
 #define getship(n, p) \
-       ef_read(EF_SHIP, n, (caddr_t)p)
+       ef_read(EF_SHIP, n, p)
 #define putship(n, p) \
-       ef_write(EF_SHIP, n, (caddr_t)p)
+       ef_write(EF_SHIP, n, p)
 #define getshipp(n) \
        (struct shpstr *) ef_ptr(EF_SHIP, n)
 
@@ -215,7 +215,7 @@ struct mlist {
 
 enum {
     SHP_AIROPS_EFF = 50,       /* min. efficiency for air ops */
-    M_TORP_SHELLS = 3          /* number of shells used by a torpedo */
+    SHP_TORP_SHELLS = 3                /* number of shells used by a torpedo */
 };
 
 #endif /* _SHIP_H_ */