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

Untested [unit][status]healable -> unhealable

Browse source
This commit is contained in:
Alexander van Gessel 2010-03-27 03:20:51 +01:00
parent a1ed51a95b
commit 714e7deaf0
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -7,6 +7,7 @@ Version 1.9.0-svn:
* Updated translations:
* WML Engine:
* Deprecated [set_variable]'s random key, use rand instead.
* Renamed [unit][status] healable to unhealable so it can default to 'no'
* Miscellaneous and bug fixes:
* Defaulted log level to warning again
* Removed the unused gui2 menu bar

2
data/scenario-test.cfg
View file

@ -115,7 +115,7 @@ Xu , Xu , Qxu , Qxu , Ql , Ql
name="Unhealable"
generate_name=yes
[status]
healable=no
unhealable=yes
[/status]
[/unit]
[unit]

2
src/actions.cpp
View file

@ -1734,7 +1734,7 @@ void calculate_healing(int side, bool update_display)
// We look for all allied units, then we see if our healer is near them.
for (unit_map::iterator i = units.begin(); i != units.end(); ++i) {
if (i->second.get_state("not_healable") || i->second.incapacitated())
if (i->second.get_state("unhealable") || i->second.incapacitated())
continue;
DBG_NG << "found healable unit at (" << i->first << ")\n";

9
src/unit.cpp
View file

@ -44,6 +44,7 @@ static lg::log_domain log_unit("unit");
#define DBG_UT LOG_STREAM(debug, log_unit)
#define LOG_UT LOG_STREAM(info, log_unit)
#define WRN_UT LOG_STREAM(warn, log_unit)
#define ERR_UT LOG_STREAM(err, log_unit)
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
@ -435,8 +436,10 @@ unit::unit(unit_map* unitmap, const config& cfg,
{
foreach (const config::attribute &st, status_flags.attribute_range()) {
if (st.first == "healable") {
ERR_UT << "Usage of 'healable' is deprecated, use 'unhealable' instead, "
"support will be removed in 1.9.2.\n";
if (!utils::string_bool(st.second, true))
set_state("not_healable", true);
set_state("unhealable", true);
} else if (utils::string_bool(st.second)) {
set_state(st.first, true);
}
@ -1099,8 +1102,7 @@ const std::map<std::string,std::string> unit::get_states() const
{
std::map<std::string, std::string> all_states;
foreach (std::string const &s, states_) {
if (s == "not_healable") all_states["healable"] = "no";
else all_states[s] = "yes";
all_states[s] = "yes";
}
for (std::map<std::string, state_t>::const_iterator i = known_boolean_state_names_.begin(),
i_end = known_boolean_state_names_.end(); i != i_end; ++i)
@ -1150,6 +1152,7 @@ std::map<std::string, unit::state_t> unit::get_known_boolean_state_names()
known_boolean_state_names_map.insert(std::make_pair("petrified",STATE_PETRIFIED));
known_boolean_state_names_map.insert(std::make_pair("hidden",STATE_HIDDEN));
known_boolean_state_names_map.insert(std::make_pair("not_moved",STATE_NOT_MOVED));
known_boolean_state_names_map.insert(std::make_pair("unhealable",STATE_UNHEALABLE));
//not sure if "guardian" is a yes/no state.
//known_boolean_state_names_map.insert(std::make_pair("guardian",STATE_GUARDIAN));
return known_boolean_state_names_map;

2
src/unit.hpp
View file

@ -160,7 +160,7 @@ public:
bool get_state(const std::string& state) const;
void set_state(const std::string &state, bool value);
enum state_t { STATE_SLOWED = 0, STATE_POISONED, STATE_PETRIFIED,
STATE_HIDDEN, STATE_NOT_MOVED, STATE_UNKNOWN = -1 };
STATE_HIDDEN, STATE_NOT_MOVED, STATE_UNHEALABLE, STATE_UNKNOWN = -1 };
void set_state(state_t state, bool value);
bool get_state(state_t state) const;
static state_t get_known_boolean_state_id(const std::string &state);