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

Use only SDL_Color and stop using its synonym SDL_Colour

Browse source
This commit is contained in:
Ali El Gariani 2010-06-02 22:14:32 +00:00
parent 8934cebdf1
commit d9997e472d
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/map_label.cpp
View file

@ -385,7 +385,7 @@ const map_location& terrain_label::location() const
return loc_;
}
const SDL_Colour& terrain_label::colour() const
const SDL_Color& terrain_label::colour() const
{
return colour_;
}

2
src/map_label.hpp
View file

@ -106,7 +106,7 @@ public:
bool visible_in_shroud() const;
bool immutable() const;
const map_location& location() const;
const SDL_Colour& colour() const;
const SDL_Color& colour() const;
void set_text(const t_string&);

4
src/unit.cpp
View file

@ -941,7 +941,7 @@ std::string unit::transparent() const {
return image;
}
SDL_Colour unit::hp_color() const
SDL_Color unit::hp_color() const
{
double unit_energy = 0.0;
SDL_Color energy_colour = {0,0,0,0};
@ -978,7 +978,7 @@ SDL_Colour unit::hp_color() const
return energy_colour;
}
SDL_Colour unit::xp_color() const
SDL_Color unit::xp_color() const
{
const SDL_Color near_advance_colour = {255,255,255,0};
const SDL_Color mid_advance_colour = {150,255,255,0};

4
src/unit.hpp
View file

@ -120,9 +120,9 @@ public:
*/
bool get_experience(int xp) { experience_ += xp; return advances(); }
/** Colors for the unit's hitpoints. */
SDL_Colour hp_color() const;
SDL_Color hp_color() const;
/** Colors for the unit's XP. */
SDL_Colour xp_color() const;
SDL_Color xp_color() const;
/** Set to true for some scenario-specific units which should not be renamed */
bool unrenamable() const { return unrenamable_; }
int side() const { return side_; }