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

Strip trailing whitespace.

Browse source
This commit is contained in:
Mark de Wever 2010-08-23 18:31:59 +00:00
parent 6c8d3b44f3
commit 334678565d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/image.cpp
View file

@ -1015,7 +1015,7 @@ static TYPE simplify_type(const image::locator& i_locator, TYPE type){
if (red_adjust==0 && green_adjust==0 && blue_adjust==0)
type = SCALED_TO_HEX;
}
if(type == SCALED_TO_HEX) {
if(zoom == tile_size)
type = HEXED;

2
src/persist_context.cpp
View file

@ -224,7 +224,7 @@ bool persist_file_context::set_var(const std::string &global,const config &val,
active_->cfg_.remove_attribute("variables");
active_->cfg_.add_child("variables",bactive);
return ret;
} else
} else
return true;
}
void persist_context::set_node(const std::string &name) {

4
src/persist_var.cpp
View file

@ -31,7 +31,7 @@ struct persist_choice: mp_sync::user_choice {
const persist_context &ctx;
std::string var_name;
int side;
persist_choice(const persist_context &context,const std::string &name, int side_num)
persist_choice(const persist_context &context,const std::string &name, int side_num)
: ctx(context)
, var_name(name)
, side(side_num) {
@ -122,7 +122,7 @@ void verify_and_get_global_variable(const vconfig &pcfg)
LOG_PERSIST << "Error: [get_global_variable] attribute \"side\" specifies invalid side number.";
valid = false;
} else {
if ((side != resources::controller->current_side())
if ((side != resources::controller->current_side())
&& !((*resources::teams)[side - 1].is_local())) {
if ((*resources::teams)[resources::controller->current_side() - 1].is_local()) {
config data;