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

Send ID_SCRIPT_MEMBER_SHORT from MWScript::InterpreterContext

Browse source
This commit is contained in:
David Cernat 2016-10-27 02:18:27 +03:00
parent d5fca115f7
commit fff6833950
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -933,13 +933,12 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
ptrFound.getCellRef().getRefId().c_str(),
ptrFound.getCellRef().getRefNum());
ptrFound.getRefData().getLocals().mShorts.at(event->index) = event->shortVal;
std::string scriptId = ptrFound.getClass().getScript(ptrFound);
ptrFound.getRefData().setLocals(
*MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find(scriptId));
ptrFound.getRefData().getLocals().mShorts[event->index] = event->shortVal;;
ptrFound.getRefData().getLocals().mShorts.at(event->index) = event->shortVal;;
}
break;

20
apps/openmw/mwscript/interpretercontext.cpp
View file

@ -603,7 +603,25 @@ namespace MWScript
Locals& locals = getMemberLocals (scriptId, global);
locals.mShorts[findLocalVariableIndex (scriptId, name, 's')] = value;
// Added by tes3mp so it can be reused by it
int index = findLocalVariableIndex(scriptId, name, 's');
locals.mShorts[index] = value;
// Added by tes3mp
if (sendPackets && !global)
{
mwmp::WorldEvent *event = mwmp::Main::get().getNetworking()->createWorldEvent();
event->cellRef.mRefID = id;
event->varName = name;
event->shortVal = value;
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_SCRIPT_MEMBER_SHORT)->Send(event);
printf("Sending ID_SCRIPT_MEMBER_SHORT\n- cellRef: %s\n- index: %i\n- shortVal: %i\n",
event->cellRef.mRefID.c_str(),
event->index,
event->shortVal);
}
}
void InterpreterContext::setMemberLong (const std::string& id, const std::string& name, int value, bool global)