From eaf1492095827633fcbf446926a34c0a24c3c511 Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Sun, 8 Jul 2012 03:26:51 +0300
Subject: [PATCH] fix training

---
 GameEngine/Automation.php        | 6 +++++-
 GameEngine/Database/db_MYSQL.php | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index b45c8162..810bd646 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -3446,7 +3446,11 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 					$pop = $train['pop'];
 					if($timepast <= 0 && $train['amt'] > 0) {
 					$timepast2 = $time - $train['timestamp2'];
-					$trained = round($timepast2/$train['eachtime']);
+					$trained = 1;
+					while($timepast2 >= $train['eachtime']){
+					$timepast2 -= $train['eachtime'];
+					$trained += 1;
+					}
 					if($trained > $train['amt']){
 					$trained = $train['amt'];
 					}
diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 58b5af61..be4f0016 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -2415,7 +2415,7 @@ class MYSQL_DB {
 	$time2 += $queued[count($queued) - 1]['timestamp'] - $now;
 	}
 	if($queued[count($queued) - 1]['unit'] == $unit){
-	$time = $amt*$queued[count($queued) - 1]['each'];
+	$time = $amt*$queued[count($queued) - 1]['eachtime'];
 			$q = "UPDATE " . TB_PREFIX . "training SET amt = amt + $amt, timestamp = timestamp + $time WHERE id = ".$queued[count($queued) - 1]['id']."";
 	}else{
 			$q = "INSERT INTO " . TB_PREFIX . "training values (0,$vid,$unit,$amt,$pop,$time,$each,$time2)";
@@ -2427,7 +2427,7 @@ class MYSQL_DB {
 	}
 
 	function updateTraining($id, $trained, $each) {
-		$q = "UPDATE " . TB_PREFIX . "training set amt = amt - $trained,timestamp2 = timestamp2 + $each where id = $id";
+		$q = "UPDATE " . TB_PREFIX . "training set amt = amt - $trained, timestamp2 = timestamp2 + $each where id = $id";
 		return mysql_query($q, $this->connection);
 	}