Clean up superfluous includes

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

diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c
index 6ff952b1374ce70174ca00d6ec56c65c198bc992..7f4b0dffcd0cd543bbd4c49630fa9fe66899f968 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-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,53 +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.
  *
  *  ---
  *
  *  hap_fact.c: Happiness effect on che
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
  */
 
-#include <stdio.h>
-#include <ctype.h>
+#include <config.h>
+
 #include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
 #include "nat.h"
-#include "news.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
-#include "common.h"
+#include "prototypes.h"
+#include "xy.h"
 
-double hap_fact(struct natstr *tnat, struct natstr *vnat)
+double
+hap_fact(struct natstr *tnat, struct natstr *vnat)
 {
-    double     hap_fact;
+    double hap_fact;
 
     hap_fact = vnat->nat_level[NAT_HLEV];
     if (hap_fact && tnat->nat_level[NAT_HLEV])
-        hap_fact = tnat->nat_level[NAT_HLEV] / hap_fact;
+       hap_fact = tnat->nat_level[NAT_HLEV] / hap_fact;
     else if (!hap_fact && !tnat->nat_level[NAT_HLEV])
-        hap_fact = 1.0;
-    else if (tnat->nat_level[NAT_HLEV]) /* Target has happy, better fighting */
-        hap_fact = 2.0;
-    else  /* Target has no happy, worse fighting */
-        hap_fact = 0.8;
+       hap_fact = 1.0;
+    else if (tnat->nat_level[NAT_HLEV])        /* Target has happy, better fighting */
+       hap_fact = 2.0;
+    else                       /* Target has no happy, worse fighting */
+       hap_fact = 0.8;
     if (hap_fact > 2.0)
-        hap_fact = 2.0;
+       hap_fact = 2.0;
     if (hap_fact < 0.8)
-        hap_fact = 0.8;
+       hap_fact = 0.8;
     return hap_fact;
 }
+
+/* Return happiness required to keep NP's citizens happy.  */
+double
+hap_req(struct natstr *np)
+{
+    return (np->nat_level[NAT_TLEV] - 40.0) / 40.0
+       + np->nat_level[NAT_ELEV] / 3.0;
+}