[Commits] [wesnoth/wesnoth] 5bfaaf: reset unit id when resetting replays

GitHub noreply at github.com
Wed Feb 4 14:56:25 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5bfaaf6c3ed6fd28ee775e3b4572bba518d3c63e
      https://github.com/wesnoth/wesnoth/commit/5bfaaf6c3ed6fd28ee775e3b4572bba518d3c63e
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M src/replay_controller.cpp

  Log Message:
  -----------
  reset unit id when resetting replays

this previously caused OOS in the unit ids when resetting replay.


  Commit: b1b025fcdacaf2df0fe1313293ea6ceb7fe130dc
      https://github.com/wesnoth/wesnoth/commit/b1b025fcdacaf2df0fe1313293ea6ceb7fe130dc
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M src/savegame.cpp

  Log Message:
  -----------
  dont write next_underlying_unit_id to savefile toplevel

it is never written from there. Currently next_underlying_unit_id is
written inside [snapshot] or [replay_start] in playcontroller::to_config


  Commit: 882f0afd29d0cec14171fcdbd5deb5c13b6a6809
      https://github.com/wesnoth/wesnoth/commit/882f0afd29d0cec14171fcdbd5deb5c13b6a6809
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M src/unit.cpp

  Log Message:
  -----------
  use fake id for units ouside the synce context.

otherwise the unit id manager could come out of sync and cause OOS.


  Commit: 0ce0e040f97bd5dbfb5b8469e9dad10595f8cbb1
      https://github.com/wesnoth/wesnoth/commit/0ce0e040f97bd5dbfb5b8469e9dad10595f8cbb1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

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

  Log Message:
  -----------
  catch config::error when parsing undos

so the savefaile can still be loaded in case of a corrupt undo stack.


  Commit: 7dc3969eece048b857859683157430660eea778e
      https://github.com/wesnoth/wesnoth/commit/7dc3969eece048b857859683157430660eea778e
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

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

  Log Message:
  -----------
  restore last unit_id when undoing/redoing

otherwise the unit ids would be come out of sync when undoing,


  Commit: 277fffcb0cac5eeb1ce86ad35a1fc7acd8038ce8
      https://github.com/wesnoth/wesnoth/commit/277fffcb0cac5eeb1ce86ad35a1fc7acd8038ce8
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M src/actions/move.cpp
    M src/actions/undo.cpp
    M src/ai/actions.cpp
    M src/play_controller.cpp
    M src/playsingle_controller.cpp
    M src/replay.cpp
    M src/replay_controller.cpp
    M src/synced_context.cpp
    M src/synced_context.hpp

  Log Message:
  -----------
  use replay::process_error instead of ERR_REPLAY for OOS

since replay::process_error might throw we cannot do this in
set_sconext_synced destructor anymore and have to call
do_final_checkup() ealier.


Compare: https://github.com/wesnoth/wesnoth/compare/0771fddf812e...277fffcb0cac


More information about the Commits mailing list