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 934a7a5c6c28d8b9a4f136d971ae61540bbfabea..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,11 +31,12 @@
  *     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)
@@ -66,24 +67,3 @@ 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;
-}