From 48b773bfcb1b9feaed2ee6d6924db8b57de09a74 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 1 May 2017 19:09:44 +0300 Subject: [PATCH] [Client] Use float scale for WorldEvent::sendObjectScale() --- apps/openmw/mwmp/WorldEvent.cpp | 5 +++-- apps/openmw/mwmp/WorldEvent.hpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmp/WorldEvent.cpp b/apps/openmw/mwmp/WorldEvent.cpp index 1db35b24a..2c93373f3 100644 --- a/apps/openmw/mwmp/WorldEvent.cpp +++ b/apps/openmw/mwmp/WorldEvent.cpp @@ -224,7 +224,8 @@ void WorldEvent::scaleObjects(MWWorld::CellStore* cellStore) { 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); @@ -566,7 +567,7 @@ void WorldEvent::sendObjectUnlock(MWWorld::Ptr ptr) 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(); cell = *ptr.getCell()->getCell(); diff --git a/apps/openmw/mwmp/WorldEvent.hpp b/apps/openmw/mwmp/WorldEvent.hpp index a89cf3c92..379056924 100644 --- a/apps/openmw/mwmp/WorldEvent.hpp +++ b/apps/openmw/mwmp/WorldEvent.hpp @@ -44,7 +44,7 @@ namespace mwmp void sendObjectDelete(MWWorld::Ptr ptr); void sendObjectLock(MWWorld::Ptr ptr, int lockLevel); 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 sendDoorState(MWWorld::Ptr ptr, int state); void sendMusicPlay(std::string filename);