betalars
/
frame-of-mind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve fixme #148 remove redundant dnd workaround resolved by stage handling by now

This commit is contained in:
betalars 2025-05-07 19:36:35 +02:00
parent 6115eb6438
commit 8d607e5c89
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/base-environments/youth_room/room_handle.gd
View File

@ -49,16 +49,3 @@ func _on_scene_finished(id: int, _repeat:bool):
return return
save_game.mementos_complete &= 1 << id save_game.mementos_complete &= 1 << id
save_room() save_room()
#FIXME forgot to comment what this means, just marking it for removal
var fixed := false
func hotfix(_discard):
print("meep")
if not fixed:
await get_tree().create_timer(0.1).timeout
State.take_stage($logic/PlayerController, true)
fixed = true
dnd = false
var dnd: bool

3
src/logic-scenes/card_picker/card_picker.gd
View File

@ -204,7 +204,6 @@ func transition():
for card in output: for card in output:
out_str.append(card.text if card.text != "" else "void") out_str.append(card.text if card.text != "" else "void")
cards_picked.emit(out_str) cards_picked.emit(out_str)
get_parent().get_parent().get_parent().dnd = false
selection_state = DONE selection_state = DONE
Scenes.end_current_sequence() Scenes.end_current_sequence()
@ -232,8 +231,6 @@ func pick_cards(id: int, repeat: bool):
selection_state = CARDS selection_state = CARDS
else: else:
Scenes.end_current_sequence() Scenes.end_current_sequence()
#FIXME this workaround should be included in the Scene Manager.
get_parent().get_parent().get_parent().dnd = false
func play_scene(_id, _repeat): func play_scene(_id, _repeat):
pass pass

2
src/logic-scenes/player_controller/player_controller.gd
View File

@ -165,7 +165,7 @@ func _handle_mouse_input(event:InputEventMouseMotion):
current_mouse_rotation = event.relative current_mouse_rotation = event.relative
func _input(event:InputEvent): func _input(event:InputEvent):
if get_parent().get_parent().dnd: return if Scenes.current_sequence != -1: return
if has_stage and Scenes.current_sequence == -1: if has_stage and Scenes.current_sequence == -1:
if event is InputEventMouseMotion and Input.mouse_mode == Input.MOUSE_MODE_CAPTURED: if event is InputEventMouseMotion and Input.mouse_mode == Input.MOUSE_MODE_CAPTURED:
_handle_mouse_input(event) _handle_mouse_input(event)