Main menu and hero selection screen are now px perfect #17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ui code is moved to the correct file so that it is initialized after the audio. This also rebases effects.cpp on the upstream as this fixes some issues we where having. WinMain has also been rebased.
Lets us much more easily merge upstream
This solves issues for people that have the mpq on read only media.
ghost
merged commit
glebm
added a commit
to glebm/devilutionX
that referenced
this pull request
Mar 23, 2021
Single-player difficulty selection was implemented in a very hacky way.
Documents what's going on there and fixes a memory leak.
Memory leaks that this fixes looked like this:
```
Direct leak of 64 byte(s) in 1 object(s) allocated from:
#0 0x7f435b789f17 in operator new(unsigned long) (/lib/x86_64-linux-gnu/libasan.so.6+0xb1f17)
#1 0x5567766c62b8 in dvl::selgame_GameSelection_Select(int) ../SourceX/DiabloUI/selgame.cpp:163
#2 0x5567766d8ee8 in dvl::selhero_Load_Select(int) ../SourceX/DiabloUI/selhero.cpp:464
#3 0x5567766d6ed1 in dvl::selhero_List_Select(int) ../SourceX/DiabloUI/selhero.cpp:325
#4 0x556776692683 in dvl::UiFocusNavigationSelect() ../SourceX/DiabloUI/diabloui.cpp:396
#5 0x55677669158e in HandleMenuAction ../SourceX/DiabloUI/diabloui.cpp:223
#6 0x5567766917b9 in dvl::UiFocusNavigation(SDL_Event*) ../SourceX/DiabloUI/diabloui.cpp:277
#7 0x556776695dff in dvl::UiPollAndRender() ../SourceX/DiabloUI/diabloui.cpp:626
#8 0x5567766d94ef in UiSelHeroDialog ../SourceX/DiabloUI/selhero.cpp:512
diasurgical#9 0x5567766d997f in dvl::UiSelHeroSingDialog(int (*)(int (*)(dvl::_uiheroinfo*)), int (*)(dvl::_uiheroinfo*), int (*)(dvl::_uiheroinfo*), void (*)(unsigned int, dvl::_uidefaultstats*), int*, char (*) [16], int*) ../SourceX/DiabloUI/selhero.cpp:547
diasurgical#10 0x556776a44f45 in mainmenu_select_hero_dialog ../Source/mainmenu.cpp:98
diasurgical#11 0x5567765f9f15 in SNetInitializeProvider ../SourceX/storm/storm_net.cpp:102
diasurgical#12 0x556776c996b9 in multi_init_single ../Source/multi.cpp:826
diasurgical#13 0x556776c98b1e in NetInit ../Source/multi.cpp:770
diasurgical#14 0x5567767d0c0b in StartGame ../Source/diablo.cpp:375
diasurgical#15 0x556776a4493d in mainmenu_init_menu ../Source/mainmenu.cpp:45
diasurgical#16 0x556776a44c05 in mainmenu_single_player ../Source/mainmenu.cpp:61
diasurgical#17 0x556776a454a9 in mainmenu_loop ../Source/mainmenu.cpp:152
diasurgical#18 0x5567767d2892 in DiabloMain ../Source/diablo.cpp:602
diasurgical#19 0x5567766e3c69 in main ../SourceX/main.cpp:34
diasurgical#20 0x7f435a69ecb1 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x28cb1)
```
AJenbo
pushed a commit
that referenced
this pull request
Mar 23, 2021
Single-player difficulty selection was implemented in a very hacky way.
Documents what's going on there and fixes a memory leak.
Memory leaks that this fixes looked like this:
```
Direct leak of 64 byte(s) in 1 object(s) allocated from:
#0 0x7f435b789f17 in operator new(unsigned long) (/lib/x86_64-linux-gnu/libasan.so.6+0xb1f17)
#1 0x5567766c62b8 in dvl::selgame_GameSelection_Select(int) ../SourceX/DiabloUI/selgame.cpp:163
#2 0x5567766d8ee8 in dvl::selhero_Load_Select(int) ../SourceX/DiabloUI/selhero.cpp:464
#3 0x5567766d6ed1 in dvl::selhero_List_Select(int) ../SourceX/DiabloUI/selhero.cpp:325
#4 0x556776692683 in dvl::UiFocusNavigationSelect() ../SourceX/DiabloUI/diabloui.cpp:396
#5 0x55677669158e in HandleMenuAction ../SourceX/DiabloUI/diabloui.cpp:223
#6 0x5567766917b9 in dvl::UiFocusNavigation(SDL_Event*) ../SourceX/DiabloUI/diabloui.cpp:277
#7 0x556776695dff in dvl::UiPollAndRender() ../SourceX/DiabloUI/diabloui.cpp:626
#8 0x5567766d94ef in UiSelHeroDialog ../SourceX/DiabloUI/selhero.cpp:512
#9 0x5567766d997f in dvl::UiSelHeroSingDialog(int (*)(int (*)(dvl::_uiheroinfo*)), int (*)(dvl::_uiheroinfo*), int (*)(dvl::_uiheroinfo*), void (*)(unsigned int, dvl::_uidefaultstats*), int*, char (*) [16], int*) ../SourceX/DiabloUI/selhero.cpp:547
#10 0x556776a44f45 in mainmenu_select_hero_dialog ../Source/mainmenu.cpp:98
#11 0x5567765f9f15 in SNetInitializeProvider ../SourceX/storm/storm_net.cpp:102
#12 0x556776c996b9 in multi_init_single ../Source/multi.cpp:826
#13 0x556776c98b1e in NetInit ../Source/multi.cpp:770
#14 0x5567767d0c0b in StartGame ../Source/diablo.cpp:375
#15 0x556776a4493d in mainmenu_init_menu ../Source/mainmenu.cpp:45
#16 0x556776a44c05 in mainmenu_single_player ../Source/mainmenu.cpp:61
#17 0x556776a454a9 in mainmenu_loop ../Source/mainmenu.cpp:152
#18 0x5567767d2892 in DiabloMain ../Source/diablo.cpp:602
#19 0x5567766e3c69 in main ../SourceX/main.cpp:34
#20 0x7f435a69ecb1 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x28cb1)
```
kphoenix137
added a commit
to kphoenix137/devilutionX
that referenced
this pull request
Mar 27, 2024
* Adjust mana shield * Adjust mana shield (pt 2)
kphoenix137
added a commit
to kphoenix137/devilutionX
that referenced
this pull request
Mar 31, 2024
* Adjust mana shield * Adjust mana shield (pt 2)
kphoenix137
added a commit
to kphoenix137/devilutionX
that referenced
this pull request
Apr 6, 2024
* Adjust mana shield * Adjust mana shield (pt 2)
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Audio and navigation for main menu are now also correct, but only basic for others menus.