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

Initialization 2

Browse source
This commit is contained in:
Jörg Hinrichs 2006-03-09 21:12:53 +00:00
parent d0e95571f0
commit 913192175c
9 changed files with 87 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/play_controller.cpp
View file

@ -1,9 +1,11 @@
#include "play_controller.hpp"
#include "replay.hpp"
play_controller::play_controller(const config& level, game_state& state_of_game, int ticks, int num_turns) :
play_controller::play_controller(const config& level, game_state& state_of_game,
int ticks, int num_turns, const config& game_config) :
level_(level), ticks_(ticks),
gamestate_(state_of_game), status_(level, num_turns)
gamestate_(state_of_game), status_(level, num_turns), statistics_context_(level_["name"]),
game_config_(game_config), map_(game_config, level["map_data"])
{
init();
}

7
src/play_controller.hpp
View file

@ -17,20 +17,25 @@
#include "gamestatus.hpp"
#include "hotkeys.hpp"
#include "playlevel.hpp"
#include "statistics.hpp"
#include <vector>
class play_controller
{
public:
play_controller(const config& level, game_state& state_of_game, int ticks, int num_turns);
play_controller(const config& level, game_state& state_of_game,
int ticks, int num_turns, const config& game_config);
protected:
virtual void init();
const config& level_;
const config& game_config_;
game_state& gamestate_;
gamestatus status_;
gamemap map_;
const statistics::scenario_context statistics_context_;
const int ticks_;
private:

6
src/playmp_controller.cpp
View file

@ -33,7 +33,7 @@ LEVEL_RESULT playmp_scenario(const game_data& gameinfo, const config& game_confi
// try{
const int ticks = SDL_GetTicks();
const int num_turns = atoi((*level)["turns"].c_str());
playmp_controller playcontroller(*level, state_of_game, ticks, num_turns);
playmp_controller playcontroller(*level, state_of_game, ticks, num_turns, game_config);
return playcontroller.play_scenario(gameinfo, game_config, level, video, state_of_game, story, log, skip_replay);
//return LEVEL_CONTINUE;
@ -48,8 +48,8 @@ LEVEL_RESULT playmp_scenario(const game_data& gameinfo, const config& game_confi
}
playmp_controller::playmp_controller(const config& level, game_state& state_of_game, const int ticks, const int num_turns)
: play_controller(level, state_of_game, ticks, num_turns),
playmp_controller::playmp_controller(const config& level, game_state& state_of_game, const int ticks, const int num_turns, const config& game_config)
: play_controller(level, state_of_game, ticks, num_turns, game_config),
generator_setter(&recorder), cursor_setter(cursor::NORMAL)
{
}

3
src/playmp_controller.hpp
View file

@ -23,7 +23,8 @@
class playmp_controller : public play_controller
{
public:
playmp_controller(const config& level, game_state& state_of_game, const int ticks, const int num_turns);
playmp_controller(const config& level, game_state& state_of_game,
const int ticks, const int num_turns, const config& game_config);
LEVEL_RESULT play_scenario(const game_data& gameinfo, const config& terrain_config,
const config* level, CVideo& video, game_state& state_of_game,

110
src/playsingle_controller.cpp
View file

@ -21,7 +21,6 @@
#include "preferences_display.hpp"
#include "replay.hpp"
#include "sound.hpp"
#include "statistics.hpp"
#include "tooltips.hpp"
#define LOG_NG LOG_STREAM(info, engine)
@ -33,8 +32,8 @@ LEVEL_RESULT playsingle_scenario(const game_data& gameinfo, const config& game_c
// try{
const int ticks = SDL_GetTicks();
const int num_turns = atoi((*level)["turns"].c_str());
playsingle_controller playcontroller(*level, state_of_game, ticks, num_turns);
return playcontroller.play_scenario(gameinfo, game_config, video, story, log, skip_replay);
playsingle_controller playcontroller(*level, state_of_game, ticks, num_turns, game_config);
return playcontroller.play_scenario(gameinfo, video, story, log, skip_replay);
//return LEVEL_CONTINUE;
//play event-loop
@ -47,24 +46,19 @@ LEVEL_RESULT playsingle_scenario(const game_data& gameinfo, const config& game_c
}
playsingle_controller::playsingle_controller(const config& level, game_state& state_of_game, const int ticks, const int num_turns)
: play_controller(level, state_of_game, ticks, num_turns),
playsingle_controller::playsingle_controller(const config& level, game_state& state_of_game,
const int ticks, const int num_turns, const config& game_config)
: play_controller(level, state_of_game, ticks, num_turns, game_config),
generator_setter(&recorder), cursor_setter(cursor::NORMAL)
{}
{
LOG_NG << "created objects... " << (SDL_GetTicks() - ticks_) << "\n";
}
LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, const config& game_config,
CVideo& video,
LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, CVideo& video,
const std::vector<config*>& story, upload_log& log, bool skip_replay)
{
const int ticks = SDL_GetTicks();
LOG_NG << "in playsingle_controller::play_scenario()...\n";
const statistics::scenario_context statistics_context(level_["name"]);
gamemap map(game_config,level_["map_data"]);
LOG_NG << "created objects... " << (SDL_GetTicks() - ticks) << "\n";
CKey key;
unit_map units;
@ -83,11 +77,11 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
if(level_["modify_placing"] == "true") {
LOG_NG << "modifying placing...\n";
play::place_sides_in_preferred_locations(map,unit_cfg);
play::place_sides_in_preferred_locations(map_,unit_cfg);
}
LOG_NG << "initializing teams..." << unit_cfg.size() << "\n";;
LOG_NG << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << (SDL_GetTicks() - ticks_) << "\n";
std::set<std::string> seen_save_ids;
@ -97,33 +91,33 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
if (first_human_team == -1){
first_human_team = get_first_human_team(ui, unit_cfg);
}
get_player_info(**ui, gamestate_, save_id, teams, level_, gameinfo, map, units);
get_player_info(**ui, gamestate_, save_id, teams, level_, gameinfo, map_, units);
}
preferences::encounter_recruitable_units(teams);
preferences::encounter_start_units(units);
preferences::encounter_recallable_units(gamestate_);
preferences::encounter_map_terrain(map);
preferences::encounter_map_terrain(map_);
LOG_NG << "initialized teams... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "initialized teams... " << (SDL_GetTicks() - ticks_) << "\n";
const config* theme_cfg = NULL;
if(level_["theme"] != "") {
theme_cfg = game_config.find_child("theme","name",level_["theme"]);
theme_cfg = game_config_.find_child("theme","name",level_["theme"]);
}
if(theme_cfg == NULL) {
theme_cfg = game_config.find_child("theme","name",preferences::theme());
theme_cfg = game_config_.find_child("theme","name",preferences::theme());
}
LOG_NG << "initializing display... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "initializing display... " << (SDL_GetTicks() - ticks_) << "\n";
const config dummy_cfg;
display gui(units,video,map,status_,teams,theme_cfg != NULL ? *theme_cfg : dummy_cfg, game_config, level_);
theme::set_known_themes(&game_config);
display gui(units,video,map_,status_,teams,theme_cfg != NULL ? *theme_cfg : dummy_cfg, game_config_, level_);
theme::set_known_themes(&game_config_);
LOG_NG << "done initializing display... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "done initializing display... " << (SDL_GetTicks() - ticks_) << "\n";
LOG_NG << "a... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "a... " << (SDL_GetTicks() - ticks_) << "\n";
if(first_human_team != -1) {
gui.set_team(first_human_team);
@ -132,11 +126,11 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
const preferences::display_manager prefs_disp_manager(&gui);
const tooltips::manager tooltips_manager(gui.video());
LOG_NG << "b... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "b... " << (SDL_GetTicks() - ticks_) << "\n";
//this *needs* to be created before the show_intro and show_map_scene
//as that functions use the manager state_of_game
game_events::manager events_manager(level_,gui,map,units,teams,
game_events::manager events_manager(level_,gui,map_,units,teams,
gamestate_,status_,gameinfo);
if(!recorder.is_skipping()) {
@ -150,21 +144,21 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
const font::floating_label_context labels_manager;
const halo::manager halo_manager(gui);
gui.labels().read(level_);
LOG_NG << "c... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "c... " << (SDL_GetTicks() - ticks_) << "\n";
const std::string& music = level_["music"];
if(music != "") {
sound::play_music_repeatedly(music);
}
LOG_NG << "d... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "d... " << (SDL_GetTicks() - ticks_) << "\n";
victory_conditions::set_victory_when_enemies_defeated(
level_["victory_when_enemies_defeated"] != "no");
LOG_NG << "initializing events manager... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "initializing events manager... " << (SDL_GetTicks() - ticks_) << "\n";
help::help_manager help_manager(&game_config, &gameinfo, &map);
help::help_manager help_manager(&game_config_, &gameinfo, &map_);
//find a list of 'items' (i.e. overlays) on the level, and add them
const config::child_list& overlays = level_.get_children("item");
@ -176,7 +170,7 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
turn_info::floating_textbox textbox_info;
LOG_NG << "entering try... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "entering try... " << (SDL_GetTicks() - ticks_) << "\n";
replay_network_sender replay_sender(recorder);
@ -195,15 +189,15 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
gui.begin_game();
gui.adjust_colours(0,0,0);
LOG_NG << "scrolling... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "scrolling... " << (SDL_GetTicks() - ticks_) << "\n";
if(first_human_team != -1) {
LOG_NG << "b " << (SDL_GetTicks() - ticks) << "\n";
gui.scroll_to_tile(map.starting_position(first_human_team + 1).x,
map.starting_position(first_human_team + 1).y, display::WARP);
LOG_NG << "c " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "b " << (SDL_GetTicks() - ticks_) << "\n";
gui.scroll_to_tile(map_.starting_position(first_human_team + 1).x,
map_.starting_position(first_human_team + 1).y, display::WARP);
LOG_NG << "c " << (SDL_GetTicks() - ticks_) << "\n";
}
gui.scroll_to_tile(map.starting_position(1).x,map.starting_position(1).y,display::WARP);
LOG_NG << "done scrolling... " << (SDL_GetTicks() - ticks) << "\n";
gui.scroll_to_tile(map_.starting_position(1).x,map_.starting_position(1).y,display::WARP);
LOG_NG << "done scrolling... " << (SDL_GetTicks() - ticks_) << "\n";
bool replaying = (recorder.at_end() == false);
@ -213,12 +207,12 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
}
for(std::vector<team>::iterator t = teams.begin(); t != teams.end(); ++t) {
clear_shroud(gui,status_,map,gameinfo,units,teams,(t-teams.begin()));
clear_shroud(gui,status_,map_,gameinfo,units,teams,(t-teams.begin()));
}
std::deque<config> data_backlog;
LOG_NG << "starting main loop\n" << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "starting main loop\n" << (SDL_GetTicks() - ticks_) << "\n";
for(bool first_time = true; true; first_time = false, first_player = 0) {
if(first_time) {
const hotkey::basic_handler key_events_handler(&gui);
@ -228,7 +222,7 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
events::raise_draw_event();
gui.draw();
for(std::vector<team>::iterator t = teams.begin(); t != teams.end(); ++t) {
clear_shroud(gui,status_,map,gameinfo,units,teams,(t-teams.begin()));
clear_shroud(gui,status_,map_,gameinfo,units,teams,(t-teams.begin()));
}
if(!loading_game) {
@ -291,14 +285,14 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
team_it->spend_gold(expense);
}
calculate_healing(gui,status_,map,units,player_number,teams, !skip_replay);
calculate_healing(gui,status_,map_,units,player_number,teams, !skip_replay);
}
team_it->set_time_of_day(int(status_.turn()),status_.get_time_of_day());
gui.set_playing_team(size_t(player_number-1));
clear_shroud(gui,status_,map,gameinfo,units,teams,player_number-1);
clear_shroud(gui,status_,map_,gameinfo,units,teams,player_number-1);
if (!skip_replay){
gui.scroll_to_leader(units, player_number);
@ -308,7 +302,7 @@ LEVEL_RESULT playsingle_controller::play_scenario(const game_data& gameinfo, con
const hotkey::basic_handler key_events_handler(&gui);
LOG_NG << "doing replay " << player_number << "\n";
try {
replaying = do_replay(gui,map,gameinfo,units,teams,
replaying = do_replay(gui,map_,gameinfo,units,teams,
player_number,status_,gamestate_);
} catch(replay::error&) {
gui::show_dialog(gui,NULL,"",_("The file you have tried to load is corrupt"),gui::OK_ONLY);
@ -335,8 +329,8 @@ redo_turn:
LOG_NG << "is human...\n";
try {
play_turn(gameinfo,gamestate_,status_,game_config,
level_, key, gui, map, teams, player_number,
play_turn(gameinfo,gamestate_,status_,game_config_,
level_, key, gui, map_, teams, player_number,
units, textbox_info, replay_sender, skip_replay);
} catch(end_turn_exception& end_turn) {
if (end_turn.redo == player_number)
@ -355,18 +349,18 @@ redo_turn:
const cursor::setter cursor_setter(cursor::WAIT);
turn_info turn_data(gameinfo,gamestate_,status_,
game_config,level_,key,gui,
map,teams,player_number,units,
game_config_,level_,key,gui,
map_,teams,player_number,units,
turn_info::BROWSE_AI,textbox_info,replay_sender);
ai_interface::info ai_info(gui,map,gameinfo,units,teams,player_number,status_,turn_data);
ai_interface::info ai_info(gui,map_,gameinfo,units,teams,player_number,status_,turn_data);
util::scoped_ptr<ai_interface> ai_obj(create_ai(team_it->ai_algorithm(),ai_info));
ai_obj->play_turn();
recorder.end_turn();
ai_obj->sync_network();
gui.recalculate_minimap();
clear_shroud(gui,status_,map,gameinfo,units,teams,player_number-1);
clear_shroud(gui,status_,map_,gameinfo,units,teams,player_number-1);
gui.invalidate_unit();
gui.invalidate_game_status();
gui.invalidate_all();
@ -376,8 +370,8 @@ redo_turn:
LOG_NG << "is networked...\n";
turn_info turn_data(gameinfo,gamestate_,status_,
game_config,level_,key,gui,
map,teams,player_number,units,
game_config_,level_,key,gui,
map_,teams,player_number,units,
turn_info::BROWSE_NETWORKED,
textbox_info,replay_sender);
@ -536,7 +530,7 @@ redo_turn:
const int remaining_gold = i->gold();
const int finishing_bonus_per_turn =
map.villages().size() * game_config::village_income +
map_.villages().size() * game_config::village_income +
game_config::base_income;
const int turns_left = maximum<int>(0,status_.number_of_turns() - status_.turn());
const int finishing_bonus = end_level.gold_bonus ?
@ -597,8 +591,8 @@ redo_turn:
}
turn_info turn_data(gameinfo,gamestate_,status_,
game_config,level_,key,gui,
map,teams,player_number,units,turn_info::BROWSE_NETWORKED,textbox_info,replay_sender);
game_config_,level_,key,gui,
map_,teams,player_number,units,turn_info::BROWSE_NETWORKED,textbox_info,replay_sender);
turn_data.save_game(_("A network disconnection has occurred, and the game cannot continue. Do you want to save the game?"),gui::YES_NO);
if(disconnect) {

6
src/playsingle_controller.hpp
View file

@ -24,10 +24,10 @@
class playsingle_controller : play_controller
{
public:
playsingle_controller(const config& level, game_state& state_of_game, const int ticks, const int num_turns);
playsingle_controller(const config& level, game_state& state_of_game,
const int ticks, const int num_turns, const config& game_config);
LEVEL_RESULT play_scenario(const game_data& gameinfo, const config& terrain_config,
CVideo& video,
LEVEL_RESULT play_scenario(const game_data& gameinfo, CVideo& video,
const std::vector<config*>& story, upload_log& log, bool skip_replay);
protected:

34
src/replay_controller.cpp
View file

@ -18,7 +18,6 @@
#include "replay.hpp"
#include "replay_controller.hpp"
#include "sound.hpp"
#include "statistics.hpp"
#include "tooltips.hpp"
#include <iostream>
@ -50,11 +49,10 @@ LEVEL_RESULT play_replay_level(const game_data& gameinfo, const config& game_con
replay_controller::replay_controller(const config& level, const game_data& gameinfo, game_state& state_of_game,
const int ticks, const int num_turns, const config& game_config,
CVideo& video, const std::vector<config*>& story)
: play_controller(level, state_of_game, ticks, num_turns),
: play_controller(level, state_of_game, ticks, num_turns, game_config),
verify_manager_(units_), team_manager_(teams_), labels_manager_(), help_manager_(&game_config, &gameinfo, &map_),
game_config_(game_config), gameinfo_(gameinfo),
gamestate_start_(state_of_game), status_start_(level, num_turns),
map_(game_config, level["map_data"]), mouse_handler_(gui_, teams_, units_, map_, status_, gameinfo),
gameinfo_(gameinfo), gamestate_start_(state_of_game), status_start_(level, num_turns),
mouse_handler_(gui_, teams_, units_, map_, status_, gameinfo),
xp_modifier_(atoi(level["experience_modifier"].c_str()))
{
player_number_ = 1;
@ -67,6 +65,7 @@ replay_controller::replay_controller(const config& level, const game_data& gamei
first_player_ = 0;
}
init(video, story);
LOG_NG << "created objects... " << (SDL_GetTicks() - ticks_) << "\n";
}
replay_controller::~replay_controller(){
@ -78,16 +77,11 @@ replay_controller::~replay_controller(){
}
void replay_controller::init(CVideo& video, const std::vector<config*>& /*story*/){
LOG_NG << "in replay_controller::init()...\n";
//guarantee the cursor goes back to 'normal' at the end of the level
const cursor::setter cursor_setter(cursor::NORMAL);
const int ticks = SDL_GetTicks();
LOG_NG << "in replay_controller::init()...\n";
const statistics::scenario_context statistics_context(level_["name"]);
LOG_NG << "created objects... " << (SDL_GetTicks() - ticks) << "\n";
const unit_type::experience_accelerator xp_mod(xp_modifier_ > 0 ? xp_modifier_ : 100);
const config::child_list& unit_cfg = level_.get_children("side");
@ -98,7 +92,7 @@ void replay_controller::init(CVideo& video, const std::vector<config*>& /*story*
}
LOG_NG << "initializing teams..." << unit_cfg.size() << "\n";;
LOG_NG << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << (SDL_GetTicks() - ticks_) << "\n";
int first_human_team = -1;
std::set<std::string> seen_save_ids;
@ -115,9 +109,9 @@ void replay_controller::init(CVideo& video, const std::vector<config*>& /*story*
preferences::encounter_start_units(units_);
preferences::encounter_recallable_units(gamestate_);
preferences::encounter_map_terrain(map_);
LOG_NG << "initialized teams... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "initialized teams... " << (SDL_GetTicks() - ticks_) << "\n";
LOG_NG << "initializing display... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "initializing display... " << (SDL_GetTicks() - ticks_) << "\n";
const config* theme_cfg = get_theme(game_config_, level_["theme"]);
gui_ = new display(units_,video,map_,status_,teams_,*theme_cfg, game_config_, level_);
const config* replay_theme_cfg = theme_cfg->child("resolution")->child("replay");
@ -125,7 +119,7 @@ void replay_controller::init(CVideo& video, const std::vector<config*>& /*story*
gui_->get_theme().modify(replay_theme_cfg);
mouse_handler_.set_gui(gui_);
theme::set_known_themes(&game_config_);
LOG_NG << "done initializing display... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "done initializing display... " << (SDL_GetTicks() - ticks_) << "\n";
if(first_human_team != -1) {
gui_->set_team(first_human_team);
@ -143,14 +137,14 @@ void replay_controller::init(CVideo& video, const std::vector<config*>& /*story*
*/
gui_->labels().read(level_);
LOG_NG << "c... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "c... " << (SDL_GetTicks() - ticks_) << "\n";
const std::string& music = level_["music"];
if(music != "") {
sound::play_music_repeatedly(music);
}
LOG_NG << "d... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "d... " << (SDL_GetTicks() - ticks_) << "\n";
//find a list of 'items' (i.e. overlays) on the level, and add them
const config::child_list& overlays = level_.get_children("item");
@ -175,9 +169,9 @@ void replay_controller::init(CVideo& video, const std::vector<config*>& /*story*
t->set_shroud(false);
}
LOG_NG << "scrolling... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "scrolling... " << (SDL_GetTicks() - ticks_) << "\n";
gui_->scroll_to_leader(units_, player_number_);
LOG_NG << "done scrolling... " << (SDL_GetTicks() - ticks) << "\n";
LOG_NG << "done scrolling... " << (SDL_GetTicks() - ticks_) << "\n";
if(!loading_game_) {
game_events::fire("start");

7
src/replay_controller.hpp
View file

@ -91,13 +91,10 @@ private:
game_events::manager* events_manager_;
help::help_manager help_manager_;
//const config& level_;
const config& game_config_;
const game_data& gameinfo_;
game_state& /*gamestate_,*/ gamestate_start_;
game_state& gamestate_start_;
display* gui_;
gamestatus /*status_,*/ status_start_;
gamemap map_;
gamestatus status_start_;
unit_map units_, units_start_;
events::mouse_handler mouse_handler_;
events::menu_handler menu_handler_;

1
src/statistics.hpp
View file

@ -55,6 +55,7 @@ namespace statistics
~disabler();
};
struct scenario_context
{
scenario_context(const std::string& name);