New macro ARRAY_SIZE()

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

diff --git a/src/lib/subs/paths.c b/src/lib/subs/paths.c
index db0e4dccf9b6875cacd28b05c896a01f720690ad..23bd3bb5641cb9b69c4d7449a63ac7e29698921b 100644 (file)
--- a/src/lib/subs/paths.c
+++ b/src/lib/subs/paths.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -27,12 +27,11 @@
  *  paths.c: Routines associated with paths, directions, etc.
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2005-2011
+ *     Markus Armbruster, 2005-2020
  */
 
 #include <config.h>
 
-#include "file.h"
 #include "optlist.h"
 #include "path.h"
 #include "player.h"
@@ -74,7 +73,7 @@ diridx(char dir)
 {
     unsigned i = dir - 'a';
 
-    if (CANT_HAPPEN(i >= sizeof(dirindex) / sizeof(*dirindex)
+    if (CANT_HAPPEN(i >= ARRAY_SIZE(dirindex)
                    || dirindex[i] < 0))
        return DIR_STOP;
     return dirindex[i];