Skip to content

Commit 679bf92

Browse files
authored
Merge pull request #40 from endlessm/push-upqxypskstuv
Miscellaneous cleanups to setters
2 parents df6da14 + e2dbce7 commit 679bf92

3 files changed

Lines changed: 7 additions & 12 deletions

File tree

components/enemy/enemy.gd

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ var direction: int
2929

3030
func _set_speed(new_speed):
3131
speed = new_speed
32-
if not is_node_ready():
33-
await ready
34-
if speed == 0:
35-
_sprite.speed_scale = 0
36-
else:
32+
if is_node_ready():
3733
_sprite.speed_scale = speed / 100
3834

3935

scripts/coin.gd

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ extends Area2D
1515

1616

1717
func _set_texture(new_texture: Texture2D):
18-
if not is_node_ready():
19-
await ready
2018
texture = new_texture
19+
20+
if not is_node_ready():
21+
return
22+
2123
if texture != null:
2224
_sprite.texture = texture
2325
else:
@@ -32,6 +34,7 @@ func _set_tint(new_tint: Color):
3234

3335

3436
func _ready():
37+
_set_texture(texture)
3538
_set_tint(tint)
3639

3740

scripts/player.gd

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ func _set_sprite_frames(new_sprite_frames):
8080

8181
func _set_speed(new_speed):
8282
speed = new_speed
83-
if not is_node_ready():
84-
await ready
85-
if speed == 0:
86-
_sprite.speed_scale = 0
87-
else:
83+
if is_node_ready():
8884
_sprite.speed_scale = speed / 500
8985

9086

0 commit comments

Comments
 (0)