-
-
Notifications
You must be signed in to change notification settings - Fork 402
Rework New Game, Load Game and Editor menus #9856
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clang-Tidy
found issue(s) with the introduced code (1/1)
@ihhub and @Districh-ru. This PR ended up becoming huge due to the changes necessary and so much dialog stuff being interconnected. I'd appreciate it if you could have a look, especially at the changes concerning game modes and whether this should be changed or reverted. Thanks! |
Hi @zenseii, you did a great work! |
As I can see, this PR will close #7100 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @zenseii, all menus works as expected.
I like how you combined the main and editor menu.
I left two comments, could you please take a look in your spare time?
Also what do you think of making the behavior for Campaign and Multi-player menus act like in Editor: to have BACK button instead of CANCEL?
It will be different from the original game but IMHO more convenient: You open the New Game or Load Game menu and CANCEL actually returns you back the Main Menu. So I suggest to do the same action for the other menus - just return back one step.
And, yes, we can do this in a new PR after we discuss the need of such change.
Thanks for the review, @Districh-ru !
I actually considered this too, and I'm not against looking at it in a separate PR/discussion. I didn't do it in this PR because I felt it was safer to change the editor menu because player's aren't so familiar with that originally as they are with the game. One thought I've been having with the use of the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @zenseii, I rechecked the code and found one more place where we could slightly optimize the code. Could you please take a look when you have time?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
I am moving this pull request to the next release. |
Hi @zenseii , since we made Interface independent windows in the Main Menu should we add back an option to change Interface Type? Of course it can be done in a separate pull request. |
@ihhub, I would definitely like to have the interface option in the main menu settings. I suppose we would need to add an option together with it to match the column and rows? Another PR for it makes sense. |
Hi @zenseii , yes we would need to add one more option to expand the window to have 3x3 option grid. |
@zenseii , thank you so much for these changes! |
Close #7100
Part of #9552 and #1893
This PR moves these dialogs over to
StandardWindow
to allow for Evil interface, variable size buttons for translations, and improved shadows. A lot of tidying has been done too.The rationale for merging all the dialog states into one
StandardWindow
was to remove repeated code and unnecessary render and draw calls. All these separate dialogs were basically doing the same thing, just with different buttons.This should also make it easier when implementing the original animating background of the lamps in the main menu (they should animate even with dialogs opened).
Battle only is now opened without having to press Hot Seat first, because I didn't see how that is relevant when battle only defaults to player vs ai and there is no distinct plan for network play for battle only.
Notes on some changes/decisions:
BUTTONS_NEW_GAME_MENU_GOOD
because they need to have the same dimensions.