upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 19:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplified logic when loading a game

Browse Source
This commit is contained in:
Gunter Labes 2009-10-01 08:08:21 +00:00
parent c51fdceb1d
commit 3e074833de
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/play_controller.cpp
View File

@ -475,8 +475,8 @@ void play_controller::do_init_side(const unsigned int team_index){
log_scope("player turn");
team& current_team = teams_[team_index];
bool real_side_change = true;
if (!loading_game_ || int(team_index) + 1 != first_player_ || turn() > start_turn_) {
// If this is right after loading a game we don't need to fire events and such. It was already done before saving.
if (!loading_game_) {
if (turn() != previous_turn_)
{
std::stringstream event_stream;
@ -490,21 +490,13 @@ void play_controller::do_init_side(const unsigned int team_index){
// Fire side turn event only if real side change occurs,
// not counting changes from void to a side
game_events::fire("side turn");
} else {
real_side_change = false;
}
// We want to work out if units for this player should get healed,
// and the player should get income now.
// Healing/income happen if it's not the first turn of processing,
// or if we are loading a game, and this is not the player it started with.
bool turn_refresh =
(turn() > start_turn_ ||
(loading_game_ && int(team_index) + 1 != first_player_))
&& (turn() > 1);
if(turn_refresh) {
// or if we are loading a game.
if (!loading_game_ && turn() > 1) {
for(unit_map::iterator i = units_.begin(); i != units_.end(); ++i) {
if (i->second.side() == player_number_) {
i->second.new_turn();
@ -523,8 +515,6 @@ void play_controller::do_init_side(const unsigned int team_index){
calculate_healing(player_number_, !skip_replay_);
reset_resting(units_, player_number_);
}
if(turn_refresh || real_side_change) {
game_events::fire("turn refresh");
}
@ -541,6 +531,7 @@ void play_controller::do_init_side(const unsigned int team_index){
if (!recorder.is_skipping() && !skip_replay_){
gui_->scroll_to_leader(units_, player_number_,game_display::ONSCREEN,false);
}
loading_game_ = false;
}
//builds the snapshot config from its members and their configs respectively

4
src/play_controller.hpp
View File

@ -194,8 +194,8 @@ protected:
const unit_type::experience_accelerator xp_mod_;
//if a team is specified whose turn it is, it means we're loading a game
//instead of starting a fresh one
const bool loading_game_;
//instead of starting a fresh one. Gets reset to false after init_side
bool loading_game_;
int first_human_team_;
int player_number_;