From c52ec838a3a85454c2886808c29202cb6fecfbd7 Mon Sep 17 00:00:00 2001
From: sempoi <haramli@yahoo.com>
Date: Sat, 8 Mar 2014 20:21:20 +0800
Subject: [PATCH] Update mapscroll.tpl

---
 Templates/Ajax/mapscroll.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Templates/Ajax/mapscroll.tpl b/Templates/Ajax/mapscroll.tpl
index 103bdb0c..e1f709eb 100644
--- a/Templates/Ajax/mapscroll.tpl
+++ b/Templates/Ajax/mapscroll.tpl
@@ -1,6 +1,7 @@
 <?php
 session_start();
 include('GameEngine/config.php');
+include_once ("GameEngine/Lang/" . LANG . ".php");
 mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysql_error());
 mysql_select_db(SQL_DB) or die(mysql_error());
 include("GameEngine/Generator.php");
@@ -109,10 +110,11 @@ $neutral = (($neutralarray[0]['alli1']>0 and $neutralarray[0]['alli2']>0 and $do
 
 
 $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? ($friend==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : ($war==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : ($neutral==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $_SESSION['alliance_user']? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image'];
-if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){
+if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){
 $image = "o99";
 }
 	//Javascript map info
+	$regcount=0;
 	if($yrow!=7){
 		$map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\"";
 		if($donnees['map_occupied']){
@@ -144,4 +146,4 @@ $image = "o99";
 	else {$map_js .= "]";}
 	++$i;
 }
-echo '[['.$map_js.']';
\ No newline at end of file
+echo '[['.$map_js.']';