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

[General] Rename mwmp::Attack's refid into refId for consistency

Browse source
This commit is contained in:
David Cernat 2017-04-17 09:35:18 +03:00
parent b09e6644a9
commit 9f226253d4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -535,7 +535,7 @@ void LocalPlayer::updateAttackState(bool forceUpdate)
attack.attacker = guid; attack.attacker = guid;
attack.type = Attack::MAGIC; attack.type = Attack::MAGIC;
attack.pressed = true; attack.pressed = true;
attack.refid = spell; attack.refId = spell;
} }
else if (state == MWMechanics::DrawState_Weapon) 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(); const string &spell = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
attack.success = Misc::Rng::roll0to99() < MWMechanics::getSpellSuccessChance(spell, getPlayerPtr()); attack.success = Misc::Rng::roll0to99() < MWMechanics::getSpellSuccessChance(spell, getPlayerPtr());
state = true; state = true;
attack.refid = spell; attack.refId = spell;
} }
else else
{ {

4
apps/openmw/mwmp/Networking.cpp
View file

@ -452,7 +452,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
} }
MWMechanics::CreatureStats &stats = pl->getPtr().getClass().getNpcStats(pl->getPtr()); MWMechanics::CreatureStats &stats = pl->getPtr().getClass().getNpcStats(pl->getPtr());
stats.getSpells().setSelectedSpell(pl->attack.refid); stats.getSpells().setSelectedSpell(pl->attack.refId);
MWWorld::Ptr victim; MWWorld::Ptr victim;
if (pl->attack.target == getLocalPlayer()->guid) if (pl->attack.target == getLocalPlayer()->guid)
@ -492,7 +492,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
} }
else 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); LOG_APPEND(Log::LOG_VERBOSE, " - success: %d", pl->attack.success);
} }
} }

2
components/openmw-mp/Base/BasePlayer.hpp
View file

@ -27,7 +27,7 @@ namespace mwmp
MAGIC, MAGIC,
THROWABLE THROWABLE
}; };
std::string refid; // id of spell (e.g. "fireball") std::string refId; // id of spell (e.g. "fireball")
char success; char success;
char block; char block;
float damage; float damage;

2
components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
View file

@ -18,7 +18,7 @@ void PacketPlayerAttack::Packet(RakNet::BitStream *bs, bool send)
RW(player->attack.attacker, send); RW(player->attack.attacker, send);
RW(player->attack.target, send); RW(player->attack.target, send);
RW(player->attack.refid, send); RW(player->attack.refId, send);
RW(player->attack.type, send); RW(player->attack.type, send);
RW(player->attack.success, send); RW(player->attack.success, send);
RW(player->attack.damage, send); RW(player->attack.damage, send);