diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-13 01:04:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-13 01:04:05 +0300 |
| commit | ea0b61e18f36f28806940b00a2cddaef912c3340 (patch) | |
| tree | 616205f44832d4ced4fc0b50b650eedb0fbf435c /src/gui/windows/socialwindow.cpp | |
| parent | 814e88e5ca69bc54837be27429dbf42dd41f7ac6 (diff) | |
| download | mv-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.gz mv-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.bz2 mv-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.xz mv-ea0b61e18f36f28806940b00a2cddaef912c3340.zip | |
Move actor type into separate file.
Diffstat (limited to 'src/gui/windows/socialwindow.cpp')
| -rw-r--r-- | src/gui/windows/socialwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index dbba86562..0ff1d8866 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -564,7 +564,7 @@ public: } } const Being *const being = actorManager->findBeingByName( - name, Being::PLAYER); + name, ActorType::PLAYER); if (being) { avatar->setDamageHp(being->getDamageTaken()); @@ -585,7 +585,7 @@ public: return; avatar->setDamageHp(0); Being *const being = actorManager->findBeingByName( - name, Being::PLAYER); + name, ActorType::PLAYER); if (being) being->setDamageTaken(0); @@ -1157,7 +1157,7 @@ public: FOR_EACHP (StringVectCIter, it, players) { Avatar *const ava = new Avatar(*it); - if (actorManager->findBeingByName(*it, Being::PLAYER) + if (actorManager->findBeingByName(*it, ActorType::PLAYER) || players2.find(*it) != players2.end()) { ava->setOnline(true); |