Author: soliton
Date: Fri Apr 17 21:27:21 2009
New Revision: 34991
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34991&view=rev
Log:
applied patch #1168: move delay shroud update to game display
Modified:
trunk/src/actions.cpp
trunk/src/game_display.cpp
trunk/src/game_display.hpp
trunk/src/game_events.cpp
trunk/src/menu_events.cpp
trunk/src/mouse_events.cpp
trunk/src/play_controller.cpp
trunk/src/playsingle_controller.cpp
trunk/src/team.cpp
trunk/src/team.hpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Fri Apr 17 21:27:21 2009
@@ -2213,7 +2213,7 @@
size_t team_num = ui->second.side()-1;
team& team = teams[team_num];
- const bool check_shroud = should_clear_shroud &&
team.auto_shroud_updates() &&
+ const bool check_shroud = should_clear_shroud &&
disp->auto_shroud_updates() &&
(team.uses_shroud() || team.uses_fog());
std::set<map_location> known_units;
@@ -2280,7 +2280,7 @@
// so we can put our unit there, then we'll
swap back at the end.
unit temp_unit(ui->second);
const temporary_unit_placer
unit_placer(units,*step,temp_unit);
- if( team.auto_shroud_updates()) {
+ if( disp->auto_shroud_updates()) {
should_clear_stack |=
clear_shroud_unit(map,units,*step,teams,
ui->second.side()-1,&known_units,&seen_units,&petrified_units);
} else {
Modified: trunk/src/game_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/game_display.cpp (original)
+++ trunk/src/game_display.cpp Fri Apr 17 21:27:21 2009
@@ -53,6 +53,7 @@
level_(level),
invalidateUnit_(true),
displayedUnitHex_(),
+ auto_shroud_updates_(true),
overlays_(),
currentTeam_(0),
activeTeam_(0),
Modified: trunk/src/game_display.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.hpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/game_display.hpp (original)
+++ trunk/src/game_display.hpp Fri Apr 17 21:27:21 2009
@@ -257,6 +257,9 @@
/** The playing team is the team whose turn it is. */
size_t playing_team() const { return activeTeam_; }
+ bool auto_shroud_updates() const { return auto_shroud_updates_; }
+ void set_auto_shroud_updates(bool value) { auto_shroud_updates_ =
value; }
+
bool team_valid() const { return currentTeam_ < teams_.size(); }
std::string current_team_name() const;
@@ -331,6 +334,8 @@
bool invalidateUnit_;
map_location displayedUnitHex_;
+
+ bool auto_shroud_updates_;
struct overlay {
overlay(const std::string& img, const std::string& halo_img,
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Fri Apr 17 21:27:21 2009
@@ -626,7 +626,7 @@
}
for (size_t side = 0; side != teams->size(); side++) {
- if (clear_fog_side[side] &&
(*teams)[side].auto_shroud_updates()) {
+ if (clear_fog_side[side] &&
screen->auto_shroud_updates()) {
clear_shroud(*screen,*game_map,*units,*teams,side);
}
}
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Fri Apr 17 21:27:21 2009
@@ -1192,14 +1192,14 @@
bool menu_handler::clear_shroud(const unsigned int team_num)
{
- bool cleared = teams_[team_num - 1].auto_shroud_updates() &&
+ bool cleared = gui_->auto_shroud_updates() &&
::clear_shroud(*gui_,map_,units_,teams_,team_num-1);
return cleared;
}
void menu_handler::clear_undo_stack(const unsigned int team_num)
{
- if(teams_[team_num - 1].auto_shroud_updates() == false)
+ if(gui_->auto_shroud_updates() == false)
apply_shroud_changes(undo_stack_,gui_,map_,units_,teams_,team_num-1);
undo_stack_.clear();
}
@@ -1225,10 +1225,10 @@
}
void menu_handler::toggle_shroud_updates(const unsigned int team_num) {
- bool auto_shroud = teams_[team_num - 1].auto_shroud_updates();
+ bool auto_shroud = gui_->auto_shroud_updates();
// If we're turning automatic shroud updates on, then commit
all moves
if(auto_shroud == false) update_shroud_now(team_num);
- teams_[team_num - 1].set_auto_shroud_updates(!auto_shroud);
+ gui_->set_auto_shroud_updates(!auto_shroud);
}
void menu_handler::update_shroud_now(const unsigned int team_num)
Modified: trunk/src/mouse_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Fri Apr 17 21:27:21 2009
@@ -349,7 +349,7 @@
undo_ = false;
if (mouse_handler_base::left_click(x, y, browse)) return false;
- bool check_shroud = teams_[team_num_ - 1].auto_shroud_updates();
+ bool check_shroud = gui_->auto_shroud_updates();
//we use the last registered highlighted hex
//since it's what update our global state
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Fri Apr 17 21:27:21 2009
@@ -951,7 +951,7 @@
{
switch(command) {
case hotkey::HOTKEY_DELAY_SHROUD:
- return teams_[gui_->viewing_team()].auto_shroud_updates() ?
hotkey::ACTION_OFF : hotkey::ACTION_ON;
+ return gui_->auto_shroud_updates() ? hotkey::ACTION_OFF :
hotkey::ACTION_ON;
default:
return hotkey::ACTION_STATELESS;
}
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Fri Apr 17 21:27:21 2009
@@ -881,7 +881,7 @@
return !linger_
&& player_number_-1 == gui_->viewing_team()
&& !events::commands_disabled
- &&
teams_[gui_->viewing_team()].auto_shroud_updates() == false;
+ && gui_->auto_shroud_updates() == false;
// Commands we can only do if in debug mode
case hotkey::HOTKEY_CREATE_UNIT:
Modified: trunk/src/team.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.cpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/team.cpp (original)
+++ trunk/src/team.cpp Fri Apr 17 21:27:21 2009
@@ -356,7 +356,6 @@
villages_(),
shroud_(),
fog_(),
- auto_shroud_updates_(true),
info_(cfg),
countdown_time_(0),
action_bonus_count_(0),
Modified: trunk/src/team.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.hpp?rev=34991&r1=34990&r2=34991&view=diff
==============================================================================
--- trunk/src/team.hpp (original)
+++ trunk/src/team.hpp Fri Apr 17 21:27:21 2009
@@ -284,8 +284,6 @@
bool knows_about_team(size_t index, bool is_multiplayer) const;
bool copy_ally_shroud();
- bool auto_shroud_updates() const { return auto_shroud_updates_; }
- void set_auto_shroud_updates(bool value) { auto_shroud_updates_ =
value; }
bool get_disallow_observers() {return info_.disallow_observers; };
std::string map_colour_to() const { return info_.colour; };
bool no_leader() const { return info_.no_leader; }
@@ -325,8 +323,6 @@
shroud_map shroud_, fog_;
- bool auto_shroud_updates_;
-
team_info info_;
int countdown_time_;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
