COPYING duplicates information from README. Remove. Move GPL from

[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..94efa32eced3551085489adab0877bc65dbed553 100644 (file)
--- a/src/lib/common/hap_fact.c
+++ b/src/lib/common/hap_fact.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,36 +31,34 @@
  *     Steve McClure, 1996
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <ctype.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"
 
-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;
 }