krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Client] Update LocalActor to C++11

Browse source
This commit is contained in:
Koncord 2017-06-27 21:11:15 +08:00
parent 689050e1d0
commit aa12b35d03
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
apps/openmw/mwmp/LocalActor.cpp
View file

@ -60,7 +60,7 @@ void LocalActor::update(bool forceUpdate)
void LocalActor::updateCell() void LocalActor::updateCell()
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_ACTOR_CELL_CHANGE about %s-%i-%i to server", LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_ACTOR_CELL_CHANGE about %s-%i-%i to server",
refId.c_str(), refNumIndex, mpNum); refId.c_str(), refNumIndex, mpNum);
LOG_APPEND(Log::LOG_INFO, "- Moved from %s to %s", cell.getDescription().c_str(), ptr.getCell()->getCell()->getDescription().c_str()); LOG_APPEND(Log::LOG_INFO, "- Moved from %s to %s", cell.getDescription().c_str(), ptr.getCell()->getCell()->getDescription().c_str());
@ -78,9 +78,7 @@ void LocalActor::updatePosition(bool forceUpdate)
if (forceUpdate || posIsChanging || posWasChanged) if (forceUpdate || posIsChanging || posWasChanged)
{ {
posWasChanged = posIsChanging; posWasChanged = posIsChanging;
position = ptr.getRefData().getPosition(); position = ptr.getRefData().getPosition();
mwmp::Main::get().getNetworking()->getActorList()->addPositionActor(*this); mwmp::Main::get().getNetworking()->getActorList()->addPositionActor(*this);
} }
} }
@ -160,17 +158,14 @@ void LocalActor::updateStatsDynamic(bool forceUpdate)
// Update stats when they become 0 or they have changed enough // Update stats when they become 0 or they have changed enough
// //
// Also check for an oldHealth of 0 changing to something else for resurrected NPCs // Also check for an oldHealth of 0 changing to something else for resurrected NPCs
bool shouldUpdateHealth = oldHealth != health && (health.getCurrent() == 0 || oldHealth.getCurrent() == 0 || abs(oldHealth.getCurrent() - health.getCurrent()) > 5);
bool shouldUpdateMagicka = false;
bool shouldUpdateFatigue = false;
if (!shouldUpdateHealth) auto needUpdate = [](MWMechanics::DynamicStat<float> &oldVal, MWMechanics::DynamicStat<float> &newVal, int limit) {
shouldUpdateMagicka = oldMagicka != magicka && (magicka.getCurrent() == 0 || abs(oldMagicka.getCurrent() - magicka.getCurrent()) > 10); return oldVal != newVal && (newVal.getCurrent() == 0 || oldVal.getCurrent() == 0
|| abs(oldVal.getCurrent() - newVal.getCurrent()) > limit);
};
if (!shouldUpdateMagicka) if (forceUpdate || needUpdate(oldHealth, health, 5) || needUpdate(oldMagicka, magicka, 10) ||
shouldUpdateFatigue = oldFatigue != fatigue && (fatigue.getCurrent() == 0 || abs(oldFatigue.getCurrent() - fatigue.getCurrent()) > 10); needUpdate(oldFatigue, fatigue, 10))
if (forceUpdate || shouldUpdateHealth || shouldUpdateMagicka || shouldUpdateFatigue)
{ {
oldHealth = health; oldHealth = health;
oldMagicka = magicka; oldMagicka = magicka;
@ -198,28 +193,32 @@ void LocalActor::updateEquipment(bool forceUpdate)
for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++) for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
{ {
MWWorld::ContainerStoreIterator it = invStore.getSlot(slot); MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
if (it != invStore.end() && !::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), equipedItems[slot].refId)) auto &item = equipedItems[slot];
auto &cellRef = it->getCellRef();
if (it != invStore.end() && !::Misc::StringUtils::ciEqual(cellRef.getRefId(), item.refId))
{ {
equipmentChanged = true; equipmentChanged = true;
equipedItems[slot].refId = it->getCellRef().getRefId(); item.refId = cellRef.getRefId();
equipedItems[slot].charge = it->getCellRef().getCharge(); item.charge = cellRef.getCharge();
if (slot == MWWorld::InventoryStore::Slot_CarriedRight) if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
{ {
MWMechanics::WeaponType weaptype; MWMechanics::WeaponType weaptype;
MWMechanics::getActiveWeapon(ptr.getClass().getCreatureStats(ptr), ptr.getClass().getInventoryStore(ptr), &weaptype); auto &_class = ptr.getClass();
MWMechanics::getActiveWeapon(_class.getCreatureStats(ptr), _class.getInventoryStore(ptr), &weaptype);
if (weaptype != MWMechanics::WeapType_Thrown) if (weaptype != MWMechanics::WeapType_Thrown)
equipedItems[slot].count = 1; item.count = 1;
} }
else else
equipedItems[slot].count = invStore.count(it->getCellRef().getRefId()); item.count = invStore.count(cellRef.getRefId());
} }
else if (it == invStore.end() && !equipedItems[slot].refId.empty()) else if (it == invStore.end() && !item.refId.empty())
{ {
equipmentChanged = true; equipmentChanged = true;
equipedItems[slot].refId = ""; item.refId = "";
equipedItems[slot].count = 0; item.count = 0;
equipedItems[slot].charge = 0; item.charge = 0;
} }
} }