Skip to content

Commit d9ee491

Browse files
committed
save_folder_path & save_server_url exportées dans Jeu, menu plus exporté (too soon)
1 parent 55514e6 commit d9ee491

3 files changed

Lines changed: 8 additions & 17 deletions

File tree

Global.gd

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ var color_picker = {
2828
var avatar
2929

3030
var has_server_saves = false
31-
export var save_folder_path = "res://save/"
32-
export var save_server_url = "http://localhost/kinematique/saves.php"
31+
var save_folder_path = "res://save/"
32+
var save_server_url = ""
3333
var save_files_path = []
3434
var save_files_data = []
3535
var save_index = 0
@@ -43,6 +43,9 @@ func _ready():
4343
base_center = Vector2(base_size.x/2, base_size.y/2)
4444
current_scene = root.get_child(root.get_child_count() - 1)
4545

46+
save_folder_path = current_scene.save_folder_path
47+
save_server_url = current_scene.save_server_url
48+
4649
if current_scene.has_node("Menu"):
4750
# load save from local "res://" file or from "server"
4851
if OS.has_feature('JavaScript'):

save/save-2023-01-12-12h-Tuto.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@
7979
]
8080
},
8181
"level_tilemap": [
82-
{
83-
"x": 1,
84-
"y": 1,
85-
"id": 1
86-
},
8782
{
8883
"x": 2,
8984
"y": 3,

tools.gd

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ extends Node
77

88
export(bool) var auto_cam = false
99
export(bool) var joystick_zoom = false
10-
export(bool) var menu_and_export_mode = false setget _set_menu
10+
11+
export(String) var save_folder_path = "res://save/"
12+
export(String) var save_server_url = "http://localhost/kinematique/saves.php"
1113

1214
var avatar
1315
var GUI
@@ -43,12 +45,3 @@ func _on_Niveau_var_changed():
4345
print("event on change")
4446
GUI = get_node("Niveau/GUI")
4547
GUI.init()
46-
47-
func _set_menu(val):
48-
menu_and_export_mode = val
49-
if val:
50-
add_child(load("res://Menu.tscn").instance())
51-
$Menu.hide()
52-
else:
53-
if has_node("Menu"):
54-
$Menu.queue_free()

0 commit comments

Comments
 (0)