mirror of
https://github.com/wesnoth/wesnoth
synced 2025-04-25 08:09:28 +00:00
42baec931c
The previous bugfix fixed a crash when loading savegames with units whose abilities accessed the map while the display_context was still being constructed, however it reintroduced a bug in the scenario editor. Using the unit tool always crashed when adding any unit. This commit uses 4d1fc268b1's code path whenever possible, however it falls back to 6a21fdc675's code path when 4d1fc268b1 would assert. In practise one path is used in game and the other is used in the scenario editor, but doing the logic in this way ensures that any edge cases are going to affect the scenario editor rather than the game itself. Cherry picked from commit 1485cfd6256b73bb06aa34c512c2890749b45487, with conflicts because code from attack_type::weapon_specials() has moved to attack_type::weapon_specials_impl_adj().
This directory is where PR authors can add a file per PR containing the text that should be added to the main changelog.md during the release process for the next version. The format should match that of the main changelog as well as use an existing category defined there. For example, a file could contain:
### Terrain
* Change codes "Irs, Ias, Icr, Ior, and Icn" to "Isr, Isa, Isc, Iwo, and Iwc", respectively
The purpose of this is to make it easier to add changelog entries with a PR while avoiding merge conflicts in the main changelog file if someone ends up merging their PR before yours.
The contents of this directory (aside from this README file) will then be deleted after each release.