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

Use 'orb' instead of 'ball' in game_config.

Browse source
This commit is contained in:
Ali El Gariani 2010-08-04 03:22:25 +00:00
parent c143c82cdf
commit 732bd390a4
4 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/game_config.cfg
View file

@ -82,11 +82,11 @@
game_logo="misc/logo.png"
game_icon="wesnoth-icon-small.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"
moved_orb="misc/ball-moved.png"
unmoved_orb="misc/ball-unmoved.png"
partmoved_orb="misc/ball-partmoved.png"
enemy_orb="misc/ball-enemy.png"
ally_orb="misc/ball-ally.png"
#ifdef TINY
energy="misc/bar-energy-tinygui.png"
#else

20
src/game_config.cpp
View file

@ -68,11 +68,11 @@ namespace game_config
game_title,
game_logo,
// orbs and hp/xp bar
moved_ball,
unmoved_ball,
partmoved_ball,
enemy_ball,
ally_ball,
moved_orb,
unmoved_orb,
partmoved_orb,
enemy_orb,
ally_orb,
energy,
// flags
flag,
@ -189,11 +189,11 @@ namespace game_config
game_title = i["game_title"].str();
game_logo = i["game_logo"].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();
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();
energy = i["energy"].str();
flag = i["flag"].str();

10
src/game_config.hpp
View file

@ -74,11 +74,11 @@ namespace game_config
game_title,
game_logo,
// orbs and hp/xp bar
moved_ball,
unmoved_ball,
partmoved_ball,
enemy_ball,
ally_ball,
moved_orb,
unmoved_orb,
partmoved_orb,
enemy_orb,
ally_orb,
energy,
// flags
flag,

20
src/unit.cpp
View file

@ -1880,28 +1880,28 @@ void unit::redraw_unit()
}
if(draw_bars) {
const image::locator* orb_img = NULL;
static const image::locator enemy_ball(game_config::images::enemy_ball);
static const image::locator ally_ball(game_config::images::ally_ball);
static const image::locator moved_ball(game_config::images::moved_ball);
static const image::locator unmoved_ball(game_config::images::unmoved_ball);
static const image::locator partmoved_ball(game_config::images::partmoved_ball);
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);
const std::string* energy_file = &game_config::images::energy;
if(size_t(side()) != disp.viewing_team()+1) {
if(disp.team_valid() &&
disp.get_teams()[disp.viewing_team()].is_enemy(side())) {
orb_img = &enemy_ball;
orb_img = &enemy_orb;
} else {
orb_img = &ally_ball;
orb_img = &ally_orb;
}
} else {
orb_img = &moved_ball;
orb_img = &moved_orb;
if(disp.playing_team() == disp.viewing_team() && !user_end_turn()) {
if (movement_left() == total_movement()) {
orb_img = &unmoved_ball;
orb_img = &unmoved_orb;
} else if (unit_can_move(*this)) {
orb_img = &partmoved_ball;
orb_img = &partmoved_orb;
}
}
}