diff --git a/dw/playlists_tu14.aggr b/dw/playlists_tu14.aggr index 59d8f73..c04e331 100644 Binary files a/dw/playlists_tu14.aggr and b/dw/playlists_tu14.aggr differ diff --git a/maps/mp/gametypes/_playerlogic.gsc b/maps/mp/gametypes/_playerlogic.gsc index 78b4997..c311e05 100644 --- a/maps/mp/gametypes/_playerlogic.gsc +++ b/maps/mp/gametypes/_playerlogic.gsc @@ -476,7 +476,8 @@ spawnplayer( var_0 ) self.waitingtospawnamortize = 0; } - // // Returning false we use default character model and prevent a 5 second respawn delay. (Github issue #109) + // It's possible when changing teams that we don't have our own customization loaded, wait until that's done + // Setting self.waitingtospawnamortize to false so we can use the default character model and prevent a 5 second respawn delay. (Github issue #109) if ( !self hasloadedcustomizationplayerview( self ) ) self.waitingtospawnamortize = 0; diff --git a/ui_scripts/team_select/__init__.lua b/ui_scripts/team_select/__init__.lua index 0386983..7724a6d 100644 --- a/ui_scripts/team_select/__init__.lua +++ b/ui_scripts/team_select/__init__.lua @@ -99,7 +99,7 @@ package.loaded["LUI.mp_hud.OptionsMenu"].options_def = function() button_action_func = LUI.mp_hud.OptionsMenu.endGameButtonAction } }) - + LUI.MenuBuilder.BuildAddChild(self, { type = "UIGenericButton", id = "btn_MPPause_5", @@ -109,6 +109,6 @@ package.loaded["LUI.mp_hud.OptionsMenu"].options_def = function() button_action_func = MBh.PopupMenu( "quit_popmenu", false, false ) } }) - + return self end