COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/common/tfact.c b/src/lib/common/tfact.c
index dfdd847ca19975f00b6991cf41fece7ef04a6330..bd61d5f901d8980bb3b00b661d01b80a92420d4d 100644 (file)
--- a/src/lib/common/tfact.c
+++ b/src/lib/common/tfact.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,59 +31,39 @@
  *     Yannick Trembley
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "nat.h"
 #include "file.h"
-
-extern float fire_range_factor;
+#include "optlist.h"
 
 double
 tfact(natid cn, double mult)
 {
-       double  tlev;
-       struct  natstr *np;
+    double tlev;
+    struct natstr *np;
 
-       np = getnatp(cn);
-       tlev = np->nat_level[NAT_TLEV];
-       tlev = (50.0 + tlev) / (200.0 + tlev);
-       return mult * tlev;
+    np = getnatp(cn);
+    tlev = np->nat_level[NAT_TLEV];
+    tlev = (50.0 + tlev) / (200.0 + tlev);
+    return mult * tlev;
 }
 
 double
 tfactfire(natid cn, double mult)
 {
-       double  tlev;
-       struct  natstr *np;
+    double tlev;
+    struct natstr *np;
 
-       np = getnatp(cn);
-       tlev = np->nat_level[NAT_TLEV];
-       tlev = (50.0 + tlev) / (200.0 + tlev);
-       return mult * tlev * fire_range_factor;
+    np = getnatp(cn);
+    tlev = np->nat_level[NAT_TLEV];
+    tlev = (50.0 + tlev) / (200.0 + tlev);
+    return mult * tlev * fire_range_factor;
 }
 
 double
 techfact(int level, double mult)
 {
-       return mult * ((50.0 + level) / (200.0 + level));
-}
-
-/*
- * added so that firing range can be different to other ranges
- */ 
-double
-techfactfire(int level, double mult)
-{
-       return mult * ((50.0 + level) / (200.0 + level)) * fire_range_factor;
-}
-
-/*
- * figure out relative difference between two tech levels
- */
-double
-reltech(int level1, int level2, double mult)
-{
-       int     diff;
-
-       diff = level1 - level2;
-       return (1.0 + ((diff + 50.0) / (level1 + 50.0))) * mult;
+    return mult * ((50.0 + level) / (200.0 + level));
 }