[Commits] [wesnoth/wesnoth] ddbd2b: Begin removal of exceptions from savegame code

GitHub noreply at github.com
Thu Dec 11 08:50:15 UTC 2014


  Branch: refs/heads/vult-remove-savegame-exceptions
  Home:   https://github.com/wesnoth/wesnoth
  Commit: ddbd2b483c3ac8869c856c96fe84023b3458e99d
      https://github.com/wesnoth/wesnoth/commit/ddbd2b483c3ac8869c856c96fe84023b3458e99d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/game_initialization/multiplayer_create.cpp
    M src/play_controller.cpp
    M src/savegame.cpp
    M src/savegame.hpp

  Log Message:
  -----------
  Begin removal of exceptions from savegame code


  Commit: be90053998261244558e65317f964e6d2049c43c
      https://github.com/wesnoth/wesnoth/commit/be90053998261244558e65317f964e6d2049c43c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/play_controller.cpp

  Log Message:
  -----------
  Revert changes to playcontroller


  Commit: be66d2ea72afd0bcee86441639958a179acf7b12
      https://github.com/wesnoth/wesnoth/commit/be66d2ea72afd0bcee86441639958a179acf7b12
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/game_launcher.cpp

  Log Message:
  -----------
  Check for bool return of load_game


  Commit: df38835a81db21a597bf8e48632f00488d584fee
      https://github.com/wesnoth/wesnoth/commit/df38835a81db21a597bf8e48632f00488d584fee
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

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

  Log Message:
  -----------
  fixup


  Commit: 41a1ab310888753d38c0af4eb505fbf875a67233
      https://github.com/wesnoth/wesnoth/commit/41a1ab310888753d38c0af4eb505fbf875a67233
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/game_initialization/multiplayer_create.cpp
    M src/savegame.hpp

  Log Message:
  -----------
  Added if block for mp initialization and some comments


  Commit: a8f6e16e3831ffe2159908851f27ad9cc9e4f5a0
      https://github.com/wesnoth/wesnoth/commit/a8f6e16e3831ffe2159908851f27ad9cc9e4f5a0
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/game_launcher.cpp

  Log Message:
  -----------
  fixup game_launcher


  Commit: ec4d61548c2b7e2fe5328fc4e7cfaacb83f0797f
      https://github.com/wesnoth/wesnoth/commit/ec4d61548c2b7e2fe5328fc4e7cfaacb83f0797f
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/game_initialization/multiplayer_create.cpp

  Log Message:
  -----------
  Set savegame::loadgame correctly in scope


  Commit: bb295f1c6e0ebb5c33b772e5588fb26b1503a502
      https://github.com/wesnoth/wesnoth/commit/bb295f1c6e0ebb5c33b772e5588fb26b1503a502
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/savegame.hpp

  Log Message:
  -----------
  Fix comment indent


  Commit: 10838f928dc0b485b29757bbde2fd4bc8694b6aa
      https://github.com/wesnoth/wesnoth/commit/10838f928dc0b485b29757bbde2fd4bc8694b6aa
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/savegame.cpp

  Log Message:
  -----------
  in in-game load dialog, check health and version before exit game

This is fixes a minor bug:
When loading a save from the in-game load dialog, as soon as the
user clicks "ok" to load a savefile, an exception would be thrown
which effectively quits the game, before determining the integrity
and version info of that file.

It's better not to exit a running game if the new game can't be
loaded, so in this commit check these things and abort before
exiting if appropriate.


  Commit: 219b3fdc010f2dfd4457a4af9b92241ddc8855d0
      https://github.com/wesnoth/wesnoth/commit/219b3fdc010f2dfd4457a4af9b92241ddc8855d0
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/savegame.cpp

  Log Message:
  -----------
  Merge branch 'vult-remove-savegame-exceptions' of github.com:cbeck88/wesnoth into vult-remove-savegame-exceptions


  Commit: 73a2c57243b0295d13987c3f0386d240779193a8
      https://github.com/wesnoth/wesnoth/commit/73a2c57243b0295d13987c3f0386d240779193a8
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/game_initialization/multiplayer_create.cpp

  Log Message:
  -----------
  More scope fixup


  Commit: a0a8a7a16f75c4d2a9bb5ae70deac7a4576b68c5
      https://github.com/wesnoth/wesnoth/commit/a0a8a7a16f75c4d2a9bb5ae70deac7a4576b68c5
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/savegame.cpp

  Log Message:
  -----------
  Don't throw exception if canceling the difficulty change menu on load


  Commit: a03ac42f213d3cf3f99129eb657413873e260411
      https://github.com/wesnoth/wesnoth/commit/a03ac42f213d3cf3f99129eb657413873e260411
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/savegame.hpp

  Log Message:
  -----------
  Remove empty struct


  Commit: 3006fc117aea5020a20f3e5e3bb3a5f14abc402c
      https://github.com/wesnoth/wesnoth/commit/3006fc117aea5020a20f3e5e3bb3a5f14abc402c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M src/savegame.hpp

  Log Message:
  -----------
  I cannot write


  Commit: 494a34512608121b1aa4cc341fa35fd8c3dd3115
      https://github.com/wesnoth/wesnoth/commit/494a34512608121b1aa4cc341fa35fd8c3dd3115
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

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

  Log Message:
  -----------
  Attempt to get rid of the overload loag_game() function. Breaks in-game loading dialog


  Commit: ce49a5777b3db0b0ed82d97ddbfcc3f6e6ddf59c
      https://github.com/wesnoth/wesnoth/commit/ce49a5777b3db0b0ed82d97ddbfcc3f6e6ddf59c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M changelog
    M data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
    M players_changelog
    M src/actions/move.cpp
    M src/filesystem_boost.cpp
    M src/game_events/action_wml.cpp
    M src/gettext_boost.cpp
    M src/server/game.hpp
    M src/server/server.cpp
    M src/team.cpp
    M src/tests/test_config.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:wesnoth/wesnoth into vult-remove-savegame-exceptions


  Commit: 8576e88975d4e6d220afce91b0b5ac344e79ad4c
      https://github.com/wesnoth/wesnoth/commit/8576e88975d4e6d220afce91b0b5ac344e79ad4c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

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

  Log Message:
  -----------
  Revert "Attempt to get rid of the overload loag_game() function. Breaks in-game loading dialog"

This reverts commit 494a34512608121b1aa4cc341fa35fd8c3dd3115.


Compare: https://github.com/wesnoth/wesnoth/compare/ddbd2b483c3a^...8576e88975d4


More information about the Commits mailing list