xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-31 23:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #354 from Shadowss/patch-61

Browse Source 
fixed img show on map , now view correctly.
This commit is contained in:
yi12345
2013-09-25 02:51:53 -07:00
parent d1b65697a1 222e414772
commit 25994deabc
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Map/mapview.tpl
+27 -5
View File
@@ -1,4 +1,22 @@
<?php <?php
#################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ##
## Project: TravianZ ##
## Version: 01.09.2013 ##
## Filename mapview.php ##
## Developed by: Advocaite , yi12345 , Shadow , MisterX ##
## Fixed by: Shadow & MisterX - Attack image view on map ##
## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2013. All rights reserved. ##
## URLs: http://travian.shadowss.ro ##
## Source code: http://github.com/Shadowss/TravianZ-by-Shadow/ ##
## ##
#################################################################################
if(isset($_GET['z'])) { if(isset($_GET['z'])) {
$currentcoor = $database->getCoor($_GET['z']);++$requse2; $currentcoor = $database->getCoor($_GET['z']);++$requse2;
$y = $currentcoor['y']; $y = $currentcoor['y'];
@@ -129,19 +147,23 @@ $neutral = (($neutralarray[0]['alli1']>0 and $neutralarray[0]['alli2']>0 and $do
//echo in_array($targetalliance,$friendarray); //echo in_array($targetalliance,$friendarray);
$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $session->uid)? ($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? ($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']; $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $session->uid)? ($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? ($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'];
// Map Attacks // Map Attacks by Shadow & MisterX
$att = '';
if($session->plus) { if($session->plus) {
$wref = $village->wid; $wref = $village->wid;
$toWref = $donnees['map_id']; $toWref = $donnees['map_id'];
if ($database->checkAttack($wref,$toWref) != 0) { if ($database->checkAttack($wref,$toWref) != 0) {
$att = '<img style="margin-right:45px;" class="att1" src="img/x.gif" />'; $att = '<span class=\'m3\' ></span>';
} }elseif ($database->checkEnforce($wref,$toWref) != 0) {
$att = '<span class=\'m9\' ></span>';
}
} }
// Map content // Map content
if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){ if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){
$map_content .= "<div id='i_".$row."_".$i."' class='o99'></div>\r"; $map_content .= "<div id='i_".$row."_".$i."' class='o99'>$att</div>\r";
}else{ }else{
$map_content .= "<div id='i_".$row."_".$i."' class='".$image."'>$att</div>\r"; $map_content .= "<div id='i_".$row."_".$i."' class='".$image."'>$att</div>\r";
} }