[Commits] [wesnoth/wesnoth] 4aa14a: fixup "make level reflect start of scenario"

Sat Apr 19 16:35:42 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 4aa14aa24a045fb76d362f3c4dc477efdca4a31a
      https://github.com/wesnoth/wesnoth/commit/4aa14aa24a045fb76d362f3c4dc477efdca4a31a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-19 (Sat, 19 Apr 2014)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  fixup "make level reflect start of scenario"

we change set_attr to set_attr_dup as gfgtdf pointed out

  Commit: 90c7dab0c2981b1ae46ca4006bc063722dc43c9c
      https://github.com/wesnoth/wesnoth/commit/90c7dab0c2981b1ae46ca4006bc063722dc43c9c
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-19 (Sat, 19 Apr 2014)

  Changed paths:
    M src/replay.cpp
    M src/server/game.cpp

  Log Message:
  -----------
  purge "record_change_controller"

we can use "change_controller" now instead because of the new
network adapter from gfgtdf

  Commit: 43ee443016ac814076b112e5b856d8147cb1e936
      https://github.com/wesnoth/wesnoth/commit/43ee443016ac814076b112e5b856d8147cb1e936
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-19 (Sat, 19 Apr 2014)

  Changed paths:
    M src/server/game.cpp
    M src/server/game.hpp

  Log Message:
  -----------
  fixup scenario transitions

when the host transitions to the next scenario, in some cases he will
send "[start]" before the other clients even have the new scenario cfg
this means that the controller tweaks he send will hit them while they
are in linger mode or something, and the next scenario won't work.

we fixup the download_next_level function on the server side so that
it updates the level config when sending it out to the transitioning
client.

this fixes up commit fb726e0610af42fa815cf340fa68c570b8bef0d3
and bug #21931

  Commit: 1ef34f4c3a4c2be000399186ae332423f0a3de49
      https://github.com/wesnoth/wesnoth/commit/1ef34f4c3a4c2be000399186ae332423f0a3de49
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-19 (Sat, 19 Apr 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog

  Commit: 992ebe135802a9278916b6a6ce835264f5d1879e
      https://github.com/wesnoth/wesnoth/commit/992ebe135802a9278916b6a6ce835264f5d1879e
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-19 (Sat, 19 Apr 2014)

  Changed paths:
    M changelog
    M data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
    M data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
    M data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
    M data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
    M data/campaigns/Eastern_Invasion/scenarios/06_Two_Paths.cfg
    M data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
    M data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
    M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
    M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
    M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
    M data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
    M data/campaigns/Liberty/scenarios/08_Glory.cfg
    M data/campaigns/Liberty/scenarios/09_Epilogue.cfg
    M data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
    M data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
    M data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/07_The_Desert_of_Death.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/13_The_Dwarvish_Stand.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
    M data/campaigns/Two_Brothers/scenarios/05_Epilogue.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
    M data/core/macros/image-utils.cfg
    M data/tools/wmllint
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/VC9/README.txt
    M projectfiles/VC9/wesnoth.vcproj

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/wesnoth/wesnoth

Compare: https://github.com/wesnoth/wesnoth/compare/c2062caea6ab...992ebe135802