diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-01 20:20:21 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-10 20:31:51 +0100 |
| commit | 683da50e37fbbb2e3f70a4421a06dabd9bb912d8 (patch) | |
| tree | 065526585f7af480df2eae40ed0acc1595331fd4 /src/actorspritemanager.cpp | |
| parent | 8a88347e9ee6ce9f14d638cf602f3a763bc3ff01 (diff) | |
| download | mana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.gz mana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.bz2 mana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.xz mana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.zip | |
player_node -> local_player
Reviewed-by: Ablu
Diffstat (limited to 'src/actorspritemanager.cpp')
| -rw-r--r-- | src/actorspritemanager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index fedf880c..82e14de0 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -112,13 +112,13 @@ void ActorSpriteManager::setMap(Map *map) { mMap = map; - if (player_node) - player_node->setMap(map); + if (local_player) + local_player->setMap(map); } void ActorSpriteManager::setPlayer(LocalPlayer *player) { - player_node = player; + local_player = player; mActors.insert(player); } @@ -140,7 +140,7 @@ FloorItem *ActorSpriteManager::createItem(int id, int itemId, const Vector &pos) void ActorSpriteManager::destroy(ActorSprite *actor) { - if (!actor || actor == player_node) + if (!actor || actor == local_player) return; mDeleteActors.insert(actor); @@ -184,7 +184,7 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y) const int uptol = being->getHeight(); if ((being->isAlive()) && - (being != player_node) && + (being != local_player) && (being->getPixelX() - xtol <= x) && (being->getPixelX() + xtol >= x) && (being->getPixelY() - uptol <= y) && @@ -261,16 +261,16 @@ void ActorSpriteManager::logic() void ActorSpriteManager::clear() { - if (player_node) - mActors.erase(player_node); + if (local_player) + mActors.erase(local_player); for_actors delete *it; mActors.clear(); mDeleteActors.clear(); - if (player_node) - mActors.insert(player_node); + if (local_player) + mActors.insert(local_player); } Being *ActorSpriteManager::findNearestLivingBeing(int x, int y, |