Commits

Kevin Read committed 94f2758 Merge

Merge

  • Participants
  • Parent commits 863aa81, 86d2be7

Comments (0)

Files changed (2)

File einheiten-schicken.php

 			$send_err = "Sitter können keine Angriffe ausführen";
 
         if (!isset ($dist))//dist is already calculated for returning troops
-		    $dist = (($x - $me->activevillage->x) * ($x - $me->activevillage->x)) - (($y - $me->activevillage->y) * ($y - $me->activevillage->y));
+        {
+            $distance_a = ($x - $me->activevillage->x) * ($x - $me->activevillage->x);
+            $distance_b = ($y - $me->activevillage->y) * ($y - $me->activevillage->y);
+            $dist = sqrt (abs($distance_a + $distance_b));
+        }
 
 		if (isset ($type))
 			$step = 3;

File php/base/Krieg.php

 		echo '<tr><th>Frist&nbsp;&nbsp;</th><td>';
 		if  (($this->limit) == false)
 		{
-			echo 'Die ' . WAR_WARMUP . '-Stunden-Frist ist abgelaufen, ';
+			echo 'Die ' . WAR_WARMUP / 60 . '-Stunden-Frist ist abgelaufen, ';
 			if ($this->over > 0)
 			{
 				echo "der Krieg ist beendet. ";