Ravenholdt/Wowdb-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing various

Browse Source
This commit is contained in:
Antonis Farangitakis
2016-12-29 19:19:24 +02:00
committed by Antz
parent f79e902477
commit 24e1fac367
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/allitems.php
+5 -5
View File
@@ -10,11 +10,11 @@
*
*/
require_once 'includes/game.php';
require_once 'includes/allspells.php';
require_once 'includes/allitemsets.php';
require_once 'includes/allobjects.php';
require_once 'includes/allquests.php';
require_once('includes/game.php');
require_once('includes/allspells.php');
require_once('includes/allitemsets.php');
require_once('includes/allobjects.php');
require_once('includes/allquests.php');
// Массивы с названиями столбцов, необходимых для различных уровней вызова функций
// для allitems($level=0) - соответствия номер-иконка
includes/allquests.php
+3 -1
View File
@@ -167,8 +167,10 @@ function GetQuestStrings(&$data) {
$data['OfferRewardText'] = QuestReplaceStr(htmlspecialchars(!empty($data['OfferRewardText_loc']) ? $data['OfferRewardText_loc'] : $data['OfferRewardText'] ));
$data['EndText'] = QuestReplaceStr(htmlspecialchars(!empty($data['EndText_loc']) ? $data['EndText_loc'] : $data['EndText'] ));
for ($j = 0; $j <= 3; ++$j)
for ($j = 1; $j <= 4; ++$j)
{
$data['ObjectiveText'][$j] = QuestReplaceStr(htmlspecialchars(!empty($data['ObjectiveText' . $j . '_loc']) ? $data['ObjectiveText' . $j . '_loc'] : $data['ObjectiveText' . $j]));
}
}
/**
includes/game.php
+7 -1
View File
@@ -315,9 +315,15 @@ function mass_coord(&$data) {
foreach ($data as $ndata) {
// Если помимо координат есть ещё данные о респауне, преобразуем их к удобочитаемому виду:
if (isset($ndata['spawntimesecs']))
$tmp = array_merge(coord_db2wow($ndata['m'], $ndata['x'], $ndata['y'], false), array('r' => sec_to_time($ndata['spawntimesecs'])));
{
$coord_db2wow = coord_db2wow($ndata['m'], $ndata['x'], $ndata['y'], false) ?: array();
$tmp = array_merge($coord_db2wow, array('r' => sec_to_time($ndata['spawntimesecs'])));
}
else
{
$tmp = coord_db2wow($ndata['m'], $ndata['x'], $ndata['y'], false);
}
$tmp['t'] = $ndata['type'];
$xdata[] = $tmp;
}