[Commits] [wesnoth/wesnoth] 33bf5c: Revert "replace play_controller::loading_game_ mem...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 33bf5c60b8f50ecd82f5a30915bed9b9d2d4ed7d
      https://github.com/wesnoth/wesnoth/commit/33bf5c60b8f50ecd82f5a30915bed9b9d2d4ed7d
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-03-28 (Sat, 28 Mar 2015)

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

  Log Message:
  -----------
  Revert "replace play_controller::loading_game_ member"

This reverts commit 46786c9fa358fdb3947c3e7a45b20944e0980649.

The other implementation did not work becasue game_data phase was reset to PRELOAD in fire_preload()

Conflicts:
	src/play_controller.cpp
	src/playsingle_controller.cpp
	src/replay_controller.cpp