diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/makefile | 33 | ||||
| -rw-r--r-- | client/system/settings.gd | 2 |
2 files changed, 1 insertions, 34 deletions
diff --git a/client/makefile b/client/makefile deleted file mode 100644 index 281ea431..00000000 --- a/client/makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, version 3 of the License only. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. -# -GODOT = godot - -.PHONY: assets clean all -all: .godot/import-finished icons/adaptive-background.png icons/adaptive-foreground.png - -clean: - rm -f menu/book/book_*.webp - rm -f icons/adaptive-foreground.png icons/adaptive-background.png - rm .godot/import-finished - -.godot/import-finished: - if test ! -e $@; then $(GODOT) --headless --import project.godot; fi - touch $@ - -icons/adaptive-background.png: - ffmpeg -f lavfi -i "color=color=#E28142,scale=432x432" -frames:v 1 -y $@ -icons/adaptive-foreground.png: icons/main.png - ffmpeg -f image2 -i $< -vf "scale=280x280,pad=432:432:(ow-iw)/2:(oh-ih)/2:0x00000000" -frames:v 1 -y $@ diff --git a/client/system/settings.gd b/client/system/settings.gd index 70c6b505..12b14857 100644 --- a/client/system/settings.gd +++ b/client/system/settings.gd @@ -137,7 +137,7 @@ static func hook_changed(key: String, slot, callable: Callable): slot.tree_exiting.connect(_unhook_changed.bind(key, slot_id), CONNECT_ONE_SHOT) elif slot is String: slot_id = slot.hash() - else: + else: push_error("hook_changed called with invalid slot") return if not change_hooks.has(key): change_hooks[key] = {} |