Merge branch 'master' into movement_manager

2026-05-17 07:18:37 +00:00 · 2018-12-17 01:39:37 -06:00
parent dacbce1c5f bbec352a80
commit 0681e6dbb2
53 changed files with 4179 additions and 1927 deletions
@@ -37,6 +37,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <boost/concept_check.hpp>

 #ifdef BOTS
 #include "bot.h"
@@ -5457,3 +5458,13 @@ bool Mob::GetWasSpawnedInWater() const {
 void Mob::SetSpawnedInWater(bool spawned_in_water) {
 	Mob::spawned_in_water = spawned_in_water;
 }
+
+int32 Mob::GetHPRegen() const
+{
+	return hp_regen;
+}
+
+int32 Mob::GetManaRegen() const
+{
+	return mana_regen;
+}