From a2d08bd98ea93cacd82c2bad2bb4379c3432fcf1 Mon Sep 17 00:00:00 2001 From: "neatelves@gmail.com" Date: Tue, 16 Apr 2013 20:44:58 +0000 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?utf8?q?=D0=BE=20=D0=BC=D0=B5=D0=BB=D0=BE=D1=87=D0=B8,=20=D0=B2=D1=8B?= =?utf8?q?=D0=B2=D0=BE=D0=B4=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0?= =?utf8?q?=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=B4?= =?utf8?q?=D0=B0=D0=BD=D0=B8=D0=B9=20-=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB?= =?utf8?q?=D0=BE=20=D0=B8=20=D0=BA=D0=BE=D0=BD=D0=B5=D1=86..?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://cswowd-fork.googlecode.com/svn/trunk@158 e451fad0-63ce-11de-bed1-e3a98b22654c --- include/report_generator.php | 28 +++++++++++++++++++++-- include/spell_data.php | 50 +++++++++++++++++++++--------------------- lang/game_text.en.php | 1 + lang/game_text.ru.php | 3 ++- lang/lang.en.php | 5 +++-- lang/lang.ru.php | 3 ++- module/search/search_quest.php | 2 +- module/show/show_faction.php | 2 +- module/show/show_go.php | 2 +- module/show/show_item.php | 6 ++--- module/show/show_npc.php | 2 +- module/show/show_quest.php | 13 ++++------- module/show/show_spell.php | 2 +- module/show/show_zone.php | 11 +++++----- 14 files changed, 77 insertions(+), 53 deletions(-) diff --git a/include/report_generator.php b/include/report_generator.php index 99f46df..1530d63 100644 --- a/include/report_generator.php +++ b/include/report_generator.php @@ -1242,7 +1242,7 @@ function r_questName($data) if (($data['SpecialFlags'] & QUEST_SPECIAL_FLAG_REPEATABLE) && (($data['SpecialFlags'] & QUEST_SPECIAL_FLAG_MONTHLY) ==0) && ($data['QuestFlags'] & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY)) == 0) echo '
'.$lang['quest_type0'].'
'; } -function r_questGiver($data) +function r_questRelation($data) { global $dDB; // Search creature quest giver @@ -1271,6 +1271,29 @@ function r_questGiver($data) } echo '---(?)---'; } +function r_questInvolvedrelation($data) +{ + global $dDB; + // Search creature quest giver + if ($src = $dDB->select( + 'SELECT `entry`, `name`, `subname`, `faction_A` + FROM `creature_template` left join `creature_involvedrelation` ON `creature_template`.`entry` = `creature_involvedrelation`.`id` + WHERE `creature_involvedrelation`.`quest` = ?d', $data['entry'])) + { + foreach ($src as $creature){localiseCreature($creature);r_npcRName($creature);} + return; + } + // Search GO quest giver + if ($src = $dDB->select( + 'SELECT `entry`, `name` + FROM `gameobject_template` left join `gameobject_involvedrelation` ON `gameobject_template`.`entry` = `gameobject_involvedrelation`.`id` + WHERE `gameobject_involvedrelation`.`quest` = ?d', $data['entry'])) + { + foreach ($src as $go) {localiseGameobject($go); r_objName($go);} + return; + } + echo '---(?)---'; +} function r_questReward($quest) { global $lang; @@ -1389,7 +1412,8 @@ $quest_report = array( 'QUEST_REPORT_LEVEL' =>array('class'=>'small','sort'=>'level', 'text'=>$lang['quest_lvl'], 'draw'=>'r_questLvl', 'sort_str'=>'`QuestLevel` DESC', 'fields'=>'`QuestLevel`, `Type`'), 'QUEST_REPORT_REQLEVEL'=>array('class'=>'small','sort'=>'req_lvl','text'=>$lang['quest_reqlvl'], 'draw'=>'r_questReqLvl','sort_str'=>'`MinLevel` DESC', 'fields'=>'`MinLevel`'), 'QUEST_REPORT_NAME' =>array('class'=>'left', 'sort'=>'name', 'text'=>$lang['quest_name'], 'draw'=>'r_questName', 'sort_str'=>'`Title`', 'fields'=>'`Title`, `ZoneOrSort`, `RequiredSkill`, `RequiredSkillValue`, `RequiredClasses`, `RequiredRaces`, `QuestFlags`, `SpecialFlags`'), -'QUEST_REPORT_GIVER' =>array('class'=>'left', 'sort'=>'', 'text'=>$lang['quest_giver'], 'draw'=>'r_questGiver', 'sort_str'=>'', 'fields'=>''), +'QUEST_REPORT_GIVER' =>array('class'=>'left', 'sort'=>'', 'text'=>$lang['quest_giver'], 'draw'=>'r_questRelation', 'sort_str'=>'', 'fields'=>''), +'QUEST_REPORT_GIVER_END'=>array('class'=>'left', 'sort'=>'', 'text'=>$lang['quest_giver_end'], 'draw'=>'r_questInvolvedrelation', 'sort_str'=>'', 'fields'=>''), 'QUEST_REPORT_REWARD' =>array('class'=>'full', 'sort'=>'reward', 'text'=>$lang['quest_rewards'], 'draw'=>'r_questReward','sort_str'=>'`RewMoneyMaxLevel` DESC','fields'=>&$quest_reward_fields), // loot 'LOOT_REPORT_CHANCE'=>array('class'=>'', 'sort'=>'chance', 'text'=>$lang['loot_chance'], 'draw'=>'r_lootChance', 'sort_str'=>'ABS(`ChanceOrQuestChance`) DESC, `Title`', 'fields'=>'`ChanceOrQuestChance`, `mincountOrRef`'), diff --git a/include/spell_data.php b/include/spell_data.php index c22a69c..1f95220 100644 --- a/include/spell_data.php +++ b/include/spell_data.php @@ -261,7 +261,7 @@ $gSpellAuraName = array( '89'=>"Periodic Damage % Total Health", '90'=>"Mod Resist Chance", '91'=>"Mod Detect Range", -'92'=>"PREVENTS_FLEEING", +'92'=>"Cannot Flee", '93'=>"Unattackable", '94'=>"INTERRUPT_REGEN", '95'=>"Ghost", @@ -374,13 +374,13 @@ $gSpellAuraName = array( '202'=>"IGNORE_COMBAT_RESULT", '203'=>"Mod Melee Critical Damage Taken", '204'=>"Mod Ranged Critical Damage Teken", -'205'=>"205", +'205'=>"MOD_ATTACKER_SPELL_CRIT_DAMAGE", '206'=>"MOD_SPEED_MOUNTED", '207'=>"MOD_INCREASE_FLIGHT_SPEED", '208'=>"MOD_SPEED_FLIGHT", '209'=>"MOD_FLIGHT_SPEED_ALWAYS", -'210'=>"210", -'211'=>"MOD_FLIGHT_SPEED_NOT_STACK", +'210'=>"MOD_FLIGHT_SPEED_NOT_STACKING", +'211'=>"MOD_FLIGHT_SPEED_MOUNTED_NOT_STACKING", '212'=>"MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT", '213'=>"Mod Rage from Damage Dealt %", '214'=>"214", @@ -396,16 +396,16 @@ $gSpellAuraName = array( '224'=>"224", '225'=>"DUMMY_3", '226'=>"Peridic Dummy", -'227'=>"227", +'227'=>"PERIODIC_TRIGGER_SPELL_WITH_VALUE", '228'=>"DETECT_STEALTH", '229'=>"Mod AOE Damage Taken", '230'=>"230", -'231'=>"231", +'231'=>"PROC_TRIGGER_SPELL_WITH_VALUE", '232'=>"Mod Mechanic Duration", '233'=>"233", '234'=>"Mod Mechanic Duration not stack", '235'=>"Mod Mechanic Dispel Resist", -'236'=>"236", +'236'=>"CONTROL_VEHICLE", '237'=>"MOD_SPELL_DAMAGE_OF_ATTACK_POWER", '238'=>"MOD_SPELL_HEALING_OF_ATTACK_POWER", '239'=>"MOD_SCALE_2", @@ -416,21 +416,21 @@ $gSpellAuraName = array( '244'=>"COMPREHEND_LANGUAGE = 244", '245'=>"MOD_DURATION_OF_MAGIC_EFFECTS", '246'=>"MOD_DURATION_OF_EFFECTS_BY_DISPEL", -'247'=>"247", +'247'=>"MIRROR_IMAGE ", '248'=>"MOD_COMBAT_RESULT_CHANCE", '249'=>"Convert Rune", '250'=>"MOD_INCREASE_HEALTH_2", '251'=>"MOD_ENEMY_DODGE", -'252'=>"252", +'252'=>"SLOW_ALL", '253'=>"MOD_BLOCK_CRIT_CHANCE", '254'=>"MOD_DISARM_SHIELD", '255'=>"MOD_MECHANIC_DAMAGE_TAKEN_PERCENT", '256'=>"NO_REAGENT_USE", '257'=>"MOD_TARGET_RESIST_BY_SPELL_CLASS", -'258'=>"258", -'259'=>"259", -'260'=>"260", -'261'=>"261", +'258'=>"MOD_SPELL_VISUAL", +'259'=>"MOD_PERIODIC_HEAL", +'260'=>"SCREEN_EFFEC", +'261'=>"PHASE", '262'=>"262", '263'=>"ALLOW_ONLY_ABILITY", '264'=>"264", @@ -454,32 +454,32 @@ $gSpellAuraName = array( '282'=>"MOD_BASE_HEALTH_PCT", '283'=>"MOD_HEALING_RECEIVED", '284'=>"284", -'285'=>"SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR", -'286'=>"SPELL_AURA_ABILITY_PERIODIC_CRIT", -'287'=>"SPELL_AURA_DEFLECT_SPELLS", -'288'=>"SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT", +'285'=>"MOD_ATTACK_POWER_OF_ARMOR", +'286'=>"ABILITY_PERIODIC_CRIT", +'287'=>"DEFLECT_SPELLS", +'288'=>"MOD_PARRY_FROM_BEHIND_PERCENT", '289'=>"289", -'290'=>"SPELL_AURA_MOD_ALL_CRIT_CHANCE", -'291'=>"SPELL_AURA_MOD_QUEST_XP_PCT", +'290'=>"MOD_ALL_CRIT_CHANCE", +'291'=>"MOD_QUEST_XP_PCT", '292'=>"292", -'293'=>"SPELL_AURA_ADD_MECHANIC_ABILITIES", -'294'=>"SPELL_AURA_STOP_NATURAL_MANA_REGEN", +'293'=>"ADD_MECHANIC_ABILITIES", +'294'=>"STOP_NATURAL_MANA_REGEN", '295'=>"295", '296'=>"296", '297'=>"297", '298'=>"298", '299'=>"299", '300'=>"300", -'301'=>"SPELL_AURA_HEAL_ABSORB", +'301'=>"HEAL_ABSORB", '302'=>"302", '303'=>"303", -'304'=>"304", -'305'=>"SPELL_AURA_MOD_MINIMUM_SPEED", +'304'=>"FAKE_INEBRIATE", +'305'=>"MOD_MINIMUM_SPEED", '306'=>"306", '307'=>"307", '308'=>"308", '309'=>"309", -'310'=>"SPELL_AURA_MOD_PET_AOE_DAMAGE_AVOIDANCE", +'310'=>"MOD_PET_AOE_DAMAGE_AVOIDANCE", '311'=>"311", '312'=>"312", '313'=>"313", diff --git a/lang/game_text.en.php b/lang/game_text.en.php index ed4b8f3..3ebc6b8 100644 --- a/lang/game_text.en.php +++ b/lang/game_text.en.php @@ -18,6 +18,7 @@ $UseorEquip = array( '0'=>'Use:', '1'=>'Equip:', '2'=>'Chance on hit:', +'3'=>'', '4'=>'Soulstone:', '5'=>'', '6'=>'Use for learn:' diff --git a/lang/game_text.ru.php b/lang/game_text.ru.php index e9533e0..08e9803 100644 --- a/lang/game_text.ru.php +++ b/lang/game_text.ru.php @@ -19,6 +19,7 @@ $UseorEquip = array( '0'=>'Исп:', '1'=>'Одета:', '2'=>'Эффект при попадании:', +'3'=>'', '4'=>'Soulstone:', '5'=>'', '6'=>'Изучить:' @@ -59,7 +60,7 @@ $iBonus = array( '36'=>'Одета: Рейтинг скорости +%d.', // ITEM_MOD_HASTE_RATING = 36 '37'=>'Одета: Рейтинг мастерства +%d.', // ITEM_MOD_EXPERTISE_RATING = 37 '38'=>'Одета: Увеличивает силу атаки на %d.', // ITEM_MOD_ATTACK_POWER = 38 -'39'=>'Одета: Increases ranged attack power by %d.', // ITEM_MOD_RANGED_ATTACK_POWER = 39 +'39'=>'Одета: Увеличивает силу атаки дальнего боя на %d.', // ITEM_MOD_RANGED_ATTACK_POWER = 39 '40'=>'Одета: Increases attack power by %d in Cat, Bear, Dire Bear, and Moonkin forms only.',// ITEM_MOD_FERAL_ATTACK_POWER = 40 '41'=>'Одета: Increases healing done by magical spells and effects by up to %d.', // ITEM_MOD_SPELL_HEALING_DONE = 41 '42'=>'Одета: Increases damage done by magical spells and effects by up to %d.', // ITEM_MOD_SPELL_DAMAGE_DONE = 42 diff --git a/lang/lang.en.php b/lang/lang.en.php index 1b8172a..9fa29e8 100644 --- a/lang/lang.en.php +++ b/lang/lang.en.php @@ -111,7 +111,8 @@ $lang = array( 'quest_lvl'=>'Level', 'quest_reqlvl'=>'Req level', 'quest_name'=>'Quest name', -'quest_giver'=>'Quest giver', +'quest_giver'=>'Start', +'quest_giver_end'=>'End', 'quest_rewards'=>'Rewards', # Spell report @@ -326,7 +327,7 @@ $lang = array( 'Rew_item' => 'Items:', 'Rew_item_mail' => 'Items in the letter:', 'Rew_mail' => 'Will be sent,', -'Mail_item_time' => ' time of delivery: ', +'Mail_item_time' => 'time of delivery: ', 'Mail_time' => ' hours', 'item_sel_and' => ' + ', 'item_sel_or' => ' or ', diff --git a/lang/lang.ru.php b/lang/lang.ru.php index b031bf6..0908186 100644 --- a/lang/lang.ru.php +++ b/lang/lang.ru.php @@ -111,7 +111,8 @@ $lang = array( 'quest_lvl'=>'Уровень', 'quest_reqlvl'=>'Требует уровень', 'quest_name'=>'Название задания', -'quest_giver'=>'Выдаёт', +'quest_giver'=>'Начало', +'quest_giver_end'=>'Конец', 'quest_rewards'=>'Награды', # Spell report diff --git a/module/search/search_quest.php b/module/search/search_quest.php index 09d5919..8897afb 100644 --- a/module/search/search_quest.php +++ b/module/search/search_quest.php @@ -9,7 +9,7 @@ $allmode = @$_REQUEST['s']=='all'; // Создаём ссылку на страницу, игнорируем дефолтные значения $FindRefrence = "?s=q"; -$show_fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); +$show_fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); //============================================================================== // Создаём SQL запрос исходя из заданых пользователем параметров //============================================================================== diff --git a/module/show/show_faction.php b/module/show/show_faction.php index 2d32791..7455539 100644 --- a/module/show/show_faction.php +++ b/module/show/show_faction.php @@ -93,7 +93,7 @@ else // Награда за квест //******************************************************************************** $quest_list =& new QuestReportGenerator(); - $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); + $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); if ($quest_list->Init($fields, $baseLink, 'questLIST', $config['fade_limit'], 'name')) { $quest_list->rewardReputation($entry); diff --git a/module/show/show_go.php b/module/show/show_go.php index 0fe60a2..224a40a 100644 --- a/module/show/show_go.php +++ b/module/show/show_go.php @@ -367,7 +367,7 @@ else // Required for quest list //******************************************************************************** $reqForQuest =& new QuestReportGenerator(); - $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); + $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); if ($reqForQuest->Init($fields, $baseLink, 'qreqLIST', $config['fade_limit'], 'name')) { $reqForQuest->requireGO($entry); diff --git a/module/show/show_item.php b/module/show/show_item.php index 2777cc4..866d239 100644 --- a/module/show/show_item.php +++ b/module/show/show_item.php @@ -289,7 +289,7 @@ else // Quest list reward this item //******************************************************************************** $qReward =& new QuestReportGenerator(); - $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); + $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); if ($qReward->Init($fields, $baseLink, 'qrewardLIST', $config['fade_limit'], 'name')) { $qReward->rewardItem($entry); @@ -299,7 +299,7 @@ else // Required for quest (except if this item quest) //******************************************************************************** $reqForQuest =& new QuestReportGenerator(); - $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); + $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); if ($reqForQuest->Init($fields, $baseLink, 'qreqLIST', $config['fade_limit'], 'name')) { $reqForQuest->requireItem($entry, $item['startquest']); @@ -309,7 +309,7 @@ else // Give on quest take (except if this item quest) //******************************************************************************** $srcForQuest =& new QuestReportGenerator(); - $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); + $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); if ($srcForQuest->Init($fields, $baseLink, 'qgiveLIST', $config['fade_limit'], 'name')) { $srcForQuest->provideItem($entry, $item['startquest']); diff --git a/module/show/show_npc.php b/module/show/show_npc.php index 459237e..354fb56 100644 --- a/module/show/show_npc.php +++ b/module/show/show_npc.php @@ -318,7 +318,7 @@ else // Required for quest list //******************************************************************************** $reqForQuest =& new QuestReportGenerator(); - $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); + $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); if ($reqForQuest->Init($fields, $baseLink, 'qreqLIST', $config['fade_limit'], 'name')) { $reqForQuest->requireCreature($entry); diff --git a/module/show/show_quest.php b/module/show/show_quest.php index 1392db8..afa5af1 100644 --- a/module/show/show_quest.php +++ b/module/show/show_quest.php @@ -222,12 +222,12 @@ if ($quest['ReqSourceId1'] != 0 OR $quest['ReqSourceId2'] != 0 OR echo "".getQuestText($quest['Details']).""; if ($quest['CompletedText']) { - echo "$lang[quest_completed]"; + echo "$lang[quest_completed]"; echo ''.$quest['CompletedText'].''; } if ($quest['SrcItemId'] || $quest['SrcSpell']) { - echo "$lang[provided]"; + echo "$lang[provided]"; if ($quest['SrcItemId']) { $item = getItem($quest['SrcItemId'], "`entry`, `name`, `Quality`, `displayid`"); @@ -245,7 +245,7 @@ if ($quest['SrcItemId'] || $quest['SrcSpell']) echo " $spell[SpellName]"; } } -echo "$lang[quest_rewards]"; +echo "$lang[quest_rewards]"; if ($quest['RewItemId1'] OR $quest['RewItemId1'] OR $quest['RewItemId1'] OR $quest['RewItemId1']) { @@ -274,18 +274,13 @@ if ($quest['RewMailTemplateId']) { $MailTime=$quest['RewMailDelaySecs']/60/60; $ItemMail=getItemMail($quest['RewMailTemplateId']); + echo "$lang[Rew_mail] $lang[Mail_item_time]".$MailTime."$lang[Mail_time]"; if ($ItemMail) { - echo "$lang[Rew_mail] $lang[Mail_item_time]".$MailTime."$lang[Mail_time]"; echo "$lang[Rew_item_mail]"; echo " ";{show_item($ItemMail);} - echo ""; } - else - { - echo "$lang[Rew_mail] $lang[Mail_item_time]".$MailTime."$lang[Mail_time]"; echo ""; - } } if ($quest['RewSpell'] || $quest['RewSpellCast']) { diff --git a/module/show/show_spell.php b/module/show/show_spell.php index 4120a9c..f0e66e5 100644 --- a/module/show/show_spell.php +++ b/module/show/show_spell.php @@ -113,7 +113,7 @@ else // Этому спеллу обучают за выполненный квест //******************************************************************************** $quest_list =& new QuestReportGenerator(); - $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_REWARD'); + $fields = array('QUEST_REPORT_LEVEL', 'QUEST_REPORT_NAME', 'QUEST_REPORT_GIVER', 'QUEST_REPORT_GIVER_END', 'QUEST_REPORT_REWARD'); if ($quest_list->Init($fields, $baseLink, 'questLIST', $config['fade_limit'], 'name')) { $quest_list->rewardSpell($entry); diff --git a/module/show/show_zone.php b/module/show/show_zone.php index 43811ef..0cbd0a0 100644 --- a/module/show/show_zone.php +++ b/module/show/show_zone.php @@ -52,8 +52,8 @@ else echo "
"; } $pointsList = new mapPoints(); - if ($npc_id)$pointsList->addNpc($npc_id, $map); - if ($obj_id)$pointsList->addGo($obj_id, $map); + if ($npc_id) $pointsList->addNpc($npc_id, $map); + if ($obj_id) $pointsList->addGo($obj_id, $map); renderArea($gZoneToAreaImage[$zentry], $width, $pointsList->points); if ($ajaxmode==0) { @@ -62,10 +62,11 @@ else echo ""; } } - elseif ($map && !isset($_REQUEST['mark'])) + else if ($map && !isset($_REQUEST['mark'])) { - if ($ajaxmode==0) - echo "
"; + if ($ajaxmode==0) + echo "
"; + if ($npc_id || $obj_id) renderMap($map, $width, createPointsList($npc_id, $obj_id)); if ($ajaxmode==0) { -- 2.11.4.GIT