diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-21 14:44:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-21 14:44:03 +0300 |
| commit | ba07ca55476c488504a8d8bf9318f15aab687f12 (patch) | |
| tree | 3907bcceabda445a9fa8498ff92af09df2c11e08 /src/actormanager.cpp | |
| parent | 46d1266f00dfde5d04d7980daea4bab02e77cb69 (diff) | |
| download | manaplus-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.gz manaplus-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.bz2 manaplus-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.xz manaplus-ba07ca55476c488504a8d8bf9318f15aab687f12.zip | |
Fix mercenary removing.
Diffstat (limited to 'src/actormanager.cpp')
| -rw-r--r-- | src/actormanager.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 5bb9c64aa..0f30fa215 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -813,20 +813,6 @@ void ActorManager::logic() if (beingEquipmentWindow) beingEquipmentWindow->resetBeing(being); } -/* - else if (localPlayer && type == ActorType::Mercenary) - { - if (actor->getId() == localPlayer->getMercenary()) - { - localPlayer->setMercenary(0); - if (skillDialog) - { - skillDialog->hideSkills(SkillOwner::Mercenary); - skillDialog->updateModels(); - } - } - } -*/ if (localPlayer) { if (localPlayer->getTarget() == actor) |