[wesnoth-commits] [wesnoth/wesnoth] fbe6b3: When writing WML, output preprocessor-safe strings

Celtic Minstrel noreply at github.com
Tue Aug 17 02:36:00 UTC 2021


  Branch: refs/heads/celmin-backports
  Home:   https://github.com/wesnoth/wesnoth
  Commit: fbe6b373aa9684993429a332fb944259435b3145
      https://github.com/wesnoth/wesnoth/commit/fbe6b373aa9684993429a332fb944259435b3145
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/serialization/parser.cpp

  Log Message:
  -----------
  When writing WML, output preprocessor-safe strings

Basically, this means that the output will parse to the original value even if run through the preprocessor.


  Commit: 6c51c9316b67a9cd8a6892702131244f0380b200
      https://github.com/wesnoth/wesnoth/commit/6c51c9316b67a9cd8a6892702131244f0380b200
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/utils/optional_reference.hpp

  Log Message:
  -----------
  Make optional_reference bool conversion explicit

If this is non-explicit, then the following code:

optional_reference<config> ref = ...;
auto str = ref["key"]

results in ref being converted to bool and used as an index into the key string.


  Commit: 727a201e851db466a948b152abaa20303bd12962
      https://github.com/wesnoth/wesnoth/commit/727a201e851db466a948b152abaa20303bd12962
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/serialization/preprocessor.cpp

  Log Message:
  -----------
  Include deprecation info in preprocess-output-macros file


  Commit: f98a42e78296612b2ed64692e16277135abeca51
      https://github.com/wesnoth/wesnoth/commit/f98a42e78296612b2ed64692e16277135abeca51
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/serialization/preprocessor.cpp
    M src/serialization/preprocessor.hpp

  Log Message:
  -----------
  Include optional arguments in preprocess-output-macros file

Fixes #4697


  Commit: 2aa6bc6a788245f39f7d2088e8555fd27fae085c
      https://github.com/wesnoth/wesnoth/commit/2aa6bc6a788245f39f7d2088e8555fd27fae085c
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/serialization/preprocessor.cpp

  Log Message:
  -----------
  fix whitespace


  Commit: 9ede6c25383ff1558fb7174de7c4f4545122d04a
      https://github.com/wesnoth/wesnoth/commit/9ede6c25383ff1558fb7174de7c4f4545122d04a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M data/schema/ai/stage.cfg

  Log Message:
  -----------
  Schema: Add [candidate_action][filter_own]


  Commit: 14a661b5e2b6c27b831424587813e2038f0093cb
      https://github.com/wesnoth/wesnoth/commit/14a661b5e2b6c27b831424587813e2038f0093cb
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/ai/lua/engine_lua.cpp

  Log Message:
  -----------
  AI: Fix missing serialization code for sticky candidate actions


  Commit: 6474d151041c674c686b110a796f231a11046c67
      https://github.com/wesnoth/wesnoth/commit/6474d151041c674c686b110a796f231a11046c67
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M data/lua/ilua.lua

  Log Message:
  -----------
  Lua: Fix console pretty-print output not showing zero or negative keys in tables


  Commit: a697bbe2b3176e0057bd6769b9daed11133affbf
      https://github.com/wesnoth/wesnoth/commit/a697bbe2b3176e0057bd6769b9daed11133affbf
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/ai/lua/engine_lua.cpp

  Log Message:
  -----------
  Lua AI: Fix non-integer candidate evaluation scores being treated as 0


  Commit: 5ebe239063025082d7fb59d7becafdf4d4e1faa3
      https://github.com/wesnoth/wesnoth/commit/5ebe239063025082d7fb59d7becafdf4d4e1faa3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/ai/actions.cpp
    M src/ai/actions.hpp

  Log Message:
  -----------
  AI: Fix assertion when trying to move to an off-map location

This could, for example, be triggered using ai.move().


  Commit: b7a7a82092f90597f8b336d8b6b4a9963ef03106
      https://github.com/wesnoth/wesnoth/commit/b7a7a82092f90597f8b336d8b6b4a9963ef03106
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Lua API: Fix an incorrect error message


  Commit: 7046044b9ffd2c58503462ad7b3f24e3ac42620a
      https://github.com/wesnoth/wesnoth/commit/7046044b9ffd2c58503462ad7b3f24e3ac42620a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M data/lua/core/map.lua

  Log Message:
  -----------
  Lua API: Fix an error in the terrain hex API

Attempting to access a non-string key was an error.


  Commit: 79db2d83dd90c44247bde46cd0e9feadd6ab66c0
      https://github.com/wesnoth/wesnoth/commit/79db2d83dd90c44247bde46cd0e9feadd6ab66c0
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-08-16 (Mon, 16 Aug 2021)

  Changed paths:
    M data/lua/functional.lua

  Log Message:
  -----------
  Lua API: Fix functional.map returning the wrong answer if used on a table that contains numeric keys but is not strictly an array


Compare: https://github.com/wesnoth/wesnoth/compare/79ab9625630e...79db2d83dd90



More information about the Commits mailing list