immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make shortcut blink in red

1008-fix
DavivaD 2017-10-17 02:35:33 +02:00
parent bf69b86233
commit 2a0c2c38f0
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ui/controls/shortcut.cpp
View File

@ -109,12 +109,6 @@ void CShortcut::Draw()
zoom = 1.0f; zoom = 1.0f;
mode = Gfx::ENG_RSTATE_NORMAL; mode = Gfx::ENG_RSTATE_NORMAL;
} }
if ( (m_state & STATE_DAMAGE) && Math::Mod(m_time, 0.7f) >= 0.3f )
{
icon = 59;
zoom = 0.8f;
mode = Gfx::ENG_RSTATE_NORMAL;
}
if ( m_icon == 128+6 || m_icon == 128+7 || m_icon == 58 ) // pause or film? if ( m_icon == 128+6 || m_icon == 128+7 || m_icon == 58 ) // pause or film?
{ {
icon = -1; // no bottom icon = -1; // no bottom
@ -215,6 +209,27 @@ void CShortcut::Draw()
DrawIcon(m_pos, m_dim, uv1, uv2); DrawIcon(m_pos, m_dim, uv1, uv2);
} }
if ( (m_state & STATE_DAMAGE) && Math::Mod(m_time, 0.7f) >= 0.3f )
{
Math::Point uv1, uv2;
float dp;
m_engine->SetTexture("textures/interface/button2.png");
m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
uv1.x = 159.0f/256.0f;
uv1.y = 240.0f/256.0f;
uv2.x = 145.0f/256.0f;
uv2.y = 256.0f/256.0f;
dp = 0.5f/256.0f;
uv1.x += dp;
uv1.y += dp;
uv2.x -= dp;
uv2.y -= dp;
DrawIcon(m_pos, m_dim, uv1, uv2);
}
} }
// Draw the vertex array. // Draw the vertex array.