diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index ca431d18c..ee9c951b4 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -535,7 +535,7 @@ void LocalPlayer::updateAttackState(bool forceUpdate) attack.attacker = guid; attack.type = Attack::MAGIC; attack.pressed = true; - attack.refid = spell; + attack.refId = spell; } else if (state == MWMechanics::DrawState_Weapon) { @@ -1185,7 +1185,7 @@ void LocalPlayer::prepareAttack(Attack::TYPE type, bool state) const string &spell = MWBase::Environment::get().getWindowManager()->getSelectedSpell(); attack.success = Misc::Rng::roll0to99() < MWMechanics::getSpellSuccessChance(spell, getPlayerPtr()); state = true; - attack.refid = spell; + attack.refId = spell; } else { diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 67017fb11..e5d3077a6 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -452,7 +452,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) } MWMechanics::CreatureStats &stats = pl->getPtr().getClass().getNpcStats(pl->getPtr()); - stats.getSpells().setSelectedSpell(pl->attack.refid); + stats.getSpells().setSelectedSpell(pl->attack.refId); MWWorld::Ptr victim; if (pl->attack.target == getLocalPlayer()->guid) @@ -492,7 +492,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) } else { - LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "SpellId: %s", pl->attack.refid.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "SpellId: %s", pl->attack.refId.c_str()); LOG_APPEND(Log::LOG_VERBOSE, " - success: %d", pl->attack.success); } } diff --git a/components/openmw-mp/Base/BasePlayer.hpp b/components/openmw-mp/Base/BasePlayer.hpp index 06dea202c..ee524d39c 100644 --- a/components/openmw-mp/Base/BasePlayer.hpp +++ b/components/openmw-mp/Base/BasePlayer.hpp @@ -27,7 +27,7 @@ namespace mwmp MAGIC, THROWABLE }; - std::string refid; // id of spell (e.g. "fireball") + std::string refId; // id of spell (e.g. "fireball") char success; char block; float damage; diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp index 3db761a20..f8e45e540 100644 --- a/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp +++ b/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp @@ -18,7 +18,7 @@ void PacketPlayerAttack::Packet(RakNet::BitStream *bs, bool send) RW(player->attack.attacker, send); RW(player->attack.target, send); - RW(player->attack.refid, send); + RW(player->attack.refId, send); RW(player->attack.type, send); RW(player->attack.success, send); RW(player->attack.damage, send);