From 7ebad596d6a1bb10aae26e29dd377b3f2613d44c Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 1 Feb 2017 12:53:51 +0200 Subject: [PATCH] [Server] Use double instead of int for scale in WorldFunctions --- apps/openmw-mp/Script/Functions/World.cpp | 4 ++-- apps/openmw-mp/Script/Functions/World.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openmw-mp/Script/Functions/World.cpp b/apps/openmw-mp/Script/Functions/World.cpp index 80f97e2e8..8e4a05a77 100644 --- a/apps/openmw-mp/Script/Functions/World.cpp +++ b/apps/openmw-mp/Script/Functions/World.cpp @@ -86,7 +86,7 @@ void WorldFunctions::SetObjectGoldValue(int goldValue) noexcept tempWorldObject.goldValue = goldValue; } -void WorldFunctions::SetObjectScale(int scale) noexcept +void WorldFunctions::SetObjectScale(double scale) noexcept { tempWorldObject.scale = scale; } @@ -140,7 +140,7 @@ int WorldFunctions::GetObjectGoldValue(unsigned int i) noexcept return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).goldValue; } -int WorldFunctions::GetObjectScale(unsigned int i) noexcept +double WorldFunctions::GetObjectScale(unsigned int i) noexcept { return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).scale; } diff --git a/apps/openmw-mp/Script/Functions/World.hpp b/apps/openmw-mp/Script/Functions/World.hpp index 153dba320..d3a4ed106 100644 --- a/apps/openmw-mp/Script/Functions/World.hpp +++ b/apps/openmw-mp/Script/Functions/World.hpp @@ -57,7 +57,7 @@ public: static void SetObjectRefNumIndex(int refNumIndex) noexcept; static void SetObjectCount(int count) noexcept; static void SetObjectGoldValue(int goldValue) noexcept; - static void SetObjectScale(int scale) noexcept; + static void SetObjectScale(double scale) noexcept; static void SetObjectState(int scale) noexcept; static void SetObjectLockLevel(int lockLevel) noexcept; static void SetObjectPosition(double x, double y, double z) noexcept; @@ -69,7 +69,7 @@ public: static int GetObjectRefNumIndex(unsigned int i) noexcept; static int GetObjectCount(unsigned int i) noexcept; static int GetObjectGoldValue(unsigned int i) noexcept; - static int GetObjectScale(unsigned int i) noexcept; + static double GetObjectScale(unsigned int i) noexcept; static int GetObjectState(unsigned int i) noexcept; static int GetObjectLockLevel(unsigned int i) noexcept; static double GetObjectPosX(unsigned int i) noexcept;