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

New orb image wired in.

Browse source
This commit is contained in:
fendrin 2013-06-09 08:43:04 +02:00
parent 7d67312f06
commit 2dff1967bf
5 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/game_config.cfg
View file

@ -50,11 +50,12 @@
game_title="maps/titlescreen.png"
game_title_background="maps/background.jpg"
moved_orb="misc/orb-moved.png"
unmoved_orb="misc/orb-unmoved.png"
partmoved_orb="misc/orb-partmoved.png"
enemy_orb="misc/orb-enemy.png"
ally_orb="misc/orb-ally.png"
orb="misc/orb.png"
enemy_orb_color="black"
unmoved_orb_color="green"
ally_orb_color="blue"
partmoved_orb_color="orange"
moved_orb_color="red"
energy="misc/bar-energy.png"
flag="flags/flag-[1~4].png:150"

BIN
images/misc/orb.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

22
src/game_config.cpp
View file

@ -74,11 +74,12 @@ namespace game_config
std::string game_title,
game_title_background,
// orbs and hp/xp bar
moved_orb,
unmoved_orb,
partmoved_orb,
enemy_orb,
ally_orb,
orb,
moved_orb_color,
unmoved_orb_color,
partmoved_orb_color,
enemy_orb_color,
ally_orb_color,
energy,
// flags
flag,
@ -203,11 +204,12 @@ namespace game_config
game_title = i["game_title"].str();
game_title_background = i["game_title_background"].str();
moved_orb = i["moved_orb"].str();
unmoved_orb = i["unmoved_orb"].str();
partmoved_orb = i["partmoved_orb"].str();
enemy_orb = i["enemy_orb"].str();
ally_orb = i["ally_orb"].str();
orb = i["orb"].str();
moved_orb_color = i["moved_orb_color"].str();
unmoved_orb_color = i["unmoved_orb_color"].str();
partmoved_orb_color = i["partmoved_orb_color"].str();
enemy_orb_color = i["enemy_orb_color"].str();
ally_orb_color = i["ally_orb_color"].str();
energy = i["energy"].str();
flag = i["flag"].str();

11
src/game_config.hpp
View file

@ -76,11 +76,12 @@ namespace game_config
extern std::string game_title,
game_title_background,
// orbs and hp/xp bar
moved_orb,
unmoved_orb,
partmoved_orb,
enemy_orb,
ally_orb,
orb,
unmoved_orb_color,
partmoved_orb_color,
enemy_orb_color,
ally_orb_color,
moved_orb_color,
energy,
// flags
flag,

15
src/unit.cpp
View file

@ -1991,11 +1991,16 @@ void unit::redraw_unit()
}
if(draw_bars) {
const image::locator* orb_img = NULL;
static const image::locator enemy_orb(game_config::images::enemy_orb);
static const image::locator ally_orb(game_config::images::ally_orb);
static const image::locator moved_orb(game_config::images::moved_orb);
static const image::locator unmoved_orb(game_config::images::unmoved_orb);
static const image::locator partmoved_orb(game_config::images::partmoved_orb);
static const image::locator partmoved_orb(game_config::images::orb + "~RC(magenta>" +
game_config::images::partmoved_orb_color + ")" );
static const image::locator moved_orb(game_config::images::orb + "~RC(magenta>" +
game_config::images::moved_orb_color + ")" );
static const image::locator ally_orb(game_config::images::orb + "~RC(magenta>" +
game_config::images::ally_orb_color + ")" );
static const image::locator enemy_orb(game_config::images::orb + "~RC(magenta>" +
game_config::images::enemy_orb_color + ")" );
static const image::locator unmoved_orb(game_config::images::orb + "~RC(magenta>" +
game_config::images::unmoved_orb_color + ")" );
const std::string* energy_file = &game_config::images::energy;