Update copyright notice

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

diff --git a/src/lib/global/dir.c b/src/lib/global/dir.c
index eef55bce6895b0a74a2e3aa85327e37420bbac5f..e846a8f22f6ecd3bc6ae16dda70c95f66e879da2 100644 (file)
--- a/src/lib/global/dir.c
+++ b/src/lib/global/dir.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,58 +14,54 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  dir.c: Directional orientation descriptions.  Must agree with defines
  *         in path.h
- * 
+ *
  *  Known contributors to this file:
  */
 
-#include "misc.h"
-#include "var.h"
-#include "xy.h"
+#include <config.h>
+
+#include "path.h"
 
 /* must agree with DIR_ defines */
-s_char    dirch[] = {
-       'h',            /* stop */
-       'u',            /* up-right */
-       'j',            /* right */
-       'n',            /* down-right */
-       'b',            /* down-left */
-       'g',            /* left */
-       'y',            /* up-left */
-       'v',            /* view */
-       'm',            /* map */
-       '\0',
+char dirch[] = {
+    'h',                       /* stop */
+    'u',                       /* up-right */
+    'j',                       /* right */
+    'n',                       /* down-right */
+    'b',                       /* down-left */
+    'g',                       /* left */
+    'y',                       /* up-left */
+    'v',                       /* view */
+    'm',                       /* map */
+    '\0',
 };
 
 /* must agree with dirch[] and DIR_ defines */
-int    diroff[][2] = {
-  {0,0}, {1,-1}, {2,0}, {1,1}, {-1,1}, {-2,0}, {-1,-1}, {0,0}, {0,0}
+int diroff[][2] = {
+    {0, 0}, {1, -1}, {2, 0}, {1, 1}, {-1, 1}, {-2, 0}, {-1, -1}, {0, 0},
+    {0, 0}
 };
 
 /* this maps a character from a to z into the diroff mappings.  It
    keeps us from having to loop if we don't want to */
-int dirindex[] = { 0, 4, 0, 0, 0, 0, 5, 0, 0, 2, 0, 0, 8,
-                  3, 0, 0, 0, 0, 0, 0, 1, 7, 0, 0, 6, 0 };
+signed char dirindex[] = {
+    -1, 4, -1, -1, -1, -1, 5, 0, -1, 2, -1, -1, 8,
+    3, -1, -1, -1, -1, -1, -1, 1, 7, -1, -1, 6, -1
+};
 
 /* must agree with dirch[] and DIR_ defines */
-s_char   *routech[7][2] = {
-       { "   ",        "$ $" },
-       { "  /",        "$ /" },
-       { "  >",        "$ >" },
-       { "  \\",       "$ \\" },
-       { "/  ",        "/ $" },
-       { "<  ",        "< $" },
-       { "\\  ",       "\\ $" }
+char *routech[] = {
+    "   ", "  /", "  >", "  \\", "/  ", "<  ", "\\  "
 };