Update copyright notice

[empserver] / src / lib / common / hap_fact.c

diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c
index b66de12ed88c05bfe42185e7ef72ef7bfc397660..1eb4e73b9a674b3280c4cbcc3a191df9db900036 100644 (file)
--- a/src/lib/common/hap_fact.c
+++ b/src/lib/common/hap_fact.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2018, 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,21 +25,17 @@
  *  ---
  *
  *  hap_fact.c: Happiness effect on che
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2006-2013
  */
 
 #include <config.h>
 
-#include <ctype.h>
-#include <stdio.h>
 #include "misc.h"
 #include "nat.h"
-#include "nsc.h"
-#include "player.h"
 #include "prototypes.h"
-#include "xy.h"
 
 double
 hap_fact(struct natstr *tnat, struct natstr *vnat)
@@ -56,14 +51,10 @@ hap_fact(struct natstr *tnat, struct natstr *vnat)
        hap_fact = 2.0;
     else                       /* Target has no happy, worse fighting */
        hap_fact = 0.8;
-    if (hap_fact > 2.0)
-       hap_fact = 2.0;
-    if (hap_fact < 0.8)
-       hap_fact = 0.8;
-    return hap_fact;
+    return LIMIT_TO(hap_fact, 0.8, 2.0);
 }
 
-/* Return happiness required to keep NP's citizens happy.  */
+/* Return happiness required to keep NP's citizens happy. */
 double
 hap_req(struct natstr *np)
 {