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

Renamed some images and fixed their references.

Browse source 
Also fixed a small bug in the top border, always using the same images
instead of alternating.
This commit is contained in:
Mark de Wever 2007-08-11 14:08:03 +00:00
parent 246f65b846
commit 2f750bb152
10 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
data/core/images/terrain/off-map/wood.png → data/core/images/terrain/off-map/background.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
data/core/images/terrain/off-map/fade_border_bottom_even.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
data/core/images/terrain/off-map/fade_border_bottom_odd.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
data/core/images/terrain/off-map/fade_border_top_even.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
data/core/images/terrain/off-map/fade_border_top_odd.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

11
data/themes/default.cfg
View file

@ -55,7 +55,7 @@
[main_map_border]
border_size = 0.5
background_image = "terrain/off-map/wood" # FIXME rename
background_image = "terrain/off-map/background.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"
@ -71,12 +71,11 @@
border_image_left = "terrain/off-map/fade_border_left.png"
border_image_right = "terrain/off-map/fade_border_right.png"
# FIXME the top and bottom images have the wrong for odd/even
border_image_top_odd = "terrain/off-map/fade_border_top_even.png"
border_image_top_even = "terrain/off-map/fade_border_top_odd.png"
border_image_top_odd = "terrain/off-map/fade_border_top_odd.png"
border_image_top_even = "terrain/off-map/fade_border_top_even.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_even.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
[/main_map_border]

11
data/themes/dfool.cfg
View file

@ -91,7 +91,7 @@
[main_map_border]
border_size = 0.5
background_image = "terrain/off-map/wood" # FIXME rename
background_image = "terrain/off-map/background.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"
@ -107,12 +107,11 @@
border_image_left = "terrain/off-map/fade_border_left.png"
border_image_right = "terrain/off-map/fade_border_right.png"
# FIXME the top and bottom images have the wrong for odd/even
border_image_top_odd = "terrain/off-map/fade_border_top_even.png"
border_image_top_even = "terrain/off-map/fade_border_top_odd.png"
border_image_top_odd = "terrain/off-map/fade_border_top_odd.png"
border_image_top_even = "terrain/off-map/fade_border_top_even.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_even.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
[/main_map_border]

11
data/themes/editor.cfg
View file

@ -490,7 +490,7 @@
[main_map_border]
border_size = 0.5
background_image = "terrain/off-map/wood" # FIXME rename
background_image = "terrain/off-map/background.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"
@ -506,12 +506,11 @@
border_image_left = "terrain/off-map/fade_border_left.png"
border_image_right = "terrain/off-map/fade_border_right.png"
# FIXME the top and bottom images have the wrong for odd/even
border_image_top_odd = "terrain/off-map/fade_border_top_even.png"
border_image_top_even = "terrain/off-map/fade_border_top_odd.png"
border_image_top_odd = "terrain/off-map/fade_border_top_odd.png"
border_image_top_even = "terrain/off-map/fade_border_top_even.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_even.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
[/main_map_border]

11
data/themes/experimental.cfg
View file

@ -46,7 +46,7 @@
[main_map_border]
border_size = 0.5
background_image = "terrain/off-map/wood" # FIXME rename
background_image = "terrain/off-map/background.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"
@ -62,12 +62,11 @@
border_image_left = "terrain/off-map/fade_border_left.png"
border_image_right = "terrain/off-map/fade_border_right.png"
# FIXME the top and bottom images have the wrong for odd/even
border_image_top_odd = "terrain/off-map/fade_border_top_even.png"
border_image_top_even = "terrain/off-map/fade_border_top_odd.png"
border_image_top_odd = "terrain/off-map/fade_border_top_odd.png"
border_image_top_even = "terrain/off-map/fade_border_top_even.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_even.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
[/main_map_border]

4
src/display.cpp
View file

@ -753,7 +753,7 @@ void display::draw_all_panels()
*/
static void draw_background(surface screen, const SDL_Rect& area)
{
static const surface wood(image::get_image("terrain/off-map/wood.png"));
static const surface wood(image::get_image("terrain/off-map/background.png"));
static const unsigned int width = wood->w;
static const unsigned int height = wood->h;
wassert(!wood.null());
@ -1140,7 +1140,7 @@ void display::draw_border(const gamemap::location& loc, const int xpos, const in
border = image::get_image(theme_.border().border_image_top_even, image::SCALED_TO_ZOOM);
} else {
rect.y = ypos + zoom_/2;
border = image::get_image(theme_.border().border_image_top_even, image::SCALED_TO_ZOOM);
border = image::get_image(theme_.border().border_image_top_odd, image::SCALED_TO_ZOOM);
}
SDL_BlitSurface( border, NULL, screen_.getSurface(), &rect);