[wesnoth-commits] [wesnoth/wesnoth] 3950f4: remove [advancefrom] from mainline

gfgtdf noreply at github.com
Thu Mar 12 18:15:27 UTC 2020


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 3950f40f3f0483032bc70b3e57166bd355acd9fc
      https://github.com/wesnoth/wesnoth/commit/3950f40f3f0483032bc70b3e57166bd355acd9fc
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2020-03-12 (Thu, 12 Mar 2020)

  Changed paths:
    M data/campaigns/Dead_Water/_main.cfg
    M data/campaigns/Dead_Water/units/Kraken.cfg
    M data/campaigns/Legend_of_Wesmere/_main.cfg
    M data/campaigns/Sceptre_of_Fire/_main.cfg
    M data/campaigns/Secrets_of_the_Ancients/_main.cfg
    A data/core/macros/optional_unit_advancements.cfg
    M data/core/units/drakes/Armageddon.cfg
    M data/core/units/dwarves/Arcanister.cfg
    M data/core/units/dwarves/Runesmith.cfg
    M data/core/units/monsters/Wolf_Dire.cfg
    M data/core/units/monsters/Wolf_Great.cfg
    M data/core/units/orcs/Nightblade.cfg
    M data/core/units/trolls/Troll_Shaman.cfg
    M data/core/units/undead/Necro_Ancient_Lich.cfg
    M data/core/units/undead/Skele_Death_Knight.cfg
    M data/core/units/wose/Wose_Shaman.cfg

  Log Message:
  -----------
  remove [advancefrom] from mainline

See issue #3955
the intention is to deprecate [advancefrom] in
favour of [modify_unit_type], because it was a
common source of OOS errors, and it is less flexible.

As a secondary effect this also fixes issue #4402 :
"changing units via extra_defines sometimes not working
because extra_defines had bugs".
Now we no longer use extra_defines for that.

Addon authors should now no longer use these extra_defines,
instead put the new core marcos with the same name directly
into [campaign].


  Commit: 240ca58a378f9b844452ad1e0de0a94eaf5f944d
      https://github.com/wesnoth/wesnoth/commit/240ca58a378f9b844452ad1e0de0a94eaf5f944d
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2020-03-12 (Thu, 12 Mar 2020)

  Changed paths:
    M src/game_config_manager.cpp
    M src/units/types.cpp
    M src/units/types.hpp

  Log Message:
  -----------
  deprecate [advancefrom]

we changed also its implementation to use [modify_unit_type]
instead. This simplifies the implementation.

Now it also can no longer cause OOS if used recklessly.
But the new implementation also might not cover 100% of
its previous usecases, in particular this means that
[advancefrom] now only effects [campaign] within the same
addon. This might sound like it breaks compatability for
addons that have their units in a differnt addon and used
[advancefrom] but most of those would have casued OOS
before, so i think this actually an improvement.


  Commit: c207eeb89913c4ca5cc5bf5b409754f4b341e2ae
      https://github.com/wesnoth/wesnoth/commit/c207eeb89913c4ca5cc5bf5b409754f4b341e2ae
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2020-03-12 (Thu, 12 Mar 2020)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
    M data/core/macros/optional_unit_advancements.cfg
    M data/core/units/dunefolk/Blademaster.cfg
    M data/core/units/humans/Loyalist_General.cfg

  Log Message:
  -----------
  remove last two cases of extra_defines

this converts the optional grand marsal advancement to the
[modify_unit_type] syntax.

Also with this the core cfg files no longer depend on other
macros except EDITOR and the difficulty macros so we could
(if we wanted) optmize it to not load this part of the cfg
again for each campaign.


  Commit: 5c655160cde8a69cdbfa113e2f49a503e1c5a0c5
      https://github.com/wesnoth/wesnoth/commit/5c655160cde8a69cdbfa113e2f49a503e1c5a0c5
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2020-03-12 (Thu, 12 Mar 2020)

  Changed paths:
    M src/game_config_manager.cpp

  Log Message:
  -----------
  imporve deprecation message for [advancefrom]


  Commit: 0de2070461f737d058d1d22d8c2c2d649cd70e70
      https://github.com/wesnoth/wesnoth/commit/0de2070461f737d058d1d22d8c2c2d649cd70e70
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2020-03-12 (Thu, 12 Mar 2020)

  Changed paths:
    M data/schema/core/addons.cfg

  Log Message:
  -----------
  schema updae for [modify_unit_type]


Compare: https://github.com/wesnoth/wesnoth/compare/0b8ec8de68e1...0de2070461f7



More information about the Commits mailing list