Fixed setDayTime value not returning

P3D/Battle/BattleSystemV2/BattleScreen.vb

@@ -931,11 +931,7 @@
 
             Level.Load("battle\" & levelfile)
             Level.MapName = SavedOverworld.Level.MapName
-            If World.setDaytime = Nothing Then
-                Level.DayTime = World.GetTime + 1
-            Else
-                Level.DayTime = World.GetTime
-            End If
+            Level.DayTime = World.GetTime + 1
         End Sub
 
 #End Region

P3D/Screens/MainMenu/PauseScreen.vb

@@ -307,7 +307,7 @@
             Core.ServersManager.ServerConnection.Disconnect()
         End If
 
-        World.setDaytime = Nothing
+        World.setDaytime = -1
         World.setSeason = Nothing
         Chat.ClearChat()
         ScriptStorage.Clear()

P3D/Screens/MainMenu/PressStartScreen.vb

@@ -68,7 +68,7 @@ Public Class PressStartScreen
         _shader = New GameDevCommon.Rendering.BasicShader()
         CType(_shader.Effect, BasicEffect).LightingEnabled = False
         _camera = New Scene.MainMenuCamera()
-        World.setDaytime = Nothing
+        World.setDaytime = -1
         Dim dayTime = World.GetTime
 
         Select Case dayTime

P3D/World/ActionScript/V2/ScriptCommands/DoEnvironment.vb

@@ -55,10 +55,10 @@
                 Case "setdaytime"
                     Dim daytime As Integer = int(argument)
                     If daytime > 0 AndAlso daytime <= 4 Then
-                        World.setDaytime = CType(daytime, World.DayTimes)
+                        World.setDaytime = daytime - 1
                         Screen.Level.DayTime = daytime
                     Else
-                        World.setDaytime = Nothing
+                        World.setDaytime = -1
                         Screen.Level.DayTime = World.GetTime + 1
                     End If
                     IsReady = True

P3D/World/LevelLoader.vb

@@ -1045,11 +1045,7 @@
             If TagExists(Tags, "DayTime") = True Then
                 Screen.Level.DayTime = CInt(GetTag(Tags, "DayTime"))
             Else
-                If World.setDaytime = Nothing Then
-                    Screen.Level.DayTime = World.GetTime + 1
-                Else
-                    Screen.Level.DayTime = World.setDaytime
-                End If
+                Screen.Level.DayTime = World.GetTime + 1
             End If
         End If
 

P3D/World/World.vb

@@ -5,7 +5,7 @@ Public Class World
     Private Shared _regionWeather As Weathers = Weathers.Clear
     Private Shared _regionWeatherSet As Boolean = False
     Public Shared setSeason As Seasons = Nothing
-    Public Shared setDaytime As DayTimes = Nothing
+    Public Shared setDaytime As Integer = -1
 
     Public Shared IsMainMenu As Boolean = False
     Public Shared IsAurora As Boolean = False
@@ -86,8 +86,8 @@ Public Class World
                 Return DayTimes.Day
             End If
 
-            If setDaytime <> Nothing Then
-                Return setDaytime
+            If setDaytime <> -1 Then
+                Return CType(setDaytime, DayTimes)
             Else
                 Dim time As DayTimes = DayTimes.Day