0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved resources setting in constructor to match the destructor.

Browse source
This commit is contained in:
Guillaume Melquiond 2009-10-19 05:29:30 +00:00
parent 6e52ea3ee0
commit 399c2c0bac
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/play_controller.cpp
View file

@ -84,6 +84,13 @@ play_controller::play_controller(const config& level, game_state& state_of_game,
victory_music_(),
defeat_music_()
{
resources::game_map = &map_;
resources::units = &units_;
resources::teams = &teams_;
resources::state_of_game = &gamestate_;
resources::controller = this;
resources::tod_manager = &tod_manager_;
// Setup victory and defeat music
set_victory_music_list(level_["victory_music"]);
set_defeat_music_list(level_["defeat_music"]);
@ -139,13 +146,6 @@ void play_controller::init(CVideo& video){
LOG_NG << "initialized teams... " << (SDL_GetTicks() - ticks_) << "\n";
loadscreen::global_loadscreen->set_progress(60, _("Initializing teams"));
resources::game_map = &map_;
resources::units = &units_;
resources::teams = &teams_;
resources::state_of_game = &gamestate_;
resources::controller = this;
resources::tod_manager = &tod_manager_;
// This *needs* to be created before the show_intro and show_map_scene
// as that functions use the manager state_of_game
// Has to be done before registering any events!