coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- removed unnessecary limit from displayed creatures/objects per zone

Browse source 
- check if g_pageInfo exists, before attempting to overwrite it
This commit is contained in:
Sarjuuk 2015-06-06 20:53:25 +02:00
parent 2e327b7cc0
commit 81a5a527ec
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pages/zone.php
View file

@ -170,7 +170,7 @@ class ZonePage extends GenericPage
$oSpawns = DB::Aowow()->select('SELECT * FROM ?_spawns WHERE areaId = ?d AND type = ?d', $this->typeId, TYPE_OBJECT);
$cSpawns = DB::Aowow()->select('SELECT * FROM ?_spawns WHERE areaId = ?d AND type = ?d', $this->typeId, TYPE_NPC);
$conditions = [['s.areaId', $this->typeId]];
$conditions = [CFG_SQL_LIMIT_NONE, ['s.areaId', $this->typeId]];
if (!User::isInGroup(U_GROUP_STAFF))
$conditions[] = [['cuFlags', CUSTOM_EXCLUDE_FOR_LISTVIEW, '&'], 0];

2
template/bricks/mapper.tpl.php
View file

@ -51,7 +51,7 @@ elseif (!empty($this->map['data'])):
<script type="text/javascript">//<![CDATA[
<?php
if (!empty($this->map['data']['zone'])):
echo " $.extend(g_pageInfo, {id: ".$this->map['data']['zone']."});\n";
echo " ".(!empty($this->gPageInfo) ? "$.extend(g_pageInfo, {id: ".$this->map['data']['zone']."})" : "var g_pageInfo = {id: ".$this->map['data']['zone']."}").";\n";
elseif (!empty($this->map['mapperData'])):
echo " var g_mapperData = ".json_encode($this->map['mapperData'], JSON_NUMERIC_CHECK).";\n";
endif;