gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stackpos bug again

This commit is contained in:
Eduardo Bart 2012-08-14 20:13:53 -03:00
parent e244e1975d
commit 3c26555255
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/otclient/map.cpp
View File

@ -305,6 +305,7 @@ void Map::setCentralPosition(const Position& centralPosition)
localPlayer->onDisappear(); localPlayer->onDisappear();
localPlayer->setPosition(pos); localPlayer->setPosition(pos);
localPlayer->onAppear(); localPlayer->onAppear();
g_logger.debug("forced player position update");
} }
}); });

11
src/otclient/protocolgameparse.cpp
View File

@ -497,7 +497,8 @@ void ProtocolGame::parseTileRemoveThing(const InputMessagePtr& msg)
return; return;
} }
g_map.removeThing(thing); if(!g_map.removeThing(thing))
g_logger.traceError("unable to remove thing");
} }
void ProtocolGame::parseCreatureMove(const InputMessagePtr& msg) void ProtocolGame::parseCreatureMove(const InputMessagePtr& msg)
@ -510,7 +511,11 @@ void ProtocolGame::parseCreatureMove(const InputMessagePtr& msg)
return; return;
} }
g_map.removeThing(thing); if(!g_map.removeThing(thing)) {
g_logger.traceError("unable to remove creature");
return;
}
g_map.addThing(thing, newPos, -1); g_map.addThing(thing, newPos, -1);
} }
@ -1399,7 +1404,7 @@ int ProtocolGame::setTileDescription(const InputMessagePtr& msg, Position positi
g_logger.traceError(stdext::format("too many things, pos=%s, stackpos=%d", stdext::to_string(position), stackPos)); g_logger.traceError(stdext::format("too many things, pos=%s, stackpos=%d", stdext::to_string(position), stackPos));
ThingPtr thing = getThing(msg); ThingPtr thing = getThing(msg);
g_map.addThing(thing, position, -2); g_map.addThing(thing, position, stackPos);
} }
return 0; return 0;

15
src/otclient/tile.cpp
View File

@ -171,14 +171,17 @@ void Tile::addThing(const ThingPtr& thing, int stackPos)
// -1 or 255 => auto detect position // -1 or 255 => auto detect position
// -2 => append // -2 => append
bool append = (stackPos == -2 || priority <= 3); bool append;
if(stackPos == -2)
append = true;
else {
append = (priority <= 3);
// newer protocols does not store creatures in reverse order // newer protocols does not store creatures in reverse order
if(g_game.getClientVersion() >= 854 && priority == 4) if(g_game.getClientVersion() >= 854 && priority == 4)
append = !append; append = !append;
}
if(g_game.getClientVersion() < 900 && priority == 4 && stackPos == -2)
append = !append;
for(stackPos = 0; stackPos < (int)m_things.size(); ++stackPos) { for(stackPos = 0; stackPos < (int)m_things.size(); ++stackPos) {
int otherPriority = m_things[stackPos]->getStackPriority(); int otherPriority = m_things[stackPos]->getStackPriority();