[wesnoth-commits] [wesnoth/wesnoth] 9277a6: wb: fix future unit sprite missing

GitHub noreply at github.com
Thu May 3 23:58:37 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9277a6cf537863f9236e1d09b11c64903f50cecc
      https://github.com/wesnoth/wesnoth/commit/9277a6cf537863f9236e1d09b11c64903f50cecc
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/fake_unit_ptr.cpp
    M src/fake_unit_ptr.hpp
    M src/whiteboard/attack.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/side_actions.cpp

  Log Message:
  -----------
  wb: fix future unit sprite missing

fixes #2124


  Commit: ba6495c96addbc8279d580e261acce6b589a6eeb
      https://github.com/wesnoth/wesnoth/commit/ba6495c96addbc8279d580e261acce6b589a6eeb
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/side_actions.cpp

  Log Message:
  -----------
  wb: more robust side_actions_container::get_turn

the assumption

(turn_beginnings_[num] == it) => (get_turn(it) == num)

might be wrong in case that we have a turn with no actions, in which
case turn_beginnings_ contains duplicates and we actually want the upper
bound of (x <= it) in turn_beginnings_


  Commit: 195913fc4be356bce2aa5d9b99bc2f64a4c3048b
      https://github.com/wesnoth/wesnoth/commit/195913fc4be356bce2aa5d9b99bc2f64a4c3048b
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/side_actions.cpp

  Log Message:
  -----------
  wb: more robust side_actions_container::erase

i don't really know why the old code had a special case for
`get_turn(next) != turn_of_position`, from what i see `turn_end(0)`
would basicially return the same value as `next`. The new code removes
that special case which resulted in assertion failures before (#1841)
and also consiers the case where `position` appears multiple times in
`turn_beginnings_`


  Commit: 00f90eabe68dd2e41f7623bd759de8755d255105
      https://github.com/wesnoth/wesnoth/commit/00f90eabe68dd2e41f7623bd759de8755d255105
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/move.cpp

  Log Message:
  -----------
  wb: fix nullptr assertion when log is enabled


  Commit: 5847615a774d8fa7f78be8fbef0ce8ca67fcd909
      https://github.com/wesnoth/wesnoth/commit/5847615a774d8fa7f78be8fbef0ce8ca67fcd909
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/attack.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/move.hpp
    M src/whiteboard/side_actions.cpp
    M src/whiteboard/side_actions.hpp

  Log Message:
  -----------
  wb: refactor out get_unit() calls

there have been reported many assertion failures due to get_unit()
returning nullptr, so we try not to rely on get_unit() whenever
possible.


  Commit: 2174bfc2156fd3af6ceb76e6bb939bc04c27c503
      https://github.com/wesnoth/wesnoth/commit/2174bfc2156fd3af6ceb76e6bb939bc04c27c503
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/menu_events.cpp
    M src/menu_events.hpp
    M src/whiteboard/move.cpp
    M src/whiteboard/move.hpp
    M src/whiteboard/recruit.cpp
    M src/whiteboard/side_actions.cpp
    M src/whiteboard/side_actions.hpp

  Log Message:
  -----------
  wb: update following moves when a recruit is executed

After a recruit action was executed the id of the unit was changed so we
need to update the unitid of all following actions on that unit


  Commit: 4f161d889c87f610a565347656fd1695b60b1208
      https://github.com/wesnoth/wesnoth/commit/4f161d889c87f610a565347656fd1695b60b1208
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/manager.cpp

  Log Message:
  -----------
  wb: fix crash when using planning mode mode with dsu

fixes #1599 . we now automaticllay disable dsu when enabling planning mode


  Commit: 6cfe64e4da1b1b5ae0082befa2a31281ad480fee
      https://github.com/wesnoth/wesnoth/commit/6cfe64e4da1b1b5ae0082befa2a31281ad480fee
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/manager.cpp

  Log Message:
  -----------
  wb: cleanups & add debug message


  Commit: c9df4bf02a4c5db66b4a29e0174ce1744a0088a6
      https://github.com/wesnoth/wesnoth/commit/c9df4bf02a4c5db66b4a29e0174ce1744a0088a6
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/attack.cpp

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


  Commit: 04d0dcdf655beefeda3a79d575669789ddc14e3b
      https://github.com/wesnoth/wesnoth/commit/04d0dcdf655beefeda3a79d575669789ddc14e3b
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M src/whiteboard/action.hpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/move.hpp

  Log Message:
  -----------
  wb: fix moves for planned recruits

the for those moves get_unit() might return nullptr when it is
when the future map is not applied and some codes deduced from
that that the action is invalid. So we make sure that code does
not rely on get_unit().


Compare: https://github.com/wesnoth/wesnoth/compare/c19590fc453c...04d0dcdf655b
      **NOTE:** This service 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.


More information about the Commits mailing list