From d8d37c5639b150dac5e22542ab8758550ed275f8 Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Sat, 11 Aug 2012 00:36:01 +0300
Subject: [PATCH] ally ranking update

---
 GameEngine/Ranking.php      | 12 ++++++------
 Templates/Build/37_hero.tpl |  2 +-
 a2b.php                     |  4 ++++
 statistiken.php             |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php
index fdf8ae63..753f97dd 100644
--- a/GameEngine/Ranking.php
+++ b/GameEngine/Ranking.php
@@ -64,26 +64,26 @@
 							break;
 						case 4:
 							$this->procARankArray();
-							if($session->alliance == 0) {
+							if($get['aid'] == 0) {
 								$this->getStart(1);
 							} else {
-								$this->getStart($this->searchRank($session->alliance, "id"));
+								$this->getStart($this->searchRank($get['aid'], "id"));
 							}
 							break;
 						case 41:
 							$this->procAAttRankArray();
-							if($session->alliance == 0) {
+							if($get['aid'] == 0) {
 								$this->getStart(1);
 							} else {
-								$this->getStart($this->searchRank($session->alliance, "id"));
+								$this->getStart($this->searchRank($get['aid'], "id"));
 							}
 							break;
 						case 42:
 							$this->procADefRankArray();
-							if($session->alliance == 0) {
+							if($get['aid'] == 0) {
 								$this->getStart(1);
 							} else {
-								$this->getStart($this->searchRank($session->alliance, "id"));
+								$this->getStart($this->searchRank($get['aid'], "id"));
 							}
 							break;
 					}
diff --git a/Templates/Build/37_hero.tpl b/Templates/Build/37_hero.tpl
index f7acfb32..efa5499c 100644
--- a/Templates/Build/37_hero.tpl
+++ b/Templates/Build/37_hero.tpl
@@ -113,7 +113,7 @@ if (isset($_POST['name'])) {
     </tr> 
     <tr> 
         <th>Regeneration</th> 
-        <td class="val"><?php echo ($hero_info['regeneration']*5*ceil(SPEED/10)); ?>/Day</td> 
+        <td class="val"><?php echo ($hero_info['regeneration']*5*SPEED); ?>/Day</td> 
         <td class="xp"><img class="bar" src="img/x.gif" style="width:<?php echo ($hero_info['regeneration']*2)+1; ?>px;" alt="<?php echo ($hero_info['regeneration']*5*SPEED); ?>%/Day" title="<?php echo ($hero_info['regeneration']*5*SPEED); ?>%/Day" /></td> 
         <td class="up"><span class="none"> 
         <?php 
diff --git a/a2b.php b/a2b.php
index 70da6524..07201ea8 100644
--- a/a2b.php
+++ b/a2b.php
@@ -212,6 +212,10 @@ if(isset($_GET['o'])) {
 			$database->deletePrisoners($prisoner['id']);
 				}else if($prisoner['from'] == $village->wid){
 			$troops = $prisoner['t1']+$prisoner['t2']+$prisoner['t3']+$prisoner['t4']+$prisoner['t5']+$prisoner['t6']+$prisoner['t7']+$prisoner['t8']+$prisoner['t9']+$prisoner['t10']+$prisoner['t11'];
+			if($prisoner['t11'] > 0){
+			$p_owner = $database->getVillageField($prisoner['from'],"owner");
+			mysql_query("UPDATE ".TB_PREFIX."hero SET `dead` = '1', `health` = '0' WHERE `uid` = '".$p_owner."'");
+			}
 			$database->modifyUnit($prisoner['wref'],array("99o"),array($troops),array(0));
 			$database->deletePrisoners($prisoner['id']);
 				}
diff --git a/statistiken.php b/statistiken.php
index cc61a941..8fa8ab09 100644
--- a/statistiken.php
+++ b/statistiken.php
@@ -14,6 +14,7 @@
 include("GameEngine/Village.php");
 $__start = $generator->pageLoadTimeStart();
 if(isset($_GET['rank'])){ $_POST['rank']==$_GET['rank']; }
+$_GET['aid'] = $session->alliance;
 $ranking->procRankReq($_GET);
 $ranking->procRank($_POST);
 if(isset($_GET['newdid'])) {