diff options
| -rw-r--r-- | src/animatedsprite.cpp | 1 | ||||
| -rw-r--r-- | src/being.cpp | 7 | ||||
| -rw-r--r-- | src/localplayer.cpp | 12 | ||||
| -rw-r--r-- | src/resources/spritedef.h | 1 |
4 files changed, 0 insertions, 21 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 4143cb47a..5277ddf33 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -53,7 +53,6 @@ AnimatedSprite::AnimatedSprite(SpriteDef *sprite): mSprite->incRef(); // Play the stand animation by default - //+++ need get num? play(SpriteAction::STAND); } diff --git a/src/being.cpp b/src/being.cpp index 3ed7ba587..736d64f1a 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -904,9 +904,6 @@ void Being::setGuild(Guild *guild) if (old) old->removeMember(mName); -// if (guild) -// guild->addMember(mId, mName); - updateColors(); if (this == player_node && socialWindow) @@ -1041,7 +1038,6 @@ void Being::setAction(Action action, int attackType A_UNUSED) if (currentAction != SpriteAction::INVALID) { - //set mNumber play(currentAction); mAction = action; } @@ -2141,7 +2137,6 @@ void Being::recalcSpritesOrder() std::vector<int> slotRemap; std::map<int, int> itemSlotRemap; -// logger->log("preparation start"); std::vector<int>::iterator it; int oldHide[20]; int dir = mSpriteDirection; @@ -2495,7 +2490,6 @@ void Being::saveComment(const std::string &name, return; } dir += stringToHexPath(name); -// logger->log("save to: %s", dir.c_str()); ResourceManager *resman = ResourceManager::getInstance(); resman->saveTextFile(dir, "comment.txt", name + "\n" + comment); } @@ -2520,7 +2514,6 @@ void Being::setEmote(Uint8 emotion, int emote_time) updateName(); addToCache(); } -// logger->log("flags: %d", emotion - FLAG_SPECIAL); } else { diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 51f1f244e..cbf75a5f9 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -190,7 +190,6 @@ LocalPlayer::LocalPlayer(int id, int subtype): PlayerInfo::setStatMod(WALK_SPEED, 0); loadHomes(); -// initTargetCursor(); config.addListener("showownname", this); config.addListener("targetDeadPlayers", this); @@ -278,16 +277,12 @@ void LocalPlayer::logic() { if (mMessageTime == 0) { - //const Vector &pos = getPosition(); - MessagePair info = mMessages.front(); if (particleEngine) { particleEngine->addTextRiseFadeOutEffect( info.first, - /*(int) pos.x, - (int) pos.y - 48,*/ getPixelX(), getPixelY() - 48, &userPalette->getColor(info.second), @@ -818,8 +813,6 @@ void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0) if (Net::getNetworkType() != ServerInfo::MANASERV) #endif { -// updatePos(); - if (Party::getParty(1)) { PartyMember *pm = Party::getParty(1)->getMember(getName()); @@ -973,7 +966,6 @@ bool LocalPlayer::pickUp(FloorItem *item) mPickUpTarget = item; mPickUpTarget->addActorSpriteListener(this); -// stopAttack(); } } return true; @@ -3042,10 +3034,7 @@ bool LocalPlayer::pickUpItems(int pickUpType) } item = actorSpriteManager->findItem(x, y); if (item) - { status = pickUp(item); -// status = true; - } break; case 2: switch (mDirection) @@ -3641,7 +3630,6 @@ void LocalPlayer::updateCoords() tmpLayer->clean(); tmpLayer->addRoad(mNavigatePath); } -// navigateTo(mNavigateX, mNavigateY); } } } diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 642962c0b..9b60ae2ff 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -183,7 +183,6 @@ class SpriteDef : public Resource typedef std::map<std::string, ImageSet*> ImageSets; typedef ImageSets::iterator ImageSetIterator; -// typedef std::map<std::string, std::map<unsigned, Action*>*> Actions; typedef std::map<unsigned, std::map<std::string, Action*>*> Actions; ImageSets mImageSets; |