Publicize CurrentRestMode

Interkarma · Nov 16, 2020 · 29e2616 · 29e2616
1 parent 0b8ab9d
commit 29e2616
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Assets/Scripts/Game/Entities/PlayerEntity.cs b/Assets/Scripts/Game/Entities/PlayerEntity.cs
@@ -144,6 +144,7 @@ public class PlayerEntity : DaggerfallEntity
         public bool PreventNormalizingReputations { get { return preventNormalizingReputations; } set { preventNormalizingReputations = value; } }
         public bool IsResting { get { return isResting; } set { isResting = value; } }
         public bool IsLoitering { get; set; }
+        public DaggerfallRestWindow.RestModes CurrentRestMode { get; set; }
         public Races Race { get { return (Races)RaceTemplate.ID; } }
         public RaceTemplate RaceTemplate { get { return GetLiveRaceTemplate(); } }
         public RaceTemplate BirthRaceTemplate { get { return raceTemplate; } set { raceTemplate = value; } }

diff --git a/Assets/Scripts/Game/UserInterfaceWindows/DaggerfallRestWindow.cs b/Assets/Scripts/Game/UserInterfaceWindows/DaggerfallRestWindow.cs
@@ -68,7 +68,6 @@ public class DaggerfallRestWindow : DaggerfallPopupWindow
         protected const float loiterWaitTimePerHour = 1.25f;
         protected const int cityCampingIllegal = 17;
 
-        protected RestModes currentRestMode = RestModes.Selection;
         protected int minutesOfHour = 0;
         protected int hoursRemaining = 0;
         protected int totalHours = 0;
@@ -89,9 +88,19 @@ public class DaggerfallRestWindow : DaggerfallPopupWindow
 
         #endregion
 
+        #region Properties
+
+        protected RestModes currentRestMode
+        {
+            get { return GameManager.Instance.PlayerEntity.CurrentRestMode; }
+            set { GameManager.Instance.PlayerEntity.CurrentRestMode = value; }
+        }
+
+        #endregion
+
         #region Enums
 
-        protected enum RestModes
+        public enum RestModes
         {
             Selection,
             TimedRest,