1
This commit is contained in:
parent
c45e63fb70
commit
68b2cd7df5
@ -833,7 +833,8 @@ Skill* Creature::GetSkill(int skill_id)
|
||||
break;
|
||||
case 1:
|
||||
{
|
||||
return GetMainSkill();
|
||||
return nullptr;
|
||||
//return GetMainSkill();
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
@ -40,7 +40,10 @@ Hero::Hero():Creature()
|
||||
if (!agent_) {
|
||||
abort();
|
||||
}
|
||||
#ifdef NEW_BT
|
||||
#else
|
||||
agent_->SetOwner(this);
|
||||
#endif
|
||||
}
|
||||
|
||||
Hero::~Hero()
|
||||
@ -385,8 +388,14 @@ void Hero::InitAI()
|
||||
{
|
||||
if (room->IsNewBieRoom()) {
|
||||
} else {
|
||||
#ifdef NEW_BT
|
||||
agent_->SetOwner(this);
|
||||
f8::BtMgr::Instance()->BtLoad(agent_, meta->new_bt().c_str());
|
||||
f8::BtMgr::Instance()->BtSetCurrent(agent_, meta->new_bt().c_str());
|
||||
#else
|
||||
f8::BtMgr::Instance()->BtLoad(agent_, meta->bt().c_str());
|
||||
f8::BtMgr::Instance()->BtSetCurrent(agent_, meta->bt().c_str());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -788,52 +788,52 @@ std::string HeroAgent::GetSkillBtFile()
|
||||
switch (GetHeroId()) {
|
||||
case 30100:
|
||||
{
|
||||
return "30100_hill";
|
||||
return "skill/30100_hill";
|
||||
}
|
||||
break;
|
||||
case 30200:
|
||||
{
|
||||
return "30200_yamada";
|
||||
return "skill/30200_yamada";
|
||||
}
|
||||
break;
|
||||
case 30300:
|
||||
{
|
||||
return "30300_aoi";
|
||||
return "skill/30300_aoi";
|
||||
}
|
||||
break;
|
||||
case 30400:
|
||||
{
|
||||
return "30400_astral";
|
||||
return "skill/30400_astral";
|
||||
}
|
||||
break;
|
||||
case 30500:
|
||||
{
|
||||
return "30500_miffy";
|
||||
return "skill/30500_miffy";
|
||||
}
|
||||
break;
|
||||
case 30600:
|
||||
{
|
||||
return "30600_canoe";
|
||||
return "skill/30600_canoe";
|
||||
}
|
||||
break;
|
||||
case 30700:
|
||||
{
|
||||
return "30700_mariana";
|
||||
return "skill/30700_mariana";
|
||||
}
|
||||
break;
|
||||
case 30800:
|
||||
{
|
||||
return "30800_dragonscale";
|
||||
return "skill/30800_dragonscale";
|
||||
}
|
||||
break;
|
||||
case 30900:
|
||||
{
|
||||
return "30900_lazar";
|
||||
return "skill/30900_lazar";
|
||||
}
|
||||
break;
|
||||
case 31000:
|
||||
{
|
||||
return "31000_kurosawa";
|
||||
return "skill/31000_kurosawa";
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
Loading…
x
Reference in New Issue
Block a user