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

[Client] Use float scale for WorldEvent::sendObjectScale()

Browse source
This commit is contained in:
David Cernat 2017-05-01 19:09:44 +03:00
parent 60f4a1d9e5
commit 48b773bfcb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwmp/WorldEvent.cpp
View file

@ -224,7 +224,8 @@ void WorldEvent::scaleObjects(MWWorld::CellStore* cellStore)
{ {
worldObject = objectChanges.objects.at(i); worldObject = objectChanges.objects.at(i);
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i, %i", worldObject.refId.c_str(), worldObject.refNumIndex, worldObject.mpNum); LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i, %i\nscale: %f", worldObject.refId.c_str(), worldObject.refNumIndex,
worldObject.mpNum, worldObject.scale);
MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex, worldObject.mpNum); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex, worldObject.mpNum);
@ -566,7 +567,7 @@ void WorldEvent::sendObjectUnlock(MWWorld::Ptr ptr)
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send();
} }
void WorldEvent::sendObjectScale(MWWorld::Ptr ptr, int scale) void WorldEvent::sendObjectScale(MWWorld::Ptr ptr, float scale)
{ {
reset(); reset();
cell = *ptr.getCell()->getCell(); cell = *ptr.getCell()->getCell();

2
apps/openmw/mwmp/WorldEvent.hpp
View file

@ -44,7 +44,7 @@ namespace mwmp
void sendObjectDelete(MWWorld::Ptr ptr); void sendObjectDelete(MWWorld::Ptr ptr);
void sendObjectLock(MWWorld::Ptr ptr, int lockLevel); void sendObjectLock(MWWorld::Ptr ptr, int lockLevel);
void sendObjectUnlock(MWWorld::Ptr ptr); void sendObjectUnlock(MWWorld::Ptr ptr);
void sendObjectScale(MWWorld::Ptr ptr, int scale); void sendObjectScale(MWWorld::Ptr ptr, float scale);
void sendObjectAnimPlay(MWWorld::Ptr ptr, std::string group, int mode); void sendObjectAnimPlay(MWWorld::Ptr ptr, std::string group, int mode);
void sendDoorState(MWWorld::Ptr ptr, int state); void sendDoorState(MWWorld::Ptr ptr, int state);
void sendMusicPlay(std::string filename); void sendMusicPlay(std::string filename);