Skip to content

Commit 9dcffa1

Browse files
committed
I am back! Fixed corruption that happened while away
1 parent 72b6691 commit 9dcffa1

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

Scenes and Scripts/Scenes/Player/Player.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[gd_scene load_steps=42 format=3 uid="uid://cjm5lrxicdgsf"]
2-
# sebashtioon was here
2+
33
[ext_resource type="Script" path="res://Scenes and Scripts/Scenes/Player/Player_SCRIPT.gd" id="1_5mhs1"]
44
[ext_resource type="Script" path="res://Textures/Icons/Script Icons/Scripts/CameraIcon_SCRIPT.gd" id="2_37tst"]
55
[ext_resource type="Texture2D" uid="uid://tmqrfb1atg1j" path="res://Textures/Crosshairs/Expland_Crosshair.png" id="2_606ex"]

Scenes and Scripts/Scenes/Player/Player_SCRIPT.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -578,4 +578,4 @@ func _on_start_debugging_btn_pressed() -> void:
578578

579579
######################################
580580
# Playground
581-
######################################
581+
######################################

Scenes and Scripts/Scenes/World/world_SCRIPT.gd

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
saveData(# ============================================================= #
1+
# ============================================================= #
22
# world_SCRIPT.gd
33
# ============================================================= #
44
# COPYRIGHT NOTICE #
@@ -33,7 +33,6 @@ saveData(# ============================================================= #
3333
# For inquiries, contact: #
3434
3535
# ============================================================= #
36-
3736
@icon("res://Textures/Icons/Script Icons/32x32/world.png")
3837
extends Node3D
3938

Scenes and Scripts/Singletons/Global.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
3535
# ============================================================= #
3636

37-
extends Node
37+
extends Node

Scenes and Scripts/Singletons/Save and Load/PlayerData.gd

+2-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const SAVE_PATH = "res://player.dat"
4141
var GAME_STATE = "NORMAL"
4242
var Health := 100
4343

44-
func SaveData() -> void:
44+
func saveData() -> void:
4545
var player = get_node("/root/World/Player")
4646
var playerHead = get_node("/root/World/Player/Head")
4747
var playerCamera = get_node("/root/World/Player/Head/Camera3D")
@@ -63,7 +63,7 @@ func SaveData() -> void:
6363
printerr("[PlayerData] Player node not found. SaveData failed.")
6464

6565

66-
func LoadData() -> void:
66+
func loadData() -> void:
6767
var file = FileAccess.open(SAVE_PATH, FileAccess.READ)
6868
if not file:
6969
push_warning("[PlayerData] File doesn't exist (" + SAVE_PATH + ")")
@@ -104,4 +104,3 @@ func LoadData() -> void:
104104
THIS MEANS THAT YOUR SCENE NEEDS A ROOT NODE CALLED 'World'
105105
AND THE PLAYER NEEDS TO BE A CHILD OF THAT ROOT NODE AND CALLED 'Player'.")
106106
file.close()
107-

Scenes and Scripts/Singletons/Save and Load/PlayerSettingsData.gd

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var music_Volume = 1
4343
var sfx_Volume = 1
4444
var Master_Volume = 1
4545

46-
func SaveSettings() -> void:
46+
func saveSettings() -> void:
4747
var file = FileAccess.open(SAVE_PATH, FileAccess.WRITE)
4848
var data = {
4949
"sfx_Volume" : sfx_Volume,
@@ -55,7 +55,7 @@ func SaveSettings() -> void:
5555
file.store_line(jstr)
5656
print("[PlayerSettingsData] --Saved Player Settings--")
5757

58-
func LoadSettings() -> void:
58+
func loadSettings() -> void:
5959
var file = FileAccess.open(SAVE_PATH, FileAccess.READ)
6060
if not file:
6161
push_warning("[PlayerSettingsData] File doesn't exist (" + SAVE_PATH + ")")

Scenes and Scripts/Singletons/Save and Load/SaveManager.gd

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
extends Node
3838

3939
func _ready():
40-
PlayerData.LoadData()
41-
PlayerSettingsData.LoadSettings()
40+
PlayerData.loadData()
41+
PlayerSettingsData.loadSettings()
4242

4343
func saveAllData():
4444
PlayerData.saveData()

0 commit comments

Comments
 (0)