evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Account for latency predicting item drop pickup

Browse Source
This commit is contained in:
Kae 2023-08-18 21:48:09 +10:00
parent b51e174bdc
commit cd36a269fd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/game/StarItemDrop.cpp
View File

@ -300,10 +300,10 @@ bool ItemDrop::canTake() const {
return m_mode.get() == Mode::Available && m_owningEntity.get() == NullEntityId && !m_item->empty(); return m_mode.get() == Mode::Available && m_owningEntity.get() == NullEntityId && !m_item->empty();
} }
ItemPtr ItemDrop::takeBy(EntityId entityId) { ItemPtr ItemDrop::takeBy(EntityId entityId, float timeOffset) {
if (canTake()) { if (canTake()) {
m_owningEntity.set(entityId); m_owningEntity.set(entityId);
m_dropAge.setElapsedTime(0.0); m_dropAge.setElapsedTime(timeOffset);
m_mode.set(Mode::Taken); m_mode.set(Mode::Taken);
setPersistent(false); setPersistent(false);

2
source/game/StarItemDrop.hpp
View File

@ -70,7 +70,7 @@ public:
// Mark this drop as taken by the given entity. The drop will animate // Mark this drop as taken by the given entity. The drop will animate
// towards them for a while and then disappear. // towards them for a while and then disappear.
ItemPtr takeBy(EntityId entityId); ItemPtr takeBy(EntityId entityId, float timeOffset = 0.0f);
// Mark this drop as taken, but do not animate it towards a player simply // Mark this drop as taken, but do not animate it towards a player simply
// disappear next step. // disappear next step.

2
source/game/StarWorldClient.cpp
View File

@ -1126,7 +1126,7 @@ void WorldClient::update(float dt) {
if (itemDrop->canTake() && !m_requestedDrops.contains(itemDrop->entityId()) && distSquared < square(DropDist)) { if (itemDrop->canTake() && !m_requestedDrops.contains(itemDrop->entityId()) && distSquared < square(DropDist)) {
m_requestedDrops.add(itemDrop->entityId()); m_requestedDrops.add(itemDrop->entityId());
if (m_mainPlayer->itemsCanHold(itemDrop->item()) != 0) { if (m_mainPlayer->itemsCanHold(itemDrop->item()) != 0) {
itemDrop->takeBy(m_mainPlayer->entityId()); itemDrop->takeBy(m_mainPlayer->entityId(), (float)m_latency / 1000);
m_outgoingPackets.append(make_shared<RequestDropPacket>(itemDrop->entityId())); m_outgoingPackets.append(make_shared<RequestDropPacket>(itemDrop->entityId()));
} }
} }