Merge branch 'master' into 1.19-VB-galley-20241128

.clang-tidy

@@ -0,0 +1,4 @@
+---
+Checks:          '-*,modernize-use-nullptr'
+WarningsAsErrors: true
+...

.github/workflows/ci-main.yml

@@ -90,10 +90,15 @@ jobs:
                 scons "$@" build="$CFG" ctool="$CC" cxxtool="$CXX" cxx_std="$CXX_STD" \
                   extra_flags_config="-pipe" forum_user_handler=true \
                   nls=false enable_lto="$LTO" system_lua="$SYS_LUA" force_color=true \
-                  jobs=2 --debug=time glibcxx_debug=true glibcxx_assertions=true
+                  jobs=2 --debug=time glibcxx_debug=true glibcxx_assertions=true compile_db=true
               }
               build strict=true wesnoth boost_unit_tests
 
+              build cdb
+              # disable all warnings since we have coverage on them in a standard build, and clang-tidy
+              # triggers false positive compiler warnings that clang itself won't
+              run-clang-tidy -use-color -j 2 -extra-arg="-w" '^(?!.*src/modules/|.*build/)'
+
               apt remove -y -qq libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev
 
               build strict=false wesnothd campaignd
@@ -104,7 +109,7 @@ jobs:
                 cmake "$@" -DCMAKE_BUILD_TYPE="$CFG" -DCXX_STD="$CXX_STD" \
                   -DEXTRA_FLAGS_CONFIG="-pipe" -DENABLE_MYSQL=true \
                   -DENABLE_NLS=false -DENABLE_LTO="$LTO" -DFORCE_COLOR_OUTPUT=true -DLTO_JOBS=2 \
-                  -DENABLE_SYSTEM_LUA="$SYS_LUA" .
+                  -DENABLE_SYSTEM_LUA="$SYS_LUA -DCLANG_TIDY=true" .
               }
               rm -R /usr/local/lib/cmake
               rm /usr/local/lib/libboost*

.gitignore

@@ -127,6 +127,7 @@ wesnoth.plg
 *.exe
 *.dll
 *.so
+compile_commands.json
 
 # library files
 .libs

CMakeLists.txt

@@ -171,6 +171,7 @@ option(GLIBCXX_ASSERTIONS "Whether to define _GLIBCXX_ASSERTIONS" OFF)
 option(GLIBCXX_DEBUG "Whether to define _GLIBCXX_DEBUG and _GLIBCXX_DEBUG_PEDANTIC. Requires a version of Boost's program_options that's compiled with __GLIBCXX_DEBUG too." OFF)
 option(ENABLE_POT_UPDATE_TARGET "Enables the tools to update the pot files and manuals. This target has extra dependencies." OFF)
 option(FORCE_COLOR_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
+option(CLANG_TIDY "Enable clang-tidy linter checks." OFF)
 
 if(UNIX AND NOT APPLE AND NOT CYGWIN)
 	option(ENABLE_NOTIFICATIONS "Enable Window manager notification messages" ON)
@@ -255,6 +256,11 @@ if(NOT MSVC)
 		endif()
 	endif()
 
+### Enable clang-tidy linting
+	if (CLANG_TIDY)
+		set(CMAKE_CXX_CLANG_TIDY "clang-tidy -Wno-unknown-warning-option")
+	endif()
+
 ### Set the final compiler flags.
 
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} ${CXX_FLAGS_USER}")

SConstruct

@@ -120,6 +120,7 @@ opts.AddVariables(
     BoolVariable("OS_ENV", "Forward the entire OS environment to scons", False),
     BoolVariable("history", "Clear to disable GNU history support in lua console", True),
     BoolVariable('force_color', 'Always produce ANSI-colored output (GNU/Clang only).', False),
+    BoolVariable('compile_db', 'Produce a compile_commands.json file.', False),
     )
 
 #
@@ -189,6 +190,11 @@ if env['distcc']:
 
 if env['ccache']: env.Tool('ccache')
 
+if env['compile_db']:
+    env.Tool('compilation_db')
+    cdb = env.CompilationDatabase()
+    Alias('cdb', cdb) 
+
 boost_version = "1.67"
 
 def SortHelpText(a, b):

changelog.md

@@ -1,18 +1,29 @@
-## Version 1.19.5+dev
+## Version 1.19.6+dev
 ### Add-ons client
-   * The Add-ons client now supports UI Theme type add-ons (id 'theme').
 ### Add-ons server
+### Campaigns
+### Editor
+### Multiplayer
+### Lua API
+### Packaging
+### Terrain
+### Translations
+   * Updated translations: Bengali, British English, Italian
+### Units
+### User interface
+### WML Engine
+### Miscellaneous and Bug Fixes
+
+## Version 1.19.6
+### Add-ons client
+   * The Add-ons client now supports UI Theme type add-ons (id 'theme').
 ### Campaigns
    * Son of the Black-Eye
      * Allowed Saurian Skirmishers to advance into Saurian Spearthrower.
    * The Hammer of Thursagan
      * Added Achievements.
-### Editor
 ### Multiplayer
    * OOS-bugs have been fixed.
-### Lua API
-### Packaging
-### Terrain
 ### Translations
    * Updated translations: Arabic, Bengali, British English, Chinese (Simplified), Czech, German, Hungarian, Norwegian, Turkish
 ### Units
@@ -32,6 +43,8 @@
    * An entry for accessing the Add-ons Manager has been added to the Campaign Selection dialog.
    * Help Browser now has a checkbox for showing/hiding the contents list in low-resolution systems (800x600 or less).
    * It is now possible to select text in MP Lobby chat and Gamestate Inspector via mouse drag.
+   * Switched default Pango/Cairo backend from CoreText to Fontconfig on macOS to fix issues with certain fonts such as Oldania ADF Std being unrecognized on current OS versions (issue #8488).
+   * More titlescreen images have been added.
 ### WML Engine
    * Add a [remove_specials] tag in [effect] to be able to remove specials with other criteria than the id (type of the special, active_on, apply_to or other attributes).
    * Add [filter_special] to [has_attack/filter_weapon] in order to simultaneously check specials with id and type, and/or other attributes.

data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Interlude.cfg

@@ -485,6 +485,7 @@
                 [/set_achievement]
             [/then]
         [/if]
+        {HERODEATH_ADDOGIN}
     [/event]
 
     [event]

data/campaigns/Eastern_Invasion/scenarios/04b_Ill_Humors.cfg

@@ -801,7 +801,7 @@
             [else]
                 [gold]
                     side=1
-                    amount=-50
+                    amount=-$gold_cost
                 [/gold]
                 [sound]
                     name=gold.ogg
@@ -884,7 +884,7 @@
             [else]
                 [gold]
                     side=1
-                    amount=-150
+                    amount=-$gold_extra
                 [/gold]
                 [sound]
                     name=gold.ogg
@@ -1008,7 +1008,7 @@
             [/status]
         [/modify_unit]
 
-        {CLEAR_VARIABLE gold,gold_cost,herbs_needed,herb_locations}
+        {CLEAR_VARIABLE gold,gold_cost,gold_extra,herbs_needed,herb_locations}
     [/event]
 
     [event]

data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg

@@ -1862,5 +1862,6 @@ Your punishment is death."
     {HERODEATH_TERRAENT}
     {HERODEATH_DOLBURRAS}
     {HERODEATH_GRUG}
+    {HERODEATH_ADDOGIN}
     {HERODEATH_HAHID}
 [/scenario]

data/core/units.cfg

@@ -293,7 +293,7 @@ Saurians live spectacularly short lives by comparison to most of the other races
         help_taxonomy=mechanical
         name= _ "race^Ship"
         plural_name= _ "race+plural^Ships"
-        description= _ "Ships are not living beings, but they are crafted and (usually) controlled by living beings.  Although inanimate objects, they are very dear to their masters, needing care and attention in return for providing sustenance and protection.  For this reason, most are given names and attributed traits.  Those traits may be technical or they may simply reflect the collective attitude of the crew, but they are real."
+        description= _ "Ships are not living beings, but they are crafted and (usually) controlled by living beings. Although inanimate objects, they are very dear to their masters, needing care and attention in return for providing sustenance and protection. For this reason, most are given names and attributed traits. Those traits may be technical or they may simply reflect the collective attitude of the crew, but they are real."
         num_traits=2
         ignore_global_traits=yes
         {TRAIT_MECHANICAL}

data/core/units/boats/Derelict_Galleon.cfg

@@ -15,7 +15,7 @@
     {AMLA_DEFAULT}
     cost=10
     usage=null
-    description= _ "Derelicts are abandoned wrecks that continue to drift across the seas.  Most are merely ruined ships that will soon sink, but there are tales of others that haunt certain waterways for generations."
+    description= _ "Derelicts are abandoned wrecks that continue to drift across the seas. Most are merely ruined ships that will soon sink, but there are tales of others that haunt certain waterways for generations."
     # we put the sprite on a non-primary frame group so we don't need to worry about effects
     # like submerge or making the ellipse bob
     [standing_anim]

data/core/units/boats/Fireship.cfg

@@ -15,7 +15,7 @@
     {AMLA_DEFAULT}
     cost=10
     usage=null
-    description= _ "Fireships are generally derelict or doomed ships set ablaze to create chaos in one last act of belligerence.  Their main hazard is fiery collision, but they also shed burning embers.  Sometimes they have a skeleton crew to guide them, but often they just drift along on unseen winds and currents."
+    description= _ "Fireships are generally derelict or doomed ships set ablaze to create chaos in one last act of belligerence. Their main hazard is fiery collision, but they also shed burning embers. Sometimes they have a skeleton crew to guide them, but often they just drift along on unseen winds and currents."
     # we put the sprite on a non-primary frame group so we don't need to worry about effects
     # like submerge or making the ellipse bob
     [standing_anim]

data/core/units/boats/Galleon.cfg

@@ -8,7 +8,7 @@
     image="units/transport/galleon.png"
     # ideally, we have "crew" that make sense for dialogs, and "mechanical" that depicts the transport
     # but for now, we just have "crew"
-    # small_profile="portraits/transport/mechanical-galleon.png"
+    # small_profile="portraits/transport/mechanical-galleon.webp"
     profile="portraits/transport/crew-galleon.webp"
     hitpoints=1
     movement_type=float

data/core/units/boats/Transport_Galleon.cfg

@@ -6,7 +6,7 @@
     image="units/transport/transport-galleon.png"
     # ideally, we have "crew" that make sense for dialogs, and "mechanical" that depicts the transport
     # but for now, we just have "crew"
-    # small_profile="portraits/transport/mechanical-transport-galleon.webp"
+    # small_profile="portraits/transport/mechanical-transport_galleon.webp"
     profile="portraits/transport/crew-transport_galleon.webp"
     hitpoints=30
     movement_type=ship

data/core/units/dwarves/Miner.cfg

@@ -4,7 +4,7 @@
     name= _ "Dwarvish Miner"
     race=dwarf
     image=units/dwarves/miner.png
-    hitpoints=22
+    hitpoints=25
     movement_type=dwarvishfoot
     [resistance]
         blade=90
@@ -15,7 +15,7 @@
     level=0
     alignment=neutral
     advances_to=Dwarvish Fighter,Dwarvish Guardsman
-    experience=24
+    experience=20
     cost=11
     usage=fighter
     description= _ "Dwarvish Miners are the grunt workers of dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts. Despite their lack of military training, their weighty pickaxes can deal substantial damage."

data/gui/themes/default/widget/rich_label_default.cfg

@@ -20,6 +20,8 @@
 		max_width = 0
 		max_height = 0
 
+		text_font_color_enabled = {FONT_COLOR_ENABLED}
+		text_font_color_disabled = {FONT_COLOR_DISABLED}
 		text_font_family = {FONT_FAMILY}
 		text_font_size = {FONT_SIZE}
 		text_font_style = {FONT_STYLE}
@@ -51,17 +53,17 @@
 		({FONT_FAMILY})
 		({GUI_FONT_SIZE_{FONT_SIZE}})
 		({FONT_STYLE})
-		({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}  ALPHA=""})
-		({GUI__FONT_COLOR_DISABLED__{FONT_COLOR} ALPHA=""})
+		({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}  ALPHA="255"})
+		({GUI__FONT_COLOR_DISABLED__{FONT_COLOR} ALPHA="255"})
 	}
 
 	{_GUI_RESOLUTION
 		({GUI_BIG_RESOLUTION})
 		({FONT_FAMILY})
 		({GUI_SCALE_RESOLUTION {GUI_FONT_SIZE_{FONT_SIZE}}})
 		({FONT_STYLE})
-		({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}  ALPHA=""})
-		({GUI__FONT_COLOR_DISABLED__{FONT_COLOR} ALPHA=""})
+		({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}  ALPHA="255"})
+		({GUI__FONT_COLOR_DISABLED__{FONT_COLOR} ALPHA="255"})
 	}
 
 [/rich_label_definition]

data/languages/ar_AR.cfg

@@ -4,5 +4,5 @@
     locale=ar_AR
     alternates=ar_AE, ar_BH, ar_DZ, ar_EG, ar_IN, ar_IQ, ar_JO, ar_KW, ar_LB, ar_LY, ar_MA, ar_OM, ar_QA, ar_SA, ar_SD, ar_SY, ar_TN, ar_YE
     dir=rtl
-    percent=91
+    percent=93
 [/locale]

data/languages/bg_BG.cfg

@@ -2,5 +2,5 @@
     name="Български (Bulgarski)"
     sort_name = "Bulgarski"
     locale=bg_BG
-    percent=56
+    percent=55
 [/locale]

data/languages/bn_BD.cfg

@@ -3,5 +3,5 @@
     sort_name="Bengali"
     locale=bn_BD
     alternates=bn_IN
-    percent=62
+    percent=63
 [/locale]

data/languages/ca_ES.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Català"
     locale=ca_ES
-    percent=75
+    percent=74
 [/locale]

data/languages/cs_CZ.cfg

@@ -2,5 +2,5 @@
     name="Čeština"
     sort_name = "Cestina"
     locale=cs_CZ
-    percent=97
+    percent=98
 [/locale]

data/languages/de_DE.cfg

@@ -2,5 +2,5 @@
     name="Deutsch"
     locale=de_DE
     alternates=de_LI, de_LU, de_CH, de_AT
-    percent=95
+    percent=94
 [/locale]

data/languages/en_GB.cfg

@@ -2,5 +2,5 @@
     name="English (GB)"
     locale=en_GB
     alternates=en_AG, en_AU, en_BW, en_IE, en_IN, en_NG, en_NZ, en_SG, en_ZA, en_ZW
-    percent=97
+    percent=99
 [/locale]

data/languages/es_ES.cfg

@@ -2,5 +2,5 @@
     name="Español"
     locale=es_ES
     alternates=es_AR, es_BO, es_CL, es_CO, es_CR, es_DO, es_EC, es_GT, es_HN, es_MX, es_NI, es_PA, es_PE, es_PR, es_PY, es_SV, es_US, es_UY, es_VE
-    percent=90
+    percent=89
 [/locale]

data/languages/fr_FR.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Français"
     locale=fr_FR
-    percent=94
+    percent=93
 [/locale]

data/languages/grc_GR.cfg

@@ -2,5 +2,5 @@
     name="Ἀρχαία Ἑλληνική (Archaia Hellēnikē)"
     sort_name = "Archaia Hellēnikē"
     locale=grc_GR
-    percent=4
+    percent=3
 [/locale]

data/languages/hu_HU.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Magyar"
     locale=hu_HU
-    percent=67
+    percent=78
 [/locale]

data/languages/id_ID.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Bahasa Indonesia"
     locale=id_ID
-    percent=44
+    percent=43
 [/locale]

data/languages/la_IT.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Latina"
     locale=la_IT
-    percent=38
+    percent=37
 [/locale]

data/languages/nb_NO.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Norsk bokmål"
     locale=nb_NO
-    percent=63
+    percent=69
 [/locale]

data/languages/nl_NL.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Nederlands"
     locale=nl_NL
-    percent=84
+    percent=83
 [/locale]

data/languages/pt_BR.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Português do Brasil"
     locale=pt_BR
-    percent=87
+    percent=86
 [/locale]

data/languages/pt_PT.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Português"
     locale=pt_PT
-    percent=67
+    percent=66
 [/locale]

data/languages/racv.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Idioma de la RACV"
     locale=racv
-    percent=25
+    percent=24
 [/locale]

data/languages/sv_SE.cfg

@@ -1,5 +1,5 @@
 [locale]
     name="Svenska"
     locale=sv_SE
-    percent=76
+    percent=75
 [/locale]