Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement on-show and on-hide for map controls, plus winset parsing fixes #1450

Merged
merged 14 commits into from
Oct 14, 2023

Conversation

amylizzle
Copy link
Contributor

@amylizzle amylizzle commented Sep 2, 2023

Implements the on-show and on-hide winset calls for the map control.

Fixes nested attribute parsing in winset, ie thing.stuff.var=value (previously we could only do thing.stuff=value and deeper references would fail to parse silently).

Slight buff to the robustness of winset parsing also, as it's no longer fragile about whitespace. Previously it would break if there was no space between .winset and the command.

Also refactors the DreamCommandSystem so all verbs run through the DreamInterfaceManager now

@amylizzle amylizzle marked this pull request as ready for review September 3, 2023 16:57
@github-actions
Copy link

github-actions bot commented Sep 8, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

OpenDreamClient/Input/DreamCommandSystem.cs Outdated Show resolved Hide resolved
OpenDreamClient/Interface/DreamInterfaceManager.cs Outdated Show resolved Hide resolved
OpenDreamClient/Interface/Controls/ControlMap.cs Outdated Show resolved Hide resolved
OpenDreamClient/Interface/DreamInterfaceManager.cs Outdated Show resolved Hide resolved
@amylizzle amylizzle requested a review from wixoaGit October 13, 2023 13:23
OpenDreamClient/Interface/InterfaceMacro.cs Outdated Show resolved Hide resolved
OpenDreamClient/Interface/InterfaceMacro.cs Outdated Show resolved Hide resolved
@wixoaGit wixoaGit enabled auto-merge (squash) October 14, 2023 16:23
@wixoaGit wixoaGit merged commit 871f496 into OpenDreamProject:master Oct 14, 2023
4 checks passed
@amylizzle amylizzle deleted the onshowhidemap branch October 14, 2023 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants