From 458bdf4dffdae30f5902eb0fc88b53451ab2f9fe Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Wed, 28 Sep 2016 16:40:19 +0300
Subject: [PATCH] Fix script functions for setting dynamic stats

---
 apps/openmw-mp/Script/Functions/Stats.cpp | 40 +++++++++++------------
 apps/openmw-mp/Script/Functions/Stats.hpp | 24 +++++++-------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/apps/openmw-mp/Script/Functions/Stats.cpp b/apps/openmw-mp/Script/Functions/Stats.cpp
index 5207e8213..51c1538d0 100644
--- a/apps/openmw-mp/Script/Functions/Stats.cpp
+++ b/apps/openmw-mp/Script/Functions/Stats.cpp
@@ -137,7 +137,7 @@ void StatsFunctions::SetIsMale(unsigned short pid, int value) noexcept
 int StatsFunctions::GetLevel(unsigned short pid) noexcept
 {
     Player *player;
-    GET_PLAYER(pid, player, 0.f);
+    GET_PLAYER(pid, player, 0.0f);
 
     return player->CreatureStats()->mLevel;
 }
@@ -150,15 +150,15 @@ void StatsFunctions::SetLevel(unsigned short pid, int value) noexcept
     player->CreatureStats()->mLevel = value;
 }
 
-float StatsFunctions::GetHealthBase(unsigned short pid) noexcept
+double StatsFunctions::GetHealthBase(unsigned short pid) noexcept
 {
     Player *player;
-    GET_PLAYER(pid, player,0.f);
+    GET_PLAYER(pid, player, 0.0f);
 
     return player->CreatureStats()->mDynamic[0].mBase;
 }
 
-void StatsFunctions::SetHealthBase(unsigned short pid, float value) noexcept
+void StatsFunctions::SetHealthBase(unsigned short pid, double value) noexcept
 {
     Player *player;
     GET_PLAYER(pid, player,);
@@ -166,15 +166,15 @@ void StatsFunctions::SetHealthBase(unsigned short pid, float value) noexcept
     player->CreatureStats()->mDynamic[0].mBase = value;
 }
 
-float StatsFunctions::GetHealthCurrent(unsigned short pid) noexcept
+double StatsFunctions::GetHealthCurrent(unsigned short pid) noexcept
 {
     Player *player;
-    GET_PLAYER(pid, player, 0.f);
+    GET_PLAYER(pid, player, 0.0f);
 
     return player->CreatureStats()->mDynamic[0].mCurrent;
 }
 
-void StatsFunctions::SetHealthCurrent(unsigned short pid, float value) noexcept
+void StatsFunctions::SetHealthCurrent(unsigned short pid, double value) noexcept
 {
     Player *player;
     GET_PLAYER(pid, player,);
@@ -182,15 +182,15 @@ void StatsFunctions::SetHealthCurrent(unsigned short pid, float value) noexcept
     player->CreatureStats()->mDynamic[0].mCurrent = 0;
 }
 
-float StatsFunctions::GetMagickaBase(unsigned short pid) noexcept
+double StatsFunctions::GetMagickaBase(unsigned short pid) noexcept
 {
     Player *player;
-    GET_PLAYER(pid, player,0.f);
+    GET_PLAYER(pid, player, 0.0f);
 
     return player->CreatureStats()->mDynamic[1].mBase;
 }
 
-void StatsFunctions::SetMagickaBase(unsigned short pid, float value) noexcept
+void StatsFunctions::SetMagickaBase(unsigned short pid, double value) noexcept
 {
     Player *player;
     GET_PLAYER(pid, player,);
@@ -198,15 +198,15 @@ void StatsFunctions::SetMagickaBase(unsigned short pid, float value) noexcept
     player->CreatureStats()->mDynamic[1].mBase = value;
 }
 
-float StatsFunctions::GetMagickaCurrent(unsigned short pid) noexcept
+double StatsFunctions::GetMagickaCurrent(unsigned short pid) noexcept
 {
     Player *player;
-    GET_PLAYER(pid, player, 0.f);
+    GET_PLAYER(pid, player, 0.0f);
 
     return player->CreatureStats()->mDynamic[1].mCurrent;
 }
 
-void StatsFunctions::SetMagickaCurrent(unsigned short pid, float value) noexcept
+void StatsFunctions::SetMagickaCurrent(unsigned short pid, double value) noexcept
 {
     Player *player;
     GET_PLAYER(pid, player,);
@@ -214,15 +214,15 @@ void StatsFunctions::SetMagickaCurrent(unsigned short pid, float value) noexcept
     player->CreatureStats()->mDynamic[1].mCurrent = 0;
 }
 
-float StatsFunctions::GetFatigueBase(unsigned short pid) noexcept
+double StatsFunctions::GetFatigueBase(unsigned short pid) noexcept
 {
     Player *player;
-    GET_PLAYER(pid, player,0.f);
+    GET_PLAYER(pid, player, 0.0f);
 
     return player->CreatureStats()->mDynamic[2].mBase;
 }
 
-void StatsFunctions::SetFatigueBase(unsigned short pid, float value) noexcept
+void StatsFunctions::SetFatigueBase(unsigned short pid, double value) noexcept
 {
     Player *player;
     GET_PLAYER(pid, player,);
@@ -230,15 +230,15 @@ void StatsFunctions::SetFatigueBase(unsigned short pid, float value) noexcept
     player->CreatureStats()->mDynamic[2].mBase = value;
 }
 
-float StatsFunctions::GetFatigueCurrent(unsigned short pid) noexcept
+double StatsFunctions::GetFatigueCurrent(unsigned short pid) noexcept
 {
     Player *player;
-    GET_PLAYER(pid, player, 0.f);
+    GET_PLAYER(pid, player, 0.0f);
 
     return player->CreatureStats()->mDynamic[2].mCurrent;
 }
 
-void StatsFunctions::SetFatigueCurrent(unsigned short pid, float value) noexcept
+void StatsFunctions::SetFatigueCurrent(unsigned short pid, double value) noexcept
 {
     Player *player;
     GET_PLAYER(pid, player,);
@@ -362,8 +362,6 @@ void StatsFunctions::SetSkillBase(unsigned short pid, unsigned short skill, int
         return;
 
     player->NpcStats()->mSkills[skill].mBase = value;
-
-    //DEBUG_PRINTF("SetSkill(%d, %d, %d)\n", pid, skill, value);
 }
 
 int StatsFunctions::GetSkillCurrent(unsigned short pid, unsigned short skill) noexcept
diff --git a/apps/openmw-mp/Script/Functions/Stats.hpp b/apps/openmw-mp/Script/Functions/Stats.hpp
index 7d10a9244..d9f9708b9 100644
--- a/apps/openmw-mp/Script/Functions/Stats.hpp
+++ b/apps/openmw-mp/Script/Functions/Stats.hpp
@@ -94,20 +94,20 @@ public:
     static int GetLevel(unsigned short pid) noexcept;
     static void SetLevel(unsigned short pid, int value) noexcept;
 
-    static float GetHealthBase(unsigned short pid) noexcept;
-    static void SetHealthBase(unsigned short pid, float value) noexcept;
-    static float GetHealthCurrent(unsigned short pid) noexcept;
-    static void SetHealthCurrent(unsigned short pid, float value) noexcept;
+    static double GetHealthBase(unsigned short pid) noexcept;
+    static void SetHealthBase(unsigned short pid, double value) noexcept;
+    static double GetHealthCurrent(unsigned short pid) noexcept;
+    static void SetHealthCurrent(unsigned short pid, double value) noexcept;
 
-    static float GetMagickaBase(unsigned short pid) noexcept;
-    static void SetMagickaBase(unsigned short pid, float value) noexcept;
-    static float GetMagickaCurrent(unsigned short pid) noexcept;
-    static void SetMagickaCurrent(unsigned short pid, float value) noexcept;
+    static double GetMagickaBase(unsigned short pid) noexcept;
+    static void SetMagickaBase(unsigned short pid, double value) noexcept;
+    static double GetMagickaCurrent(unsigned short pid) noexcept;
+    static void SetMagickaCurrent(unsigned short pid, double value) noexcept;
 
-    static float GetFatigueBase(unsigned short pid) noexcept;
-    static void SetFatigueBase(unsigned short pid, float value) noexcept;
-    static float GetFatigueCurrent(unsigned short pid) noexcept;
-    static void SetFatigueCurrent(unsigned short pid, float value) noexcept;
+    static double GetFatigueBase(unsigned short pid) noexcept;
+    static void SetFatigueBase(unsigned short pid, double value) noexcept;
+    static double GetFatigueCurrent(unsigned short pid) noexcept;
+    static void SetFatigueCurrent(unsigned short pid, double value) noexcept;
 
     static int GetAttributeCount() noexcept;
     static int GetSkillCount() noexcept;