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

changes to amla displays.

Browse source
This commit is contained in:
John W. C. McNabb 2006-01-26 00:02:32 +00:00
parent 47dee2d5de
commit f5a0f35978
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -61,6 +61,7 @@ SVN trunk (1.1+svn):
* New castle tiles
* Added Drake, Gladiator, Enforcer, and Slasher death animations
* user interface
* added new image in advancement tag that is displayed in advancement dialog and changed old image to icon in advancement tag.
* centered title screen logo for 1024x768 (still off-center for 800x600)
* prevent icons in themes from being scaled up (only scaling down is allowed)
* fix menu capitalization consistency (#4972)

2
data/amla.cfg
View file

@ -6,6 +6,7 @@
max_times=100
id=tough_{HP_ADVANCE}
description= _ "Max HP bonus +" {HP_ADVANCE} _", MAX XP +25%"
icon="misc/icon-amla-tough.png"
image="misc/icon-amla-tough.png"
[effect]
apply_to=hitpoints
@ -26,6 +27,7 @@ max_times=100
id=necroheal
description= _ "Full Heal"
image="misc/icon-amla-fullheal.png"
icon="misc/icon-amla-fullheal.png"
[effect]
apply_to=hitpoints
increase_total=0%

6
src/dialogs.cpp
View file

@ -80,7 +80,11 @@ void advance_unit(const game_data& info,
sample_units.push_back(::get_advanced_unit(info,units,loc,u->second.type().id()));
sample_units.back().add_modification("advance",**mod);
const unit_type& type = sample_units.back().type();
lang_options.push_back(IMAGE_PREFIX + type.image() + COLUMN_SEPARATOR + (**mod)["description"].str());
if((**mod)["image"].str().size()){
lang_options.push_back(IMAGE_PREFIX + (**mod)["image"].str() + COLUMN_SEPARATOR + (**mod)["description"].str());
}else{
lang_options.push_back(IMAGE_PREFIX + type.image() + COLUMN_SEPARATOR + (**mod)["description"].str());
}
}
LOG_DP << "options: " << options.size() << "\n";

2
src/unit.cpp
View file

@ -1170,7 +1170,7 @@ std::vector<std::pair<std::string,std::string> > unit::amla_icons() const
const config::child_list& advances = type().modification_advancements();
for(config::child_list::const_iterator i = advances.begin(); i != advances.end(); ++i) {
icon.first=(**i)["image"];
icon.first=(**i)["icon"];
icon.second=(**i)["description"];
for(unsigned int j=0;j<(modification_count("advance",(**i)["id"]));j++) {