Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UI error when leaving the lobby too quickly #887

Merged
merged 9 commits into from
Nov 18, 2024
Merged

Fix UI error when leaving the lobby too quickly #887

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9c4c9c
Update sh_loadouts.nut
NachosChipeados Oct 2, 2024
050e129
Merge branch 'main' into connecting_ui_error
NachosChipeados Oct 2, 2024
0d995f1
Merge branch 'main' into connecting_ui_error
Zanieon Oct 11, 2024
4d86896
Update sh_progression.nut
NachosChipeados Oct 13, 2024
efcdc8b
Merge branch 'R2Northstar:main' into connecting_ui_error
NachosChipeados Nov 13, 2024
7cbedb6
Merge branch 'main' into connecting_ui_error
Zanieon Nov 16, 2024
5b599f4
Add space
NachosChipeados Nov 16, 2024
7da554d
Revert "Update sh_loadouts.nut"
NachosChipeados Nov 16, 2024
6d41fc9
Remove other space
NachosChipeados Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Northstar.CustomServers/mod/scripts/vscripts/sh_loadouts.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2813,6 +2813,9 @@ string function GetParentLoadoutProperty( string loadoutType, string propertyNam

int function GetPersistentSpawnLoadoutIndex( entity player, string loadoutType )
{
if (!IsValid ( player ) )
Zanieon marked this conversation as resolved.
Show resolved Hide resolved
return -1

int loadoutIndex = player.GetPersistentVarAsInt( loadoutType + "SpawnLoadout.index" )
if ( loadoutType == "titan" && loadoutIndex >= NUM_PERSISTENT_TITAN_LOADOUTS )
loadoutIndex = 0
Expand Down
9 changes: 7 additions & 2 deletions Northstar.CustomServers/mod/scripts/vscripts/sh_progression.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,13 @@ void function UpdateCachedLoadouts_Threaded()
// below here is just making all the menu models update properly and such

#if UI
uiGlobal.pilotSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( GetUIPlayer(), "pilot" )
uiGlobal.titanSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( GetUIPlayer(), "titan" )
entity UIPlayer = GetUIPlayer()

if (!IsValid ( UIPlayer ) )
Zanieon marked this conversation as resolved.
Show resolved Hide resolved
return

uiGlobal.pilotSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( UIPlayer, "pilot" )
uiGlobal.titanSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( UIPlayer, "titan" )
#endif

#if CLIENT
Expand Down
Loading