New macro ARRAY_SIZE()

[empserver] / src / lib / subs / aircombat.c

diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index daf99ea12e12733dcda9ab67199e29a32392cde7..e8cc5b85713542135c49552b98d3417b3c537f53 100644 (file)
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -30,7 +30,7 @@
  *     Dave Pare, 1986
  *     Thomas Ruschak, 1992
  *     Steve McClure, 1996
  *     Dave Pare, 1986
  *     Thomas Ruschak, 1992
  *     Steve McClure, 1996

- *     Markus Armbruster, 2006-2014
+ *     Markus Armbruster, 2006-2020

  */
 
 #include <config.h>
  */
 
 #include <config.h>


@@ -716,7 +716,7 @@ ac_flak_dam(int guns, int def, int pl_flags)
         0.35f, 0.40f, 0.45f, 0.50f, 0.50f, 0.55f, 0.60f, 0.65f,
     /*    +5    +6     +7     +8    >+8 */
         0.70f,0.75f, 0.80f, 0.85f, 1.1305f };
         0.35f, 0.40f, 0.45f, 0.50f, 0.50f, 0.55f, 0.60f, 0.65f,
     /*    +5    +6     +7     +8    >+8 */
         0.70f,0.75f, 0.80f, 0.85f, 1.1305f };

-    enum { FLAK_MAX = sizeof(flaktable)/sizeof(flaktable[0]) - 1 };
+    enum { FLAK_MAX = ARRAY_SIZE(flaktable) - 1 };

 
     flak = guns - def;
     if ((pl_flags & P_T) == 0)
 
     flak = guns - def;
     if ((pl_flags & P_T) == 0)