From 665d4aa98f1b57349b22dc7d264a861d922592c9 Mon Sep 17 00:00:00 2001 From: mattyx14 Date: Sat, 18 Jun 2016 16:20:20 -0500 Subject: [PATCH] fix compiler errors --- path_8_6/src/container.cpp | 2 +- path_8_6/src/creature.cpp | 2 +- path_8_6/src/house.cpp | 4 ++-- path_8_6/src/player.cpp | 8 ++++---- path_8_7/src/container.cpp | 2 +- path_8_7/src/creature.cpp | 2 +- path_8_7/src/house.cpp | 4 ++-- path_8_7/src/player.cpp | 8 ++++---- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/path_8_6/src/container.cpp b/path_8_6/src/container.cpp index d06737bbc..8a1c0b9fa 100644 --- a/path_8_6/src/container.cpp +++ b/path_8_6/src/container.cpp @@ -28,7 +28,7 @@ extern Game g_game; Container::Container(uint16_t type) : Container(type, items[type].maxItems) {} -Container::Container(uint16_t type, uint16_t size, bool unlocked /*= true*/, bool pagination /*= false*/) : +Container::Container(uint16_t type, uint16_t size, bool unlocked /*= true*/) : Item(type), maxSize(size), totalWeight(0), diff --git a/path_8_6/src/creature.cpp b/path_8_6/src/creature.cpp index 16c6060a7..6d515953b 100644 --- a/path_8_6/src/creature.cpp +++ b/path_8_6/src/creature.cpp @@ -1162,7 +1162,7 @@ void Creature::onGainExperience(uint64_t gainExp, Creature* target) std::ostringstream strExp; strExp << gainExp; - g_game.addAnimatedText(strExp.str(), _position, TEXTCOLOR_WHITE_EXP); + g_game.addAnimatedText(strExp.str(), position, TEXTCOLOR_WHITE_EXP); } void Creature::addSummon(Creature* creature) diff --git a/path_8_6/src/house.cpp b/path_8_6/src/house.cpp index ab579d7b4..0282336bb 100644 --- a/path_8_6/src/house.cpp +++ b/path_8_6/src/house.cpp @@ -31,7 +31,7 @@ extern ConfigManager g_config; extern Game g_game; House::House(uint32_t houseId) : - transfer_container(ITEM_LOCKER1), + transfer_container(ITEM_LOCKER), transferItem(nullptr), paidUntil(0), id(houseId), @@ -254,7 +254,7 @@ bool House::transferToDepot(Player* player) const } } - DepotLocker* depotLocker = player->getDepotLocker(townid); + DepotLocker* depotLocker = player->getDepotLocker(townId); if (depotLocker) { for (Item* item : moveItemList) { g_game.internalMoveItem(item->getParent(), depotLocker, INDEX_WHEREEVER, item, item->getItemCount(), nullptr, FLAG_NOLIMIT); diff --git a/path_8_6/src/player.cpp b/path_8_6/src/player.cpp index 8f647b5d1..24701bb9a 100644 --- a/path_8_6/src/player.cpp +++ b/path_8_6/src/player.cpp @@ -1645,10 +1645,10 @@ void Player::addExperience(Creature* source, uint64_t exp, bool sendText/* = fal std::ostringstream strExp; strExp << exp; - g_game.addAnimatedText(strExp.str(), _position, TEXTCOLOR_WHITE_EXP); + g_game.addAnimatedText(strExp.str(), position, TEXTCOLOR_WHITE_EXP); SpectatorVec list; - g_game.map.getSpectators(list, _position, false, true); + g_game.map.getSpectators(list, position, false, true); list.erase(this); if (!list.empty()) { message.type = MESSAGE_STATUS_DEFAULT; @@ -1729,10 +1729,10 @@ void Player::removeExperience(uint64_t exp, bool sendText/* = false*/) std::ostringstream strExp; strExp << lostExp; - g_game.addAnimatedText(strExp.str(), _position, TEXTCOLOR_RED); + g_game.addAnimatedText(strExp.str(), position, TEXTCOLOR_RED); SpectatorVec list; - g_game.map.getSpectators(list, _position, false, true); + g_game.map.getSpectators(list, position, false, true); list.erase(this); if (!list.empty()) { message.type = MESSAGE_STATUS_DEFAULT; diff --git a/path_8_7/src/container.cpp b/path_8_7/src/container.cpp index d06737bbc..8a1c0b9fa 100644 --- a/path_8_7/src/container.cpp +++ b/path_8_7/src/container.cpp @@ -28,7 +28,7 @@ extern Game g_game; Container::Container(uint16_t type) : Container(type, items[type].maxItems) {} -Container::Container(uint16_t type, uint16_t size, bool unlocked /*= true*/, bool pagination /*= false*/) : +Container::Container(uint16_t type, uint16_t size, bool unlocked /*= true*/) : Item(type), maxSize(size), totalWeight(0), diff --git a/path_8_7/src/creature.cpp b/path_8_7/src/creature.cpp index 16c6060a7..6d515953b 100644 --- a/path_8_7/src/creature.cpp +++ b/path_8_7/src/creature.cpp @@ -1162,7 +1162,7 @@ void Creature::onGainExperience(uint64_t gainExp, Creature* target) std::ostringstream strExp; strExp << gainExp; - g_game.addAnimatedText(strExp.str(), _position, TEXTCOLOR_WHITE_EXP); + g_game.addAnimatedText(strExp.str(), position, TEXTCOLOR_WHITE_EXP); } void Creature::addSummon(Creature* creature) diff --git a/path_8_7/src/house.cpp b/path_8_7/src/house.cpp index ab579d7b4..0282336bb 100644 --- a/path_8_7/src/house.cpp +++ b/path_8_7/src/house.cpp @@ -31,7 +31,7 @@ extern ConfigManager g_config; extern Game g_game; House::House(uint32_t houseId) : - transfer_container(ITEM_LOCKER1), + transfer_container(ITEM_LOCKER), transferItem(nullptr), paidUntil(0), id(houseId), @@ -254,7 +254,7 @@ bool House::transferToDepot(Player* player) const } } - DepotLocker* depotLocker = player->getDepotLocker(townid); + DepotLocker* depotLocker = player->getDepotLocker(townId); if (depotLocker) { for (Item* item : moveItemList) { g_game.internalMoveItem(item->getParent(), depotLocker, INDEX_WHEREEVER, item, item->getItemCount(), nullptr, FLAG_NOLIMIT); diff --git a/path_8_7/src/player.cpp b/path_8_7/src/player.cpp index 894286aa2..4c2c37ed8 100644 --- a/path_8_7/src/player.cpp +++ b/path_8_7/src/player.cpp @@ -1661,10 +1661,10 @@ void Player::addExperience(Creature* source, uint64_t exp, bool sendText/* = fal std::ostringstream strExp; strExp << exp; - g_game.addAnimatedText(strExp.str(), _position, TEXTCOLOR_WHITE_EXP); + g_game.addAnimatedText(strExp.str(), position, TEXTCOLOR_WHITE_EXP); SpectatorVec list; - g_game.map.getSpectators(list, _position, false, true); + g_game.map.getSpectators(list, position, false, true); list.erase(this); if (!list.empty()) { message.type = MESSAGE_STATUS_DEFAULT; @@ -1745,10 +1745,10 @@ void Player::removeExperience(uint64_t exp, bool sendText/* = false*/) std::ostringstream strExp; strExp << lostExp; - g_game.addAnimatedText(strExp.str(), _position, TEXTCOLOR_RED); + g_game.addAnimatedText(strExp.str(), position, TEXTCOLOR_RED); SpectatorVec list; - g_game.map.getSpectators(list, _position, false, true); + g_game.map.getSpectators(list, position, false, true); list.erase(this); if (!list.empty()) { message.type = MESSAGE_STATUS_DEFAULT;