Update copyright notice

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

diff --git a/src/lib/subs/coastal.c b/src/lib/subs/coastal.c
index e4b19247007d83f8f106d78368a0ae2fda8f0b15..34a34b2b4e96aba0df0918a5964608b21cde6227 100644 (file)
--- a/src/lib/subs/coastal.c
+++ b/src/lib/subs/coastal.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, 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 @@
  *  ---
  *
  *  coastal.c: Routines to calculate the coastal flag
- * 
+ *
  *  Known contributors to this file:
  *     Ron Koenderink, 2005
  */
@@ -37,6 +36,7 @@
 #include "path.h"
 #include "prototypes.h"
 #include "sect.h"
+#include "xy.h"
 
 static int
 update_coastal_flag(coord x, coord y, coord ign_x, coord ign_y)
@@ -91,13 +91,17 @@ coastal_land_to_sea(coord x, coord y)
     return 1;
 }
 
+/*
+ * Compute coastal flags for a change of SP from OLDDES to NEWDES.
+ * Update adjacent sectors, but don't touch SP.
+ */
 void
-set_coastal(struct sctstr *sp, int des)
+set_coastal(struct sctstr *sp, int olddes, int newdes)
 {
-    int old_water = sp->sct_type == SCT_WATER
-       || sp->sct_type == SCT_BTOWER || sp->sct_type == SCT_BSPAN;
-    int new_water = des == SCT_WATER
-       || des == SCT_BTOWER || des == SCT_BSPAN;
+    int old_water = olddes == SCT_WATER
+       || olddes == SCT_BTOWER || olddes == SCT_BSPAN;
+    int new_water = newdes == SCT_WATER
+       || newdes == SCT_BTOWER || newdes == SCT_BSPAN;
 
     if (new_water != old_water)
        sp->sct_coastal = new_water