From fa52446234965b6c8a1282c1d7d5448bc014942c Mon Sep 17 00:00:00 2001
From: Shadow <cata7007@gmail.com>
Date: Thu, 6 Mar 2014 07:33:26 +0200
Subject: [PATCH] Update database.php

---
 GameEngine/Admin/database.php | 97 ++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/GameEngine/Admin/database.php b/GameEngine/Admin/database.php
index ecce71c2..188ac53f 100644
--- a/GameEngine/Admin/database.php
+++ b/GameEngine/Admin/database.php
@@ -22,6 +22,7 @@ include_once("../../GameEngine/Data/buidata.php");
 }else{
 include_once("../GameEngine/Data/unitdata.php");
 include_once("../GameEngine/Technology.php");
+include_once("../GameEngine/Data/buidata.php");
 }
 class adm_DB {
 	var $connection;
@@ -56,58 +57,60 @@ class adm_DB {
 	}
   }
 
-	function recountPop($vid){
-	global $database;
-	$fdata = $database->getResourceLevel($vid);
-	$popTot = 0;
-	for ($i = 1; $i <= 40; $i++) {
-		$lvl = $fdata["f".$i];
-		$building = $fdata["f".$i."t"];
-		if($building){
-		$popTot += $this->buildingPOP($building,$lvl);
-		}
-	}
-	$q = "UPDATE ".TB_PREFIX."vdata set pop = $popTot where wref = $vid";
-	mysql_query($q, $this->connection);
+    function recountPop($vid){
+    global $database;
+    $fdata = $database->getResourceLevel($vid);
+    $popTot = 0;
+    for ($i = 1; $i <= 40; $i++) {
+        $lvl = $fdata["f".$i];
+        $building = $fdata["f".$i."t"];
+        if($building>0 && $lvl>0){
+            $popTot += $this->buildingPOP($building,$lvl);
+        }
+    }
+
+    $q = "UPDATE ".TB_PREFIX."vdata set pop = $popTot where wref = $vid";
+    mysql_query($q, $this->connection);
   }
   
-	function recountCP($vid){
-	global $database;
-	$fdata = $database->getResourceLevel($vid);
-	$popTot = 0;
-	for ($i = 1; $i <= 40; $i++) {
-		$lvl = $fdata["f".$i];
-		$building = $fdata["f".$i."t"];
-		if($building){
-		$popTot += $this->buildingCP($building,$lvl);
-		}
-	}
-	$q = "UPDATE ".TB_PREFIX."vdata set cp = $popTot where wref = $vid";
-	mysql_query($q, $this->connection);
-	}
+    function recountCP($vid){
+    global $database;
+    $fdata = $database->getResourceLevel($vid);
+    $popTot = 0;
+    for ($i = 1; $i <= 40; $i++) {
+        $lvl = $fdata["f".$i];
+        $building = $fdata["f".$i."t"];
+        if($building>0 && $lvl>0){
+            $popTot += $this->buildingCP($building,$lvl);
+        }
+    }
+    $q = "UPDATE ".TB_PREFIX."vdata set cp = $popTot where wref = $vid";
+    mysql_query($q, $this->connection);
+    }
 
   function buildingPOP($f,$lvl){
-	$name = "bid".$f;
-		global $$name;
-		$popT = 0;
-		$dataarray = $$name;
-	for ($i = 0; $i <= $lvl; $i++) {
-	  $popT += $dataarray[$i]['pop'];
-	}
-	return $popT;
+    $name = "bid".$f;
+    global $$name;
+    $popT = 0;
+    $dataarray = $$name;
+
+    for ($i = 1; $i <= $lvl; $i++) {
+        $popT += $dataarray[$i]['pop'];
+    }
+    return $popT;
   }
   
-	function buildingCP($f,$lvl){
-	$name = "bid".$f;
-	global $$name;
-		$popT = 0;
-		$dataarray = $$name;
-
-		for ($i = 0; $i <= $lvl; $i++) {
-			$popT += $dataarray[$i]['cp'];
-		}
-	return $popT;
-	}
+    function buildingCP($f,$lvl){
+        $name = "bid".$f;
+        global $$name;
+        $popT = 0;
+        $dataarray = $$name;
+        
+        for ($i = 1; $i <= $lvl; $i++) {
+            $popT += $dataarray[$i]['cp'];
+        }
+        return $popT;
+    } 
 
 	function getWref($x,$y) {
 		$q = "SELECT id FROM ".TB_PREFIX."wdata where x = $x and y = $y";
@@ -852,4 +855,4 @@ class adm_DB {
 
 $admin = new adm_DB;
 include("function.php");
-?>
\ No newline at end of file
+?>