diff --git a/includes/allnpcs.php b/includes/allnpcs.php index 21c6ee1..27917a4 100644 --- a/includes/allnpcs.php +++ b/includes/allnpcs.php @@ -33,7 +33,7 @@ function creatureinfo2(&$Row) { // TODO: Месторасположение // $creature['location'] = location($creature['entry'],'creature'); // TODO: Реакция на фракции - $creature['react'] = ($Row['FactionAlliance']) . ',' . ($Row['FactionHorde']); + $creature['react'] = ($Row['A']) . ',' . ($Row['H']); // Тип NPC $creature['type'] = $Row['Creaturetype']; // Тег NPC diff --git a/npc.php b/npc.php index 1d15866..38f6cb5 100644 --- a/npc.php +++ b/npc.php @@ -30,7 +30,7 @@ if (!$npc = load_cache(1, intval($id))) { $npc = array(); $row = $DB->selectRow(' SELECT - ?#, c.entry, c.name, + ?#, c.entry, c.name, ft.A, ft.H, { l.name as `name`, l.subname as `subname`, diff --git a/npcs.php b/npcs.php index c2a2372..180466e 100644 --- a/npcs.php +++ b/npcs.php @@ -29,7 +29,7 @@ if (!$npcs = load_cache(2, $cache_str)) { global $DB; $rows = $DB->select(' - SELECT c.?#, c.entry + SELECT c.?#, c.entry, A, H { , l.name_loc?d as `name_loc` , l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc` @@ -44,7 +44,7 @@ if (!$npcs = load_cache(2, $cache_str)) { {LIMIT ?d} ', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, ($type != '') ? $type : DBSIMPLE_SKIP, (isset($family)) ? $family : DBSIMPLE_SKIP, ($UDWBaseconf['limit'] != 0) ? $UDWBaseconf['limit'] : DBSIMPLE_SKIP ); - + $npcs = array(); foreach ($rows as $numRow => $row) { $npcs[$numRow] = array();