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

Merged 2006-08-26T13:34:46Z!isaac@users.sf.net & 2006-08-26T14:12:13Z!isaac@users.sf.net into trunk

Browse source
This commit is contained in:
Isaac Clerencia Perez 2006-08-26 14:14:04 +00:00
parent b4930b665a
commit 23999481b3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/theme.cpp
View file

@ -681,10 +681,9 @@ void theme::remove_object(std::string id){
}
void theme::set_object_location(theme::object& element, std::string rect_str, std::string ref_id){
theme::object& ref_element = *(new object());
theme::object& ref_element = element;
if (ref_id.empty()) {
ref_id = element.get_id();
ref_element = element;
}
else {
ref_element = find_element(ref_id);
@ -725,7 +724,8 @@ void theme::modify(const config* cfg){
}
theme::object& theme::find_element(std::string id){
theme::object* res = new theme::object();
static theme::object empty_object;
theme::object* res = &empty_object;
for (std::vector<theme::panel>::iterator p = panels_.begin(); p != panels_.end(); ++p){
if (p->get_id() == id) { res = &(*p); }
}