Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[*] Improved auto-cast animation

Browse source
This commit is contained in:
cybermind 2015-02-17 23:08:44 +05:00
parent cb5b7d32bc
commit ec7c277249
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/include/color.h
View file

@ -42,6 +42,7 @@ public:
CColor() : R(0), G(0), B(0), A(0) {}
CColor(unsigned char r, unsigned char g, unsigned char b,
unsigned char a = 0) : R(r), G(g), B(b), A(a) {}
CColor(const CColor &color) : R(color.R), G(color.G), B(color.B), A(color.A) {}
void Parse(lua_State *l, int index = -1);

1
src/ui/icons.cpp
View file

@ -189,6 +189,7 @@ void CIcon::DrawUnitIcon(const ButtonStyle &style, unsigned flags,
if (!(flags & IconSelected) && (flags & IconAutoCast)) {
s.Default.BorderColorRGB = UI.ButtonPanel.AutoCastBorderColorRGB;
s.Default.BorderColor = 0;
s.Default.BorderSize = 2;
}
if (Preference.IconsShift) {
// Left and top edge of Icon

14
src/ui/uibuttons_proc.cpp
View file

@ -121,7 +121,19 @@ void DrawUIButton(ButtonStyle *style, unsigned flags, int x, int y,
// Border
//
if (!p->BorderColor) {
p->BorderColor = Video.MapRGB(TheScreen->format, p->BorderColorRGB);
CColor color(p->BorderColorRGB);
if (p->BorderColorRGB.R > 0 || p->BorderColorRGB.G > 0 || p->BorderColorRGB.B > 0) {
int shift = GameCycle % 0x20;
color.R >>= shift / 2;
color.G >>= shift / 2;
color.B >>= shift / 2;
if (shift >= 0x10) {
color.R = (p->BorderColorRGB.R > 0) << ((shift - 0x10) / 2);
color.G = (p->BorderColorRGB.G > 0) << ((shift - 0x10) / 2);
color.B = (p->BorderColorRGB.B > 0) << ((shift - 0x10) / 2);
}
}
p->BorderColor = Video.MapRGB(TheScreen->format, color);
}
if (p->BorderSize) {
for (int i = 0; i < p->BorderSize; ++i) {