Fix global level

This commit is contained in:
jianmingyong 2017-03-25 02:00:13 +08:00
parent 5fbbf804f6
commit e5f2db323e

View File

@ -1,3 +1,4 @@
Imports net.Pokemon3D.Game
''' <summary> ''' <summary>
''' The base class for all screens in the game. ''' The base class for all screens in the game.
''' </summary> ''' </summary>
@ -104,6 +105,7 @@ Public MustInherit Class Screen
''' </summary> ''' </summary>
Public Shared Property Camera() As Camera Public Shared Property Camera() As Camera
Private Shared _globalLevel As Level
''' <summary> ''' <summary>
''' A global level instance, that carries over screen instances. ''' A global level instance, that carries over screen instances.
''' </summary> ''' </summary>
@ -213,13 +215,13 @@ Public MustInherit Class Screen
''' </summary> ''' </summary>
''' <param name="scr">The source screen.</param> ''' <param name="scr">The source screen.</param>
Protected Sub CopyFrom(ByVal scr As Screen) Protected Sub CopyFrom(ByVal scr As Screen)
_mouseVisible = scr._mouseVisible _MouseVisible = scr._MouseVisible
_canBePaused = scr._canBePaused _CanBePaused = scr._CanBePaused
_canMuteMusic = scr._canMuteMusic _CanMuteMusic = scr._CanMuteMusic
_canChat = scr._canChat _CanChat = scr._CanChat
_canTakeScreenshot = scr._canTakeScreenshot _CanTakeScreenshot = scr._CanTakeScreenshot
_canDrawDebug = scr._canDrawDebug _CanDrawDebug = scr._CanDrawDebug
_canGoFullscreen = scr._canGoFullscreen _CanGoFullscreen = scr._CanGoFullscreen
End Sub End Sub
''' <summary> ''' <summary>
@ -398,7 +400,7 @@ Public MustInherit Class Screen
Dim s As Screen = Me Dim s As Screen = Me
While s.PreScreen IsNot Nothing And canDrawGradients = True While s.PreScreen IsNot Nothing And canDrawGradients = True
If s._isOverlay = False Then If s._IsOverlay = False Then
s = s.PreScreen s = s.PreScreen
If s.IsDrawingGradients = True Then If s.IsDrawingGradients = True Then
canDrawGradients = False canDrawGradients = False