fix training

This commit is contained in:
unknown
2012-07-08 03:26:51 +03:00
parent 77fc18dfd1
commit eaf1492095
2 changed files with 7 additions and 3 deletions
+5 -1
View File
@@ -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'];
}
+2 -2
View File
@@ -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);
}