tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-27 07:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed setDayTime value not returning

Browse Source
This commit is contained in:
JappaWakka 2023-12-08 09:53:17 +01:00
parent 453c041199
commit 3e9c1cde9c
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

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

2
P3D/Screens/MainMenu/PauseScreen.vb
View File

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

2
P3D/Screens/MainMenu/PressStartScreen.vb
View File

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

4
P3D/World/ActionScript/V2/ScriptCommands/DoEnvironment.vb
View File

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

6
P3D/World/LevelLoader.vb
View File

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

6
P3D/World/World.vb
View File

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