Fixing various

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
+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;
}