yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

BaseTypes:

Browse Source 
- rewrote BaseType::iterate() to be a generator and yield references (requires php 5.5)
- reduced usage of bandaid BaseType::reset()
- removed Util::getIdFieldName() which was even more of a bandaid
- discovered DBSimple::selectPage() and consequently removed $matchQuery as they are now obsoloete

Util:
- added trainerTemplate lists for future use with trainers and trained spells

misc. forgotten and/or broken stuff here and there
This commit is contained in:
Sarjuuk
2013-08-18 13:40:12 +02:00
parent 0b0fa39ff4
commit 73cdce784e
34 changed files with 361 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/class.worldevent.php
View File

@@ -8,7 +8,6 @@ class WorldEventList extends BaseType
public static $type = TYPE_WORLDEVENT;
protected $setupQuery = 'SELECT *, -e.id AS ARRAY_KEY, -e.id as id FROM ?_events e LEFT JOIN ?_holidays h ON e.holidayId = h.id WHERE [cond] ORDER BY -e.id ASC';
protected $matchQuery = 'SELECT COUNT(1) FROM ?_events e LEFT JOIN ?_holidays h ON e.holidayId = h.id WHERE [cond]';
public function __construct($data)
{
@@ -18,7 +17,7 @@ class WorldEventList extends BaseType
$replace = [];
// post processing
while ($this->iterate())
foreach ($this->iterate() as $__)
{
// emulate category
$sT = $this->curTpl['scheduleType'];
@@ -58,7 +57,6 @@ class WorldEventList extends BaseType
unset($this->templates[$old]);
$this->templates[$data['id']] = $data;
}
$this->reset();
}
public static function getName($id)
@@ -117,7 +115,7 @@ class WorldEventList extends BaseType
{
$data = [];
while ($this->iterate())
foreach ($this->iterate() as $__)
{
$data[$this->id] = array(
'category' => $this->curTpl['category'],
@@ -134,7 +132,7 @@ class WorldEventList extends BaseType
public function addGlobalsToJScript(&$template, $addMask = 0)
{
while ($this->iterate())
foreach ($this->iterate() as $__)
{
$template->extendGlobalData(self::$type, [$this->id => array(
'name' => $this->getField('name', true),