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

Move all images game_config keys into [images] and drop the _image suffix

Browse source
This commit is contained in:
Ali El Gariani 2010-08-04 03:22:15 +00:00
parent 6bcbae2f92
commit 39faaf3fa2
2 changed files with 51 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
data/game_config.cfg
View file

@ -76,38 +76,40 @@
footprint_teleport_enter="footsteps/teleport-in.png"
footprint_teleport_exit="footsteps/teleport-out.png"
# List of images that will be randomly selected for the titlescreen background
game_title="maps/wesnoth.png,maps/wesnoth.png"
game_logo="misc/logo.png"
game_icon="wesnoth-icon-small.png"
[images]
# List of images that will be randomly selected for the titlescreen background
game_title="maps/wesnoth.png,maps/wesnoth.png"
game_logo="misc/logo.png"
game_icon="wesnoth-icon-small.png"
moved_ball_image="misc/ball-moved.png"
unmoved_ball_image="misc/ball-unmoved.png"
partmoved_ball_image="misc/ball-partmoved.png"
enemy_ball_image="misc/ball-enemy.png"
ally_ball_image="misc/ball-ally.png"
moved_ball="misc/ball-moved.png"
unmoved_ball="misc/ball-unmoved.png"
partmoved_ball="misc/ball-partmoved.png"
enemy_ball="misc/ball-enemy.png"
ally_ball="misc/ball-ally.png"
#ifdef TINY
energy_image="misc/bar-energy-tinygui.png"
energy="misc/bar-energy-tinygui.png"
#else
energy_image="misc/bar-energy.png"
energy="misc/bar-energy.png"
#endif
flag_image="flags/flag-1.png:150,flags/flag-2.png:150,flags/flag-3.png:150,flags/flag-4.png:150"
flag_icon_image="flags/flag-icon.png"
flag="flags/flag-1.png:150,flags/flag-2.png:150,flags/flag-3.png:150,flags/flag-4.png:150"
flag_icon="flags/flag-icon.png"
terrain_mask_image="terrain/alphamask.png"
grid_image_top="terrain/grid-top.png"
grid_image_bottom="terrain/grid-bottom.png"
mouseover_image="misc/hover-hex.png"
selected_image=""
unreachable_image="terrain/darken.png"
linger_image="terrain/darken-linger.png"
terrain_mask="terrain/alphamask.png"
grid_top="terrain/grid-top.png"
grid_bottom="terrain/grid-bottom.png"
mouseover="misc/hover-hex.png"
selected=""
unreachable="terrain/darken.png"
linger="terrain/darken-linger.png"
observer_image="misc/eye.png"
tod_bright_image="misc/tod-bright.png"
tod_dark_image="misc/tod-dark.png"
level_image="misc/icon-advance.png"
ellipsis_image="misc/icon-ellipsis.png"
observer="misc/eye.png"
tod_bright="misc/tod-bright.png"
tod_dark="misc/tod-dark.png"
level="misc/icon-advance.png"
ellipsis="misc/icon-ellipsis.png"
[/images]
fog_prefix="terrain/fog"
shroud_prefix="terrain/void"

48
src/game_config.cpp
View file

@ -183,35 +183,35 @@ namespace game_config
default_victory_music = v["default_victory_music"].str();
default_defeat_music = v["default_defeat_music"].str();
{
if(const config &i = v.child("images")){
using namespace game_config::images;
game_icon = v["game_icon"].str();
game_title = v["game_title"].str();
game_logo = v["game_logo"].str();
game_icon = i["game_icon"].str();
game_title = i["game_title"].str();
game_logo = i["game_logo"].str();
moved_ball = v["moved_ball_image"].str();
unmoved_ball = v["unmoved_ball_image"].str();
partmoved_ball = v["partmoved_ball_image"].str();
enemy_ball = v["enemy_ball_image"].str();
ally_ball = v["ally_ball_image"].str();
energy = v["energy_image"].str();
moved_ball = i["moved_ball"].str();
unmoved_ball = i["unmoved_ball"].str();
partmoved_ball = i["partmoved_ball"].str();
enemy_ball = i["enemy_ball"].str();
ally_ball = i["ally_ball"].str();
energy = i["energy"].str();
flag = v["flag_image"].str();
flag_icon = v["flag_icon_image"].str();
flag = i["flag"].str();
flag_icon = i["flag_icon"].str();
terrain_mask = v["terrain_mask_image"].str();
grid_top = v["grid_image_top"].str();
grid_bottom = v["grid_image_bottom"].str();
mouseover = v["mouseover_image"].str();
selected = v["selected_image"].str();
unreachable = v["unreachable_image"].str();
linger = v["linger_image"].str();
terrain_mask = i["terrain_mask"].str();
grid_top = i["grid_top"].str();
grid_bottom = i["grid_bottom"].str();
mouseover = i["mouseover"].str();
selected = i["selected"].str();
unreachable = i["unreachable"].str();
linger = i["linger"].str();
observer = v["observer_image"].str();
tod_bright = v["tod_bright_image"].str();
tod_dark = v["tod_dark_image"].str();
level = v["level_image"].str();
ellipsis = v["ellipsis_image"].str();
observer = i["observer"].str();
tod_bright = i["tod_bright"].str();
tod_dark = i["tod_dark"].str();
level = i["level"].str();
ellipsis = i["ellipsis"].str();
} // images
hp_bar_scaling = v["hp_bar_scaling"].to_double(0.666);