Rim/iw6-mod
Rim/iw6-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

maint: add changes from private repo

Browse Source
This commit is contained in:
Rim 2024-05-15 00:51:05 -04:00
parent f1caeb35e6
commit 36f579f662
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/maps/mp/gametypes/_playerlogic.gsc
View File

@ -476,7 +476,8 @@ spawnplayer( var_0 )
self.waitingtospawnamortize = 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 ) ) if ( !self hasloadedcustomizationplayerview( self ) )
self.waitingtospawnamortize = 0; self.waitingtospawnamortize = 0;

17
data/ui_scripts/team_select/__init__.lua
View File

@ -6,6 +6,8 @@ if (package.loaded["LUI.mp_hud.OptionsMenu"] == nil) then
return return
end end
game:addlocalizedstring("LUA_MENU_QUIT_TO_DESKTOP_CAPS", "QUIT TO DESKTOP")
package.loaded["LUI.mp_hud.OptionsMenu"].options_def = function() package.loaded["LUI.mp_hud.OptionsMenu"].options_def = function()
local f14_local0 = GameX.GetGameMode() local f14_local0 = GameX.GetGameMode()
local f14_local1 = Engine.TableLookup( GameTypesTable.File, GameTypesTable.Cols.Ref, f14_local0, GameTypesTable.Cols.ClassChoice ) == "1" local f14_local1 = Engine.TableLookup( GameTypesTable.File, GameTypesTable.Cols.Ref, f14_local0, GameTypesTable.Cols.ClassChoice ) == "1"
@ -90,12 +92,23 @@ package.loaded["LUI.mp_hud.OptionsMenu"].options_def = function()
LUI.MenuBuilder.BuildAddChild(self, { LUI.MenuBuilder.BuildAddChild(self, {
type = "UIGenericButton", type = "UIGenericButton",
id = "btn_MPPause_5", id = "btn_MPPause_4",
properties = { properties = {
childNum = 6, childNum = 5,
button_text = Engine.Localize( "@LUA_MENU_END_GAME_CAPS" ), button_text = Engine.Localize( "@LUA_MENU_END_GAME_CAPS" ),
button_action_func = LUI.mp_hud.OptionsMenu.endGameButtonAction button_action_func = LUI.mp_hud.OptionsMenu.endGameButtonAction
} }
}) })
LUI.MenuBuilder.BuildAddChild(self, {
type = "UIGenericButton",
id = "btn_MPPause_5",
properties = {
childNum = 6,
button_text = Engine.Localize( "@LUA_MENU_QUIT_TO_DESKTOP_CAPS" ),
button_action_func = MBh.PopupMenu( "quit_popmenu", false, false )
}
})
return self return self
end end