[ci skip]
Also fixed the campaign icon to use the new Kaleh sprite instead of the old one.
(cherry-picked from commit 1068ca128c0e50f09cfc77effafde98aa678b251)
This reverts afaa75842c8914406bed75d3557ec241b0de9b6a and replaces it with a more general
no-assert-during-events check. This is because there are other instances besides [inspect]
where this function can be called mid-event, and it wouldn't be convenient to add nested
'strict' parameters to multiple functions just to handle them.
Fixes#2750.
(cherry-picked from commit a1810bde32a95ae00827b5db5ac08f63d9907acb)
Fixes#2861.
Also changed the logic for when the "min to max" label is shown from != to >.
(cherry-picked from commit a4dd74c32afb2f6c37453eafb60f60b8b215df01)
SDL_TEXTINPUT events aren't generated on Windows when Alt is held down.
Let's ensure that the behavior is the same on all platforms.
(cherry-picked from commit c42401a8deb92acc16039fbeed0acf16287e286c)
I also updated the filenames for the images, changed the recommended
format for screenshots other than "fullscreen" screenshots to PNG,
and removed the (no longer true) claim that the example places to create
the screenshots match where the English screenshots were taken.
Resolves#2856.
[ci skip]
(cherry-picked from commit 134a51204b730ff2123e2af5b19f1fae58aa0515)
It's currently calculated from x,y and w,h, but with the switch to shaders
this situation could be reversed to calculate x,y from u,v and w,h
(cherry-picked from commit 46c46b5548e1c02179a32b43f5d77696cbb68a9c)
I had been unconditionally selecting the first entry after setting the active
sorting option. This overrode the previous unit selection.
Regression from 6b52d16faedaf6499f4777ed8156b1eaa09ab554.
(cherry-picked from commit ccce10511a2e74e23448e54e652874711bf6bad8)
This gives greater consistency between similar APIs, and allows macros
intended to drop a map into [scenario] to also work in [replace_map].
(cherry-picked from commit c62a4820fcab36e3c556f698d60e1afa9d242f84)
The problem with them is that the "libraries" into which Wesnoth is split
have circular dependencies, and linking of the game succeeds only by chance
(everything just happens to be used by the time the linker encounters it).
Fixed by allowing the linker to use multiple passes over the libraries
until all references are resolved.
(cherry-picked from commit e7ed3cbbb9ad474f2f89137fceece946eaa95e81)
3783693cbe95be6c51553dfa71bf0ecd5ed8116f was a general rename of
'V' to 'vars', and this line was missed. It caused an error at the
start of S09.
[ci skip]
(cherry-picked from commit 2b406a37ec009e4a13251035267356b4d82ab1f1)
This changes:
utf8::char_t -> char
utf8::string -> std::string
utf16::char_t -> char16_t
utf16::string -> std::u16string
ucs4::char_t -> char32_t
ucs4::string -> std::u32string
utf16::string and ucs4::string are now proper strings instead of vectors of characters too.
In order to get this change to compile at all, I needed to add a ucs4_convert_impl::convert_impl
specialization for wchar_t alongside the new char16_t specialization; both point to the same
conversion implementation type.
This commit doesn't do any additional cleanup. I'm sure if we looked, we could get rid of a
lot of the custom conversion code and probably a bunch of stuff that might have had to do with
supporting utf16::string and ucs4::string being vectors instead of basic_string specializations.
Either way, I don't know the code (or encoding handling in general) to make a call as to what's
needed or not. I'll let someone else do that.
(cherry-picked from commit 1deacd89f640e1ddada75e1286c14a09ab8cce62)
They're still in the game_config namespace but are now in a more logical header.
game_config::version has been replaced with wesnoth_version.str(), save for one case
where it was replaced with wesnoth_version directly (it was a comparison against another
version_info object; no need to compare against a string...).
Also cleaned up a bunch of game_config.hpp includes.
(cherry-picked from commit b8d051cb72e51682d0fc41a3a37442ed7ecb553d)
See https://forums.wesnoth.org/viewtopic.php?p=625159#p625159
Since this problem can also be solved with make_neutral_surface, and is_neutral already
check a surface's alpha mask, I moved the is-not-indexed check to is_neutral and made use
of it for the on-load standardization check.
(cherry-picked from commit 6babb773d2319625a5b7def241fc0f9e4921db42)