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

Applied patch patch #971:

Browse source 
Tommy fixed two bugs in the Python AI: There was a possible crash if
Python AIs would somehow try to attack non-existing units (or attack
with a non existing unit?), and unit.name used the C++ ::name() method
but ::underlying_description() (the patch had ::description() but this
seems the right one) is the WML description tag which should be
returned according to documentation.
This commit is contained in:
Elias Pschernig 2008-02-07 22:08:22 +00:00
parent 934b071747
commit 8609817b3b
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ai_python.cpp
View file

@ -436,7 +436,7 @@ bool python_ai::is_unit_valid(const unit* unit)
static PyObject* unit_get_name(wesnoth_unit* unit, void* /*closure*/)
{
u_check;
return Py_BuildValue(STRINGVALUE, unit->unit_->name().c_str());
return Py_BuildValue(STRINGVALUE, unit->unit_->underlying_description().c_str());
}
static PyObject* unit_is_enemy(wesnoth_unit* unit, void* /*closure*/)
@ -1450,6 +1450,20 @@ PyObject* python_ai::wrapper_attack_unit(PyObject* /*self*/, PyObject* args)
// and then the code below will horribly fail).
if (!tiles_adjacent(*from->location_, *to->location_))
return_none;
// check if units actually exist
bool fromexists = false;
bool toexists = false;
for(unit_map::const_iterator i = running_instance->get_info().units.begin(); i != running_instance->get_info().units.end(); ++i) {
if (i->first == *from->location_) {
fromexists = true;
}
else if (i->first == *to->location_) {
toexists = true;
}
}
if (!fromexists or !toexists) return_none;
info& inf = running_instance->get_info();