summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-19 16:27:33 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 16:30:24 +0300
commit6c3974a46c659e558b2b5f249b7b000a5b39fe25 (patch)
tree6ba5ad594cc0691821f879efff413c562f7cc552 /src/gui/widgets
parent4f77307d659c4048c20eacda1d5b13fcce8d60da (diff)
downloadmanaplus-6c3974a46c659e558b2b5f249b7b000a5b39fe25.tar.gz
manaplus-6c3974a46c659e558b2b5f249b7b000a5b39fe25.tar.bz2
manaplus-6c3974a46c659e558b2b5f249b7b000a5b39fe25.tar.xz
manaplus-6c3974a46c659e558b2b5f249b7b000a5b39fe25.zip
Rename actorspritemanager into actormanager.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp10
-rw-r--r--src/gui/widgets/tabs/setup_relations.cpp6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index f39fbc02d..d4eefe69c 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -21,7 +21,7 @@
#include "gui/widgets/avatarlistbox.h"
-#include "actorspritemanager.h"
+#include "actormanager.h"
#include "configuration.h"
#include "graphicsvertexes.h"
#include "maplayer.h"
@@ -313,7 +313,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
void AvatarListBox::mousePressed(gcn::MouseEvent &event)
{
- if (!actorSpriteManager || !player_node || !viewport
+ if (!actorManager || !player_node || !viewport
|| !getFont()->getHeight())
{
return;
@@ -339,10 +339,10 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
{
if (ava->getType() == AVATAR_PLAYER)
{
- const Being *const being = actorSpriteManager->findBeingByName(
+ const Being *const being = actorManager->findBeingByName(
ava->getName(), Being::PLAYER);
if (being)
- actorSpriteManager->heal(being);
+ actorManager->heal(being);
}
else
{
@@ -359,7 +359,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
const Avatar *const avatar = model->getAvatarAt(selected);
if (avatar)
{
- const Being *const being = actorSpriteManager
+ const Being *const being = actorManager
->findBeingByName(avatar->getName(), Being::PLAYER);
if (being)
viewport->showPopup(being);
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 01fb873d4..c837f1cf7 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -22,7 +22,7 @@
#include "gui/widgets/tabs/setup_relations.h"
-#include "actorspritemanager.h"
+#include "actormanager.h"
#include "being/localplayer.h"
@@ -358,8 +358,8 @@ void Setup_Relations::apply()
| (mDefaultTrading->isSelected() ? PlayerRelation::TRADE : 0)
| (mDefaultWhisper->isSelected() ? PlayerRelation::WHISPER : 0));
- if (actorSpriteManager)
- actorSpriteManager->updatePlayerNames();
+ if (actorManager)
+ actorManager->updatePlayerNames();
if (player_node)
player_node->setCheckNameSetting(true);