From a87d8ea2ecb708189bf2621f30afc16018f15dae Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Fri, 4 May 2012 19:58:52 +0300
Subject: [PATCH] fix tournament square

---
 GameEngine/Automation.php | 12 ++++++++----
 GameEngine/Generator.php  |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index a8da60e5..9e4bc9cf 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -641,7 +641,7 @@ private function loyaltyRegeneration() {
     }
 
     private function sendunitsComplete() {
-        global $bid23,$database,$battle,$village,$technology,$logging;
+        global $bid23,$bid34,$database,$battle,$village,$technology,$logging;
          $ourFileHandle = @fopen("GameEngine/Prevention/sendunits.txt", 'w');
             @fclose($ourFileHandle);
         $time = time();
@@ -2683,13 +2683,17 @@ $crannyimg = "<img src=\"gpack/travian_default/img/g/g23.gif\" height=\"30\" wid
         }
         else {
             $speed = $ref;
-            if($this->getsort_typeLevel(14,$resarray) != 0) {
-                $speed = $distance <= TS_THRESHOLD ? $speed : $speed * ( ( TS_THRESHOLD + ( $distance - TS_THRESHOLD ) * $bid14[$this->getsort_typeLevel(14,$resarray)]['attri'] / 100 ) / $distance ) ;
+            if($this->getsort_typeLevel(14,$resarray) != 0 && $distance >= TS_THRESHOLD) {
+                $speed = $speed * ($bid14[$this->getsort_typeLevel(14,$resarray)]['attri']/100) ;
             }
         }
 
 
-        return round(($distance/$speed) * 3600 / INCREASE_SPEED);
+		if($speed!=0){
+		return round(($distance/$speed) * 3600 / INCREASE_SPEED);
+		}else{
+		return round($distance * 3600 / INCREASE_SPEED);
+		}
 
     }
 
diff --git a/GameEngine/Generator.php b/GameEngine/Generator.php
index 766be2b0..b65e085f 100644
--- a/GameEngine/Generator.php
+++ b/GameEngine/Generator.php
@@ -65,8 +65,8 @@ class Generator {
 		}
 		else {
 			$speed = $ref;
-			if($building->getTypeLevel(14) != 0) {
-				$speed = $distance <= TS_THRESHOLD ? $speed : $speed * ( ( TS_THRESHOLD + ( $distance - TS_THRESHOLD ) * $bid14[$building->gettypeLevel(14)]['attri'] / 100 ) / $distance ) ;
+			if($building->getTypeLevel(14) != 0 && $distance >= TS_THRESHOLD) {
+				$speed = $speed * ($bid14[$building->gettypeLevel(14)]['attri']/100) ;
 			}
 		}
 		if($speed!=0){