Skip to content

Commit

Permalink
fix compiler errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattyx14
mattyx14 committed Jun 18, 2016
1 parent 1ae94c1 commit 665d4aa
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion path_8_6/src/container.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion path_8_6/src/creature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions path_8_6/src/house.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions path_8_6/src/player.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion path_8_7/src/container.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion path_8_7/src/creature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions path_8_7/src/house.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions path_8_7/src/player.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 665d4aa

Please sign in to comment.