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

Move the appending of '.png' to image paths...

Browse source 
...from C++ to the terrain BUILDER macros
This commit is contained in:
Alexander van Gessel 2010-06-18 16:28:14 +01:00
parent 14a066096b
commit 32980eda73
6 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
data/core/terrain-graphics/builder.cfg
View file

@ -1,44 +1,44 @@
#textdomain wesnoth
#define IMAGE_SINGLE IMAGESTEM POSTFIX
{IMAGESTEM}{POSTFIX}#enddef
{IMAGESTEM}{POSTFIX}.png#enddef
#define ANIMATION_01_INTERNAL IMAGESTEM POSTFIX DURATION
{IMAGESTEM}-A01{POSTFIX}:{DURATION} #enddef
{IMAGESTEM}-A01{POSTFIX}.png:{DURATION} #enddef
#define ANIMATION_02_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_01_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A02{POSTFIX}:{DURATION}#enddef
{ANIMATION_01_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A02{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_03_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_02_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A03{POSTFIX}:{DURATION}#enddef
{ANIMATION_02_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A03{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_04_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_03_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A04{POSTFIX}:{DURATION}#enddef
{ANIMATION_03_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A04{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_05_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_04_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A05{POSTFIX}:{DURATION}#enddef
{ANIMATION_04_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A05{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_06_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_05_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A06{POSTFIX}:{DURATION}#enddef
{ANIMATION_05_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A06{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_07_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_06_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A07{POSTFIX}:{DURATION}#enddef
{ANIMATION_06_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A07{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_08_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_07_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A08{POSTFIX}:{DURATION}#enddef
{ANIMATION_07_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A08{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_09_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_08_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A09{POSTFIX}:{DURATION}#enddef
{ANIMATION_08_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A09{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_10_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_09_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A10{POSTFIX}:{DURATION}#enddef
{ANIMATION_09_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A10{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_11_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_10_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A11{POSTFIX}:{DURATION}#enddef
{ANIMATION_10_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A11{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_12_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_11_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A12{POSTFIX}:{DURATION}#enddef
{ANIMATION_11_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A12{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_13_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_12_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A13{POSTFIX}:{DURATION}#enddef
{ANIMATION_12_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A13{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_14_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_13_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A14{POSTFIX}:{DURATION}#enddef
{ANIMATION_13_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A14{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_15_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_14_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A15{POSTFIX}:{DURATION}#enddef
{ANIMATION_14_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A15{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_16_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_15_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A16{POSTFIX}:{DURATION}#enddef
{ANIMATION_15_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A16{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_17_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_16_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A17{POSTFIX}:{DURATION}#enddef
{ANIMATION_16_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A17{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_18_INTERNAL IMAGESTEM POSTFIX DURATION
{ANIMATION_17_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A18{POSTFIX}:{DURATION}#enddef
{ANIMATION_17_INTERNAL {IMAGESTEM} {POSTFIX} {DURATION}},{IMAGESTEM}-A18{POSTFIX}.png:{DURATION}#enddef
#define ANIMATION_03 IMAGESTEM POSTFIX
{ANIMATION_03_INTERNAL {IMAGESTEM} {POSTFIX} 100}#enddef

2
data/themes/default.cfg
View file

@ -69,7 +69,7 @@
# this image is processed by the terrain matching code so should be
# in the terrains directory and should ommit the 'terrain/' prefix
# and the '.png' suffix
tile_image = "off-map/alpha"
tile_image = "off-map/alpha.png"
corner_image_top_left = "terrain/off-map/fade_corner_top_left.png"
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_left.png"

2
data/themes/dfool.cfg
View file

@ -103,7 +103,7 @@
# this image is processed by the terrain matching code so should be
# in the terrains directory and should ommit the 'terrain/' prefix
# and the '.png' suffix
tile_image = "off-map/alpha"
tile_image = "off-map/alpha.png"
corner_image_top_left = "terrain/off-map/fade_corner_top_left.png"
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_left.png"

2
data/themes/editor.cfg
View file

@ -69,7 +69,7 @@
# this image is processed by the terrain matching code so should be
# in the terrains directory and should ommit the 'terrain/' prefix
# and the '.png' suffix
tile_image = "off-map/alpha"
tile_image = "off-map/alpha.png"
corner_image_top_left = "terrain/off-map/fade_corner_top_left_editor.png"
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_left_editor.png"

2
data/themes/experimental.cfg
View file

@ -57,7 +57,7 @@
# this image is processed by the terrain matching code so should be
# in the terrains directory and should ommit the 'terrain/' prefix
# and the '.png' suffix
tile_image = "off-map/alpha"
tile_image = "off-map/alpha.png"
corner_image_top_left = "terrain/off-map/fade_corner_top_left.png"
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_left.png"

13
src/builder.cpp
View file

@ -278,7 +278,7 @@ void terrain_builder::rebuild_terrain(const map_location &loc)
const std::string filename =
map().get_terrain_info(map().get_terrain(loc)).minimap_image();
animated<image::locator> img_loc;
img_loc.add_frame(100,image::locator("terrain/" + filename + ".png"));
img_loc.add_frame(100,image::locator("terrain/" + filename));
img_loc.start_animation(0, true);
btile.images_background.push_back(img_loc);
@ -287,7 +287,7 @@ void terrain_builder::rebuild_terrain(const map_location &loc)
const std::string filename_ovl =
map().get_terrain_info(map().get_terrain(loc)).minimap_image_overlay();
animated<image::locator> img_loc_ovl;
img_loc_ovl.add_frame(100,image::locator("terrain/" + filename_ovl + ".png"));
img_loc_ovl.add_frame(100,image::locator("terrain/" + filename_ovl));
img_loc_ovl.start_animation(0, true);
btile.images_background.push_back(img_loc_ovl);
}
@ -325,7 +325,10 @@ bool terrain_builder::rule_valid(const building_rule &rule) const
// we already precached file existence in the constructor
// but only for filenames not using ".."
if(!image::exists("terrain/" + s + ".png", s.find("..") == std::string::npos)){
if(!image::exists("terrain/" + s, s.find("..") == std::string::npos)){
// This warning can be removed after 1.9.2
if(image::exists("terrain/" + s + ".png", s.find("..") == std::string::npos))
lg::wml_error << "Terrain image '" << s << "' misses the '.png' extension\n";
// printf("%s\n",s.c_str());
return false;
}
@ -367,9 +370,9 @@ bool terrain_builder::start_animation(building_rule &rule)
time = 100;
}
if(image->global_image) {
image_vector.push_back(animated<image::locator>::frame_description(time,image::locator("terrain/" + str + ".png",constraint->second.loc, image->center_x, image->center_y)));
image_vector.push_back(animated<image::locator>::frame_description(time,image::locator("terrain/" + str,constraint->second.loc, image->center_x, image->center_y)));
} else {
image_vector.push_back(animated<image::locator>::frame_description(time,image::locator("terrain/" + str + ".png")));
image_vector.push_back(animated<image::locator>::frame_description(time,image::locator("terrain/" + str)));
}
}