[Commits] [wesnoth/wesnoth] 5b94ad: fix skip turn when a side has no units

GitHub noreply at github.com
Sun Jun 1 01:41:32 UTC 2014 

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5b94adc89eac0a318bdf05bbf7d5ccac1b6d888b
      https://github.com/wesnoth/wesnoth/commit/5b94adc89eac0a318bdf05bbf7d5ccac1b6d888b
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  fix skip turn when a side has no units

the previous implementation didn't fire "side turn end" events in this case.
Conflicts:
	src/playsingle_controller.cpp

It was just a whitespace conflict.


  Commit: 5ed8494a895e126b328f2c0ad2ec0c0a777fa495
      https://github.com/wesnoth/wesnoth/commit/5ed8494a895e126b328f2c0ad2ec0c0a777fa495
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.cpp

  Log Message:
  -----------
  save play_controller.init_side_done as a toplevel member of snapshot

This is in an effort to address https://gna.org/bugs/?21397


  Commit: fe3395ccfea1e5d76fddcb9c9e58206ace13641d
      https://github.com/wesnoth/wesnoth/commit/fe3395ccfea1e5d76fddcb9c9e58206ace13641d
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  call maybe_do_init_side when the engine starts a sides turn

This is part of the effort to fix bug https://gna.org/bugs/?21397


  Commit: c3d599dcbe016602ef196992755ac0bcc1bec12c
      https://github.com/wesnoth/wesnoth/commit/c3d599dcbe016602ef196992755ac0bcc1bec12c
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/playcampaign.cpp

  Log Message:
  -----------
  use config::child_or_add

Note: This commit is a squash of two cherry-picked commits
from master, they were adjacent and the second was a fixup
of the first. The first commit in master was
28ffcc54483942c598d24cecd4f65534f0185c51


  Commit: 26470b3836d83a86a2eeebef01eaaf022a4c1855
      https://github.com/wesnoth/wesnoth/commit/26470b3836d83a86a2eeebef01eaaf022a4c1855
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.cpp
    M src/play_controller.hpp

  Log Message:
  -----------
  fix reloading

this is intended to fix
1) an error messages in stderr when reloading a game related to
synced_context: (the original game called random ... times ...)
2) reloading a save with init_side_done = no

Conflicts:
	src/play_controller.cpp

The conflict was because on master I added std::endl; to logging
output for errors, and that didnt go back to 1.12. This commit
deletes the logging messages anyways.


  Commit: 0e55026889233b16e1232dafd41bad02f5891c72
      https://github.com/wesnoth/wesnoth/commit/0e55026889233b16e1232dafd41bad02f5891c72
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.hpp

  Log Message:
  -----------
  remove unnecessary virtual qualifiers


  Commit: f2504d85560a9e1fb283307b7063d35600408a55
      https://github.com/wesnoth/wesnoth/commit/f2504d85560a9e1fb283307b7063d35600408a55
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.cpp

  Log Message:
  -----------
  assert that do_init_side functions are never called with bad arg


  Commit: 50f89d522a8cbe0bd4ccb4ea7b220bdbb86b9651
      https://github.com/wesnoth/wesnoth/commit/50f89d522a8cbe0bd4ccb4ea7b220bdbb86b9651
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/replay.cpp
    M src/replay_controller.cpp

  Log Message:
  -----------
  remove unnecessary arguments

maybe_do_init_side and do_init_side both required a team_index
argument, which was always player_number_ - 1, (checked this with
assertions and playtesting), and which was available in the class
which defined them


  Commit: 43d313683676d703bba80f99f129b5bccd659d96
      https://github.com/wesnoth/wesnoth/commit/43d313683676d703bba80f99f129b5bccd659d96
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp

  Log Message:
  -----------
  remove more unnecessary arguments, from play_controller::play_side


  Commit: a632aae4fd8a955c2b3e3f67912c575f8c32d3a4
      https://github.com/wesnoth/wesnoth/commit/a632aae4fd8a955c2b3e3f67912c575f8c32d3a4
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  fix gcc compilation


  Commit: 22caf302535b2ad09d4ba655540a4928899027fd
      https://github.com/wesnoth/wesnoth/commit/22caf302535b2ad09d4ba655540a4928899027fd
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp

  Log Message:
  -----------
  remove unnecessary arguments

All of before_human_turn, play_side, play_turn had an argument
"bool save". The only use of this was by the playsingle controller
to determine whether or not to save an autosave -- it was controlled
in a single place by a single for loop in play_scenario.

Instead of polluting all of these functions, including play_controller,
and replay_controller, with arguments that they ignore, save was
replaced with a member variable of playsingle_controller. This is a
strict refactor in terms of behavior.

Conflicts:
	src/playmp_controller.cpp

Conflict was from a replacement of "init_turn_data" with
send_turn_data which is not being backported to 1.12


  Commit: 24eab27b52d0177f58be819b6190551cc586cb70
      https://github.com/wesnoth/wesnoth/commit/24eab27b52d0177f58be819b6190551cc586cb70
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.cpp

  Log Message:
  -----------
  fixup end of scenario saves


  Commit: 8e4f94687f8c6738edf33d348192f5e99e4e3494
      https://github.com/wesnoth/wesnoth/commit/8e4f94687f8c6738edf33d348192f5e99e4e3494
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  fixup 77ead906927bec69d9136d349d637458f7a553f0

Testing reveals that this line cannot be removed without breaking
reloads of disconnected games (with uninitialized sides). But, the
argument should be "false" since this is not called from the replay
codepath.


  Commit: 4c3bc2cdb03fb13313d7e5ec9fa52ab064d3191e
      https://github.com/wesnoth/wesnoth/commit/4c3bc2cdb03fb13313d7e5ec9fa52ab064d3191e
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  fix player_type_changed durign ai turn

it is possible that we receive a player_type changed during an ai turn.

especialy this fixes :droid
Conflicts:
	src/playsingle_controller.cpp

Conflicts were because some earlier changes to networking were not
and will not be backported to 1.12.


  Commit: eccc67c0b1643983138f56477e5110401f0ba904
      https://github.com/wesnoth/wesnoth/commit/eccc67c0b1643983138f56477e5110401f0ba904
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp

  Log Message:
  -----------
  use completion setter object in mp linger mode

mp linger mode was not properly setting the completion status,
as sp does. This caused mp end of scenario saves not to end up
in linger mode when they are reloaded.


  Commit: 60784562a33d5eb9ca60e7c8d14238cdea4a6331
      https://github.com/wesnoth/wesnoth/commit/60784562a33d5eb9ca60e7c8d14238cdea4a6331
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playcampaign.cpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp
    M src/playturn.cpp
    M src/replay.cpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp

  Log Message:
  -----------
  Merge pull request #178 from cbeck88/1.12+bufix_backports_ii

1.12+bugfix backports ii

This contains the bugfixes from last week (and a bit before) which we tested on master.

List of cherry-picked commits: http://hastebin.com/vududegidu.hs

The bugs we fixed:
"Saving and loading may cause a side's turn is not initialized" https://gna.org/bugs/?21397
End of scenario saves now have all the units in them. This removes the bandaid committed for this bug report: https://gna.org/bugs/index.php?15545
We will hopefully now fix it by saving [carryover] if the game is in linger mode.


Compare: https://github.com/wesnoth/wesnoth/compare/0a0b0a24fb34...60784562a33d

More information about the Commits mailing list