config: Drop configuration table size macros

[empserver] / src / lib / global / ship.c

diff --git a/src/lib/global/ship.c b/src/lib/global/ship.c
index 6226a76cbeb04522b02d8287db25c1248018a5f8..27a88d741bf047a9e6cc50ecc8bd0ab65fdccdd8 100644 (file)
--- a/src/lib/global/ship.c
+++ b/src/lib/global/ship.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  ship.c: Ship characteristics
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Jeff Bailey
@@ -46,7 +45,7 @@
  * Initialized on startup from ship.config and deity custom config (if any).
  * Terminated by a sentinel with null m_name.
  */
-struct mchrstr mchr[SHP_TYPE_MAX + 2];
+struct mchrstr mchr[];
 
 #define logx(a, b) (log((a)) / log((b)))
 #define SHP_DEF(b, t) (t ? (b * (logx(t, 40.0) < 1.0 ? 1.0 : \
@@ -88,3 +87,33 @@ m_glim(struct mchrstr *mcp, int tech)
 {
     return SHP_FIR(mcp->m_glim, MAX(0, tech - mcp->m_tech));
 }
+
+int
+shp_armor(struct shpstr *sp)
+{
+    return m_armor(mchr + sp->shp_type, sp->shp_tech);
+}
+
+int
+shp_speed(struct shpstr *sp)
+{
+    return m_speed(mchr + sp->shp_type, sp->shp_tech);
+}
+
+int
+shp_visib(struct shpstr *sp)
+{
+    return m_visib(mchr + sp->shp_type, sp->shp_tech);
+}
+
+int
+shp_frnge(struct shpstr *sp)
+{
+    return m_frnge(mchr + sp->shp_type, sp->shp_tech);
+}
+
+int
+shp_glim(struct shpstr *sp)
+{
+    return m_glim(mchr + sp->shp_type, sp->shp_tech);
+}