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

Merge branch 'master' of git://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Chris Beck 2014-07-22 17:15:05 -04:00
commit 7b85bddb5f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/core/help.cfg
View file

@ -541,7 +541,7 @@ You can see what type of behavior the mixed terrain gives by mousing over its he
<header>text='Defense Caps'</header>" + _"
Some units have <italic>text='defense caps'</italic> for a particular basic terrain type. These units suffer a penalty on mixed terrains with that type — their defense can't exceed the cap." + _"
Some units have <italic>text='defense caps'</italic> for a particular basic terrain type. These units suffer a penalty on mixed terrains with that type — their defense cannot exceed the cap." + _"
For example, the <ref>text='Loyalist Cavalryman' dst='..unit_Cavalryman'</ref> has a defense rating of 30% on forests, and a defense cap for forests. Thus, on forested hills, he has a defense rating of 30% rather than 40%, because the mixed rating cannot exceed the cap." + _"

6
data/core/macros/traits.cfg
View file

@ -171,7 +171,7 @@
female_name= _ "female^healthy"
description= _ "Always rest heals"
[effect]
apply_to = "healthy"
apply_to="healthy"
[/effect]
[effect]
apply_to=hitpoints
@ -193,7 +193,7 @@
female_name= _ "female^fearless"
description= _ "Fights normally during unfavorable times of day/night"
[effect]
apply_to = "fearless"
apply_to="fearless"
[/effect]
[/trait]
#enddef
@ -209,7 +209,7 @@
female_name= _ "female^fearless"
description= _ "Fights normally during unfavorable times of day/night"
[effect]
apply_to = "fearless"
apply_to="fearless"
[/effect]
[/trait]
#enddef

6
src/variable_info.cpp
View file

@ -257,17 +257,17 @@ namespace
/// this type of value like '.length' are readonly values so we only support them for reading.
/// espacily we don't want to return non const references.
template<>
const config::attribute_value & as_skalar_visitor<vit_const>::from_temporary(typename as_skalar_visitor::param_type state) const
const config::attribute_value & as_skalar_visitor<vit_const>::from_temporary(as_skalar_visitor::param_type state) const
{
return state.temp_val_;
}
template<>
config::attribute_value & as_skalar_visitor<vit_create_if_not_existent>::from_temporary(typename as_skalar_visitor::param_type) const
config::attribute_value & as_skalar_visitor<vit_create_if_not_existent>::from_temporary(as_skalar_visitor::param_type) const
{
throw invalid_variablename_exception();
}
template<>
config::attribute_value & as_skalar_visitor<vit_throw_if_not_existent>::from_temporary(typename as_skalar_visitor::param_type) const
config::attribute_value & as_skalar_visitor<vit_throw_if_not_existent>::from_temporary(as_skalar_visitor::param_type) const
{
throw invalid_variablename_exception();
}