[wesnoth-commits] [wesnoth/wesnoth] 7bf37a: fix game crashing on 'reset replay'

Mon Aug 13 13:28:45 UTC 2018

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 7bf37a1e64388304d583cdaa1fbba97fd61f9658
      https://github.com/wesnoth/wesnoth/commit/7bf37a1e64388304d583cdaa1fbba97fd61f9658
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  fix game crashing on 'reset replay'

fixes #3439

  Commit: 02bed5c0335893542f5f3732ea013ab1ca705c55
      https://github.com/wesnoth/wesnoth/commit/02bed5c0335893542f5f3732ea013ab1ca705c55
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  fix oos when undoing after ally chat

previously the server would send [speak] commands that had no undo=no attributes so that the game would remove the speak command from the replay instead of the actual undoable action when undoing an action.

  Commit: c685031d1c41d89897bbd380b50ef3e02984bcde
      https://github.com/wesnoth/wesnoth/commit/c685031d1c41d89897bbd380b50ef3e02984bcde
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/replay.cpp

  Log Message:
  -----------
  fix oos when undoing after ally chat 2

for extra safety we add code to ensure undo=no for [speak] commands to the client aswell, this is not really needed as i just added a code that sets undo=yes to the server code, but it's an advantage to be able to safely connect to older servers aswell.

  Commit: 7e0d63d7c32b4c280baa63cb60dc32c565ea0eae
      https://github.com/wesnoth/wesnoth/commit/7e0d63d7c32b4c280baa63cb60dc32c565ea0eae
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/server/simple_wml.cpp

  Log Message:
  -----------
  fix segfault in wesnothd

broken in commit 'preserve traslatable strings in simple_wml.'

  Commit: 9a3917dc3518455b0b8fa03f95ea71217a23550c
      https://github.com/wesnoth/wesnoth/commit/9a3917dc3518455b0b8fa03f95ea71217a23550c
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  fix missing map previews in the lobby

regression from 'fix require_scenario & require_era'

  Commit: bd16aeec02ceeeca42b281cfe2bf46a5f3791bca
      https://github.com/wesnoth/wesnoth/commit/bd16aeec02ceeeca42b281cfe2bf46a5f3791bca
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  improve wesnoth version warning 3

suggested by soliton

  Commit: f03e3e8d6df84163f403d5860be7638084bd1481
      https://github.com/wesnoth/wesnoth/commit/f03e3e8d6df84163f403d5860be7638084bd1481
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_join_game.cpp
    M src/gui/dialogs/multiplayer/mp_join_game.hpp

  Log Message:
  -----------
  fix 'start game' locked when other players abort flg dialog #3452

  Commit: 7e2dc296ba2fd3900a46ab3a0bbb120e856e0ada
      https://github.com/wesnoth/wesnoth/commit/7e2dc296ba2fd3900a46ab3a0bbb120e856e0ada
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

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

  Log Message:
  -----------
  boost::ptr_vector -> std::vector<unique_ptr>

boost::ptr_vector has some nice features, but vector<unique_ptr> is still
easier to use for most people basicially becasue people know it better.
Also boost::ptr_vector does not support move ctors and also does not
use std::unique_ptr, probably because it tries to stay compatible with
c++03 so one has to use 'ptr_vector::auto_type' with it instead which
has a different interface than std::unique_ptr

  Commit: 1646a7b90672435551436c1fe272f5546f151ffb
      https://github.com/wesnoth/wesnoth/commit/1646a7b90672435551436c1fe272f5546f151ffb
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

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

  Log Message:
  -----------
  fix game freezes on droiding when using dsu #3453

  Commit: e90f0fce13e74b53dbac92d7a588909948f6a93f
      https://github.com/wesnoth/wesnoth/commit/e90f0fce13e74b53dbac92d7a588909948f6a93f
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/terrain/translation.cpp

  Log Message:
  -----------
  remove outdated code

substr cannot throw bad_lexical_cast

  Commit: 9bb601e2da02b3b627b6673897c67c9c6f67a950
      https://github.com/wesnoth/wesnoth/commit/9bb601e2da02b3b627b6673897c67c9c6f67a950
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/map/map.cpp

  Log Message:
  -----------
  add debug info

  Commit: 8d6524c6e21a4c5bfc99963fe0b95b9f8956f8ce
      https://github.com/wesnoth/wesnoth/commit/8d6524c6e21a4c5bfc99963fe0b95b9f8956f8ce
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/game_state.cpp
    M src/generators/default_map_generator_job.cpp
    M src/map/map.cpp
    M src/terrain/terrain.cpp
    M src/terrain/translation.cpp
    M src/terrain/translation.hpp
    M src/units/animation.cpp

  Log Message:
  -----------
  deploy string_view

  Commit: a3367ee8489608a6fff42a69fb026933571848b7
      https://github.com/wesnoth/wesnoth/commit/a3367ee8489608a6fff42a69fb026933571848b7
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/game_board.cpp
    M src/game_board.hpp
    M src/map/map.cpp
    M src/map/map.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp

  Log Message:
  -----------
  add wesnoth.terrain_mask lua function

`[terrain_mask]` had multiple unexpected behviours, see for example #3364
in parituclar `wesnoth.wml_actions.terrain_mask { x =2, y=2, mask="Ww"}`
will change the tile at (1,2) instead of (2,2), so instead of reusing
the old terrain mask code i wrote a new function that behaves as one
would expect. `wesnoth.terrain_mask` does not have a `border=` parameter
but a `is_odd` parameter that specifies that a map is in the odd format
 __    __
/00\__/20\__
\__/10\__/30\
/01\__/21\__/
\__/11\__/31\
/02\__/22\__/
\__/  \__/

instead of the even map format
    __    __
 __/10\__/30\
/00\__/20\__/
\__/11\__/31\
/01\__/21\__/
\__/12\__/32\
   \__/  \__/

(Monospaced font required to see ascii images.)

The lua function also has a lua interfacte, meaning it does not take wml
tables but normal lua tables making it easier to use from lua code.

  Commit: 6cd9de1202d1f4f90d56ba9b7950aecfc1e5f3f4
      https://github.com/wesnoth/wesnoth/commit/6cd9de1202d1f4f90d56ba9b7950aecfc1e5f3f4
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M src/scripting/game_lua_kernel.cpp
    M src/team.cpp
    M src/team.hpp

  Log Message:
  -----------
  fix villages after terrain_mask

  Commit: 09c56ef2fe40eaec53311918288431256aac63ff
      https://github.com/wesnoth/wesnoth/commit/09c56ef2fe40eaec53311918288431256aac63ff
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    M data/lua/wml-tags.lua
    M src/editor/action/action.cpp
    M src/game_board.cpp
    M src/game_board.hpp
    M src/game_events/action_wml.cpp
    M src/map/map.cpp
    M src/map/map.hpp

  Log Message:
  -----------
  move [terrain_mask] to lua

and implement it using wesnoth.terrain_mask.

This also fixes an issue where [terrain_mask] would not remove
removed villages from the teams villages list after [terrain_mask].

This also adds an alignment parameter to [terrain_mask].

Compare: https://github.com/wesnoth/wesnoth/compare/b1ec52cab84a...09c56ef2fe40
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.