From 730df061b301724a4fa6a5dde6b99b24c82b4273 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 1 May 2017 19:44:23 +0300 Subject: [PATCH] [General] Add hasPositionData and hasStatsDynamicData bools to BaseActor --- apps/openmw/mwmp/DedicatedActor.hpp | 2 -- apps/openmw/mwmp/WorldEvent.cpp | 2 +- components/openmw-mp/Base/BaseActor.hpp | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmp/DedicatedActor.hpp b/apps/openmw/mwmp/DedicatedActor.hpp index 8dbfd55f1..d2623c543 100644 --- a/apps/openmw/mwmp/DedicatedActor.hpp +++ b/apps/openmw/mwmp/DedicatedActor.hpp @@ -25,8 +25,6 @@ namespace mwmp MWWorld::Ptr getPtr(); void setPtr(const MWWorld::Ptr& newPtr); - bool hasStatsDynamicData; - private: MWWorld::Ptr ptr; diff --git a/apps/openmw/mwmp/WorldEvent.cpp b/apps/openmw/mwmp/WorldEvent.cpp index 2c93373f3..b16f9939e 100644 --- a/apps/openmw/mwmp/WorldEvent.cpp +++ b/apps/openmw/mwmp/WorldEvent.cpp @@ -224,7 +224,7 @@ void WorldEvent::scaleObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i, %i\nscale: %f", worldObject.refId.c_str(), worldObject.refNumIndex, + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i, %i\n- scale: %f", worldObject.refId.c_str(), worldObject.refNumIndex, worldObject.mpNum, worldObject.scale); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex, worldObject.mpNum); diff --git a/components/openmw-mp/Base/BaseActor.hpp b/components/openmw-mp/Base/BaseActor.hpp index b6b01523a..b508ee201 100644 --- a/components/openmw-mp/Base/BaseActor.hpp +++ b/components/openmw-mp/Base/BaseActor.hpp @@ -38,6 +38,9 @@ namespace mwmp Animation animation; Attack attack; + + bool hasPositionData; + bool hasStatsDynamicData; }; class BaseActorList