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

Fix some errors

Browse Source
This commit is contained in:
JappaWakka 2024-02-19 20:18:31 +01:00
parent 6f62a77d0f
commit af0b31b567
1 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
P3D/Screens/MapScreen.vb
View File

@ -59,7 +59,7 @@
PlayerSkinTexture = TextureManager.GetTexture("Textures\NPC\" & Core.Player.Skin) PlayerSkinTexture = TextureManager.GetTexture("Textures\NPC\" & Core.Player.Skin)
End If End If
End If End If
Me.MouseVisibVisible = False Me.MouseVisible = False
Me.objectsTexture = TextureManager.GetTexture("GUI\Map\map_objects") Me.objectsTexture = TextureManager.GetTexture("GUI\Map\map_objects")
LoadMapTexture() LoadMapTexture()
@ -389,18 +389,26 @@
If hoverText = "" And pokehoverText = "" And drawObjects(2) = True Then If hoverText = "" And pokehoverText = "" And drawObjects(2) = True Then
For Each Place As Place In places For Each Place As Place In places
If Place.getRectangle(mapOffset).Contains(cursorPoint) = True Then If Place.getRectangle(mapOffset).Contains(cursorPoint) = True Then
If Controls.Accept(True, True, True) = True Then Dim DoUpdate As Boolean = False
Place.Click(flag)
End If
If Place.Visible = VisibleMode.Always OrElse Place.Visible = VisibleMode.Temporary AndAlso Place.ContainFiles.Contains(Level.LevelFile.ToLower()) = True Then If Place.Visible = VisibleMode.Always OrElse Place.Visible = VisibleMode.Temporary AndAlso Place.ContainFiles.Contains(Level.LevelFile.ToLower()) = True Then
hoverText = Place.Name DoUpdate = True
ElseIf Place.Visible = VisibleMode.Unlock Then ElseIf Place.Visible = VisibleMode.Unlock Then
For Each p As String In Place.ContainFiles For Each p As String In Place.ContainFiles
If Core.Player.VisitedMaps.ToLower().Split(CChar(",")).Contains(p.ToLower()) = True Then If Core.Player.VisitedMaps.ToLower().Split(CChar(",")).Contains(p.ToLower()) = True Then
hoverText = Place.Name DoUpdate = True
End If End If
Next Next
Exit For Exit For
ElseIf Place.Visible = VisibleMode.Register Then
If ActionScript.IsRegistered(Place.RegisterName) = True Then
DoUpdate = True
End If
End If
If DoUpdate = True Then
If Controls.Accept(True, True, True) = True Then
Place.Click(flag)
End If
hoverText = Place.Name
End If End If
Exit For Exit For
End If End If
@ -409,17 +417,26 @@
If hoverText = "" And pokehoverText = "" And drawObjects(0) = True Then If hoverText = "" And pokehoverText = "" And drawObjects(0) = True Then
For Each City As City In cities For Each City As City In cities
If City.getRectangle(mapOffset).Contains(cursorPoint) = True Then If City.getRectangle(mapOffset).Contains(cursorPoint) = True Then
Dim DoUpdate As Boolean = False
If City.Visible = VisibleMode.Always OrElse City.Visible = VisibleMode.Temporary AndAlso City.ContainFiles.Contains(Level.LevelFile.ToLower()) = True Then
DoUpdate = True
ElseIf City.Visible = VisibleMode.Unlock Then
For Each p As String In City.ContainFiles
If Core.Player.VisitedMaps.ToLower().Split(CChar(",")).Contains(p.ToLower()) = True Then
DoUpdate = True
End If
Next
Exit For
ElseIf City.Visible = VisibleMode.Register Then
If ActionScript.IsRegistered(City.RegisterName) = True Then
DoUpdate = True
End If
End If
If DoUpdate = True Then
If Controls.Accept(True, True, True) = True Then If Controls.Accept(True, True, True) = True Then
City.Click(flag) City.Click(flag)
End If End If
If City.Visible = VisibleMode.Always OrElse City.Visible = VisibleMode.Temporary AndAlso City.ContainFiles.Contains(Level.LevelFile.ToLower()) = True Then
hoverText = City.Name hoverText = City.Name
ElseIf City.Visible = VisibleMode.Unlock Then
For Each c As String In City.ContainFiles
If Core.Player.VisitedMaps.ToLower().Split(CChar(",")).Contains(c.ToLower()) = True Then
hoverText = City.Name
End If
Next
End If End If
Exit For Exit For
End If End If
@ -428,18 +445,28 @@
If hoverText = "" And pokehoverText = "" And drawObjects(1) = True Then If hoverText = "" And pokehoverText = "" And drawObjects(1) = True Then
For Each Route As Route In routes For Each Route As Route In routes
If Route.getRectangle(mapOffset).Contains(cursorPoint) = True Then If Route.getRectangle(mapOffset).Contains(cursorPoint) = True Then
Dim DoUpdate As Boolean = False
If Route.Visible = VisibleMode.Always OrElse Route.Visible = VisibleMode.Temporary AndAlso Route.ContainFiles.Contains(Level.LevelFile.ToLower()) = True Then
DoUpdate = True
ElseIf Route.Visible = VisibleMode.Unlock Then
For Each p As String In Route.ContainFiles
If Core.Player.VisitedMaps.ToLower().Split(CChar(",")).Contains(p.ToLower()) = True Then
DoUpdate = True
End If
Next
Exit For
ElseIf Route.Visible = VisibleMode.Register Then
If ActionScript.IsRegistered(Route.RegisterName) = True Then
DoUpdate = True
End If
End If
If DoUpdate = True Then
If Controls.Accept(True, True, True) = True Then If Controls.Accept(True, True, True) = True Then
Route.Click(flag) Route.Click(flag)
End If End If
If Route.Visible = VisibleMode.Always OrElse Route.Visible = VisibleMode.Temporary AndAlso Route.ContainFiles.Contains(Level.LevelFile.ToLower()) = True Then
hoverText = Route.Name
ElseIf Route.Visible = VisibleMode.Unlock Then
For Each r As String In Route.ContainFiles
If Core.Player.VisitedMaps.ToLower().Split(CChar(",")).Contains(r.ToLower()) = True Then
hoverText = Route.Name hoverText = Route.Name
End If End If
Next Exit For
End If
End If End If
Next Next
End If End If