From 800627b8139e0ec45486a2fdfb8cab867212246f Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Wed, 5 Sep 2012 17:28:31 +0300
Subject: [PATCH] more updates

---
 GameEngine/Automation.php        | 2 +-
 GameEngine/Database/db_MYSQL.php | 2 +-
 GameEngine/Generator.php         | 2 +-
 GameEngine/Session.php           | 1 -
 Templates/Build/37_hero.tpl      | 2 +-
 Templates/Profile/account.tpl    | 2 +-
 Templates/menu.tpl               | 2 ++
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index cfc574b5..741a5940 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -3825,7 +3825,7 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 			foreach($harray as $hdata){
 				if((time()-$hdata['lastupdate'])>=1){
 					if($hdata['health']<100 and $hdata['health']>0){
-					$reg = $hdata['health']+$hdata['regeneration']*5*ceil(SPEED/10)/86400*(time()-$hdata['lastupdate']);
+					$reg = $hdata['health']+$hdata['regeneration']*5*SPEED/86400*(time()-$hdata['lastupdate']);
 					if($reg <= 100){
 						$database->modifyHero("health",$reg,$hdata['heroid']);
 					}else{
diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index c64d4c45..52bca0a5 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -221,7 +221,7 @@ class MYSQL_DB {
 	}
 
 	function setDeleting($uid, $mode) {
-		$time = time() + 5 * 3600;
+		$time = time() + 72 * 3600;
 		if(!$mode) {
 			$q = "INSERT into " . TB_PREFIX . "deleting values ($uid,$time)";
 		} else {
diff --git a/GameEngine/Generator.php b/GameEngine/Generator.php
index 74670149..94f90425 100644
--- a/GameEngine/Generator.php
+++ b/GameEngine/Generator.php
@@ -106,7 +106,7 @@ public function procMtime($time, $pref = 3) {
 			break;
 		}
 		*/
--       $time += 3600*1; //Edit this yourself
+-       $time += 3600*0; //Edit this yourself
 +       $time += 0; //Edit this yourself
 
 $today = date('d',time())-1;
diff --git a/GameEngine/Session.php b/GameEngine/Session.php
index 36b88f96..c70fca71 100644
--- a/GameEngine/Session.php
+++ b/GameEngine/Session.php
@@ -168,7 +168,6 @@ class Session {
 				if($this->userarray['b4'] > $this->time) {
 					$this->bonus4 = 1;
 				}
-				$this->money = $this->userarray['money'];
 			}
 
 			private function SurfControl(){
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/Templates/Profile/account.tpl b/Templates/Profile/account.tpl
index d5274605..a84d46bf 100644
--- a/Templates/Profile/account.tpl
+++ b/Templates/Profile/account.tpl
@@ -106,7 +106,7 @@ echo "<span class=\"error\">".$form->getError('email')."</span>";
 </tr>
 </thead><tbody>
 <tr>
-    <td class="note" colspan="2">You can delete your account here. After starting the cancellation it will take 5 hours to complete the cancellation of your account. You can cancel this process before it done.</td>
+	<td class="note" colspan="2">You can delete your account here. After starting the cancellation it will take three days to complete the cancellation of your account. You can cancel this process within the first 24 hours.</td>
 </tr><tr>
 <?php
 $timestamp = $database->isDeleting($session->uid);
diff --git a/Templates/menu.tpl b/Templates/menu.tpl
index c133340b..ea5b01dc 100644
--- a/Templates/menu.tpl
+++ b/Templates/menu.tpl
@@ -55,9 +55,11 @@ div.c1 {text-align: center}
 		$timestamp = $database->isDeleting($session->uid);
 		if($timestamp) {
 		echo "<td colspan=\"2\" class=\"count\">";
+		if($timestamp > time()+48*3600) {
 		echo "<a href=\"spieler.php?s=3&id=".$session->uid."&a=1&e=4\"><img
 		class=\"del\" src=\"img/x.gif\" alt=\"Cancel process\"
 		title=\"Cancel process\" /> </a>";
+		}
 		$time=$generator->getTimeFormat(($timestamp-time()));
         echo "<a href=\"spieler.php?s=3\"> The account will be deleted in <span
 		id=\"timer1\">".$time."</span> .</a></td>";