From 057d550a190b319d6b893692c143478d03b86ec4 Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Sun, 15 Jul 2012 02:41:44 +0300
Subject: [PATCH] update starvation

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

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 621a6047..590ee930 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -3995,6 +3995,8 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 		$starvarray = array();
 		$starvarray = $database->getStarvation();
 		foreach ($starvarray as $starv){
+		$unitarrays = $this->getAllUnits($starv['wref']);
+		$upkeep = $starv['pop'] + $this->getUpkeep($unitarrays, 0);
 			if (($starv['starvupdate']+600) < $time){
 				// get enforce
 				$enforcearray = $database->getEnforceVillage($starv['wref'],0);
@@ -4049,9 +4051,8 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 						$database->setVillageField($starv['wref'], 'crop', $newcrop);
 					}
 				}
-				$upkeep = $starv['pop'] + $this->getUpkeep($unitarrays, 0);
 				if($difcrop > 0){
-					$killunits = round($difcrop/18000);
+					$killunits = floor($difcrop/18000);
 					if($killunits > 0){
 					if (isset($enf)){
 						if($killunits < $maxcount){
@@ -4077,14 +4078,14 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 					}
 					}
 				}
-
+			}
 				$crop = $database->getCropProdstarv($starv['wref']);
 				if ($crop > $upkeep){
 					$database->setVillageField($starv['wref'], 'starv', 0);
 					$database->setVillageField($starv['wref'], 'starvupdate', 0);
 				}
-			}
-			unset ($starv,$unitarray,$enforcearray,$enforce,$starvarray);
+
+			unset ($starv,$unitarrays,$enforcearray,$enforce,$starvarray);
 		}
 
 		if(file_exists("GameEngine/Prevention/starvation.txt")) {
diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index bc355dd8..899971fb 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -164,12 +164,6 @@ class MYSQL_DB {
 			$result = mysql_query($q, $this->connection);
 			return $this->mysql_fetch_all($result);
 	}
-	
-	function getUnstarvation(){
-			$q = "SELECT * FROM " . TB_PREFIX . "vdata where starv = 0 and starvupdate = 0";
-			$result = mysql_query($q, $this->connection);
-			return $this->mysql_fetch_all($result);
-	}
 
 	function getActivateField($ref, $field, $mode) {
 		if(!$mode) {