diff --git a/server/bin/exported/android_attack.xml b/server/bin/exported/android_attack.xml deleted file mode 100644 index 2ca90e53..00000000 --- a/server/bin/exported/android_attack.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/android_attack_new.xml b/server/bin/exported/android_attack_new.xml deleted file mode 100644 index ef0c768b..00000000 --- a/server/bin/exported/android_attack_new.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/android_chase_to_kill.xml b/server/bin/exported/android_chase_to_kill.xml deleted file mode 100644 index 57c8718f..00000000 --- a/server/bin/exported/android_chase_to_kill.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/android_craze_mode.xml b/server/bin/exported/android_craze_mode.xml deleted file mode 100644 index f6146a48..00000000 --- a/server/bin/exported/android_craze_mode.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/android_pvp.xml b/server/bin/exported/android_pvp.xml deleted file mode 100644 index 635923ec..00000000 --- a/server/bin/exported/android_pvp.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/android_run_gas.xml b/server/bin/exported/android_run_gas.xml deleted file mode 100644 index df154643..00000000 --- a/server/bin/exported/android_run_gas.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/boss_40101.xml b/server/bin/exported/boss_40101.xml deleted file mode 100644 index e20c67d4..00000000 --- a/server/bin/exported/boss_40101.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/boss_40101_attack.xml b/server/bin/exported/boss_40101_attack.xml deleted file mode 100644 index d92ebc28..00000000 --- a/server/bin/exported/boss_40101_attack.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/boss_40101_chase_to_kill.xml b/server/bin/exported/boss_40101_chase_to_kill.xml deleted file mode 100644 index 291ee1d7..00000000 --- a/server/bin/exported/boss_40101_chase_to_kill.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/boss_40101_counter_attack.xml b/server/bin/exported/boss_40101_counter_attack.xml deleted file mode 100644 index caed8e9e..00000000 --- a/server/bin/exported/boss_40101_counter_attack.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/boss_40101_run_gas.xml b/server/bin/exported/boss_40101_run_gas.xml deleted file mode 100644 index 8b3491c4..00000000 --- a/server/bin/exported/boss_40101_run_gas.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/hero_9011.xml b/server/bin/exported/hero_9011.xml deleted file mode 100644 index 861f5b04..00000000 --- a/server/bin/exported/hero_9011.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/hero_9012.xml b/server/bin/exported/hero_9012.xml deleted file mode 100644 index 9e3a34db..00000000 --- a/server/bin/exported/hero_9012.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/hero_help_attack.xml b/server/bin/exported/hero_help_attack.xml deleted file mode 100644 index f4271f5b..00000000 --- a/server/bin/exported/hero_help_attack.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/hero_pve_01.xml b/server/bin/exported/hero_pve_01.xml deleted file mode 100644 index 58e0dab8..00000000 --- a/server/bin/exported/hero_pve_01.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/hero_pve_02.xml b/server/bin/exported/hero_pve_02.xml deleted file mode 100644 index d18377bd..00000000 --- a/server/bin/exported/hero_pve_02.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/server/bin/exported/meta/game2006.meta.xml b/server/bin/exported/meta/game2006.meta.xml deleted file mode 100644 index a11f7af2..00000000 --- a/server/bin/exported/meta/game2006.meta.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index f49c53e6..27a1e736 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -28,9 +28,12 @@ Android::Android():Human() if (!agent_) { abort(); } +#ifdef NEW_BT +#else agent_->SetOwner(this); f8::BtMgr::Instance()->BtLoad(agent_, "android_pvp"); f8::BtMgr::Instance()->BtSetCurrent(agent_, "android_pvp"); +#endif } Android::~Android() @@ -78,6 +81,11 @@ void Android::Initialize() AddSkill(skill_id); } } +#ifdef NEW_BT + agent_->SetOwner(this); + f8::BtMgr::Instance()->BtLoad(agent_, "android_pvp"); + f8::BtMgr::Instance()->BtSetCurrent(agent_, "android_pvp"); +#endif } void Android::Update(int delta_time)