openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-01-20 03:54:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix

Browse source
This commit is contained in:
Squinty 2024-04-28 00:04:15 +02:00
parent a32fb53393
commit 8704b72a06
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
entities/player/player.gd
View file

@ -48,7 +48,6 @@ enum PlayerState { PLAYER_ALIVE, PLAYER_DEAD }
@onready var spring_arm_height : float = $Smoothing/SpringArm3D.position.y
@onready var _original_weapon_transform : Transform3D = weapon.transform
@onready var tp_player : Vanguard = $Smoothing/ThirdPerson/PlayerMesh
@onready var _game_settings : Settings = get_node("/root/GlobalSettings")
@onready var jetpack_particles : Array = $Smoothing/ThirdPerson/PlayerMesh/JetpackFX.get_children()
@onready var match_participant_component : MatchParticipantComponent = $MatchParticipantComponent

4
interfaces/menus/boot/boot.tscn
View file

@ -17,13 +17,13 @@ func _on_multiplayer_pressed() -> void:
%SettingsPanelContainer.hide()
%MainPanelContainer.hide()
%MultiplayerPanelContainer.show()
func _on_settings_pressed() -> void:
%MultiplayerPanelContainer.hide()
%MultiplayerPanelContainer.tab_container.current_tab = 0
%SettingsPanelContainer.show()
%MainPanelContainer.hide()
func _on_quit_pressed() -> void:
get_tree().quit()

10
main.tscn
View file

@ -36,10 +36,10 @@ func _ready() -> void:
$BootMenu.start_demo.connect(_start_demo)
$BootMenu/MultiplayerPanelContainer.start_server.connect(_start_server)
$BootMenu/MultiplayerPanelContainer.join_server.connect(_join_server)
# do not set initial window mode for debug build
# do not set initial window mode for debug build
if not OS.is_debug_build():
DisplayServer.window_set_mode(Settings.get_value(\"video\", \"window_mode\"))
func _unhandled_input(event : InputEvent) -> void:
if event.is_action_pressed(\"exit\"):
# reset game mode
@ -73,14 +73,14 @@ func _start_server(port : int, nickname : String) -> void:
mode.start_server({
\"port\": port,
\"nickname\": nickname,
\"map\": maps[clamp($BootMenu/Multiplayer.map_selector.selected, 0, len(maps))]
\"map\": maps[clamp($BootMenu/MultiplayerPanelContainer.map_selector.selected, 0, len(maps))]
})
$BootMenu.hide()
func _join_server(host : String, port : int, nickname : String) -> void:
mode = MULTIPLAYER.instantiate()
mode.connected_to_server.connect($BootMenu/Multiplayer._on_connected_to_server)
mode.connection_failed.connect($BootMenu/Multiplayer._on_connection_failed)
mode.connected_to_server.connect($BootMenu/MultiplayerPanelContainer._on_connected_to_server)
mode.connection_failed.connect($BootMenu/MultiplayerPanelContainer._on_connection_failed)
mode.join_server(host, port, nickname)
"