Rename text.png to effect03.png

master
krzys-h 2015-08-06 22:41:54 +02:00
parent 1e97d41a2d
commit 0d00952b10
7 changed files with 9 additions and 10 deletions

2
data

@ -1 +1 @@
Subproject commit 952a00da023d959317b514a550131e304c875413
Subproject commit 1c2510a9649eda7e0861a05691888ede3869aaf6

View File

@ -2250,7 +2250,7 @@ Texture CEngine::LoadTexture(const std::string& name, const TextureCreateParams&
bool CEngine::LoadAllTextures()
{
LoadTexture("textures/interface/text.png");
LoadTexture("textures/effect03.png");
m_miceTexture = LoadTexture("textures/interface/mouse.png");
LoadTexture("textures/interface/button1.png");
LoadTexture("textures/interface/button2.png");
@ -4245,7 +4245,7 @@ void CEngine::DrawShadow()
SetMaterial(material);
// TODO: create a separate texture
SetTexture("textures/interface/text.png");
SetTexture("textures/effect03.png");
Math::Point ts, ti;

View File

@ -189,7 +189,7 @@ void NameParticle(std::string &name, int num)
if (num == 1) name = "effect00.png";
else if (num == 2) name = "effect01.png";
else if (num == 3) name = "effect02.png";
else if (num == 4) name = "interface/text.png";
else if (num == 4) name = "effect03.png";
else name = "";
}
@ -3537,7 +3537,7 @@ void CParticle::DrawParticle(int sheet)
// Draw tire marks.
if (m_wheelTraceTotal > 0 && sheet == SH_WORLD)
{
m_engine->SetTexture("textures/interface/text.png");
m_engine->SetTexture("textures/effect03.png");
m_engine->SetState(ENG_RSTATE_ALPHA);
Math::Matrix matrix;
matrix.LoadIdentity();

View File

@ -842,7 +842,7 @@ void CText::DrawCharAndAdjustPos(UTF8Char ch, FontType font, float size, Math::P
if ( icon >= 192 )
{
icon -= 192;
m_engine->SetTexture("textures/interface/text.png");
m_engine->SetTexture("textures/effect03.png");
m_engine->SetState(ENG_RSTATE_TTEXTURE_WHITE);
}
else if ( icon >= 128 )
@ -1051,4 +1051,3 @@ CharTexture CText::CreateCharTexture(UTF8Char ch, CachedFont* font)
} // namespace Gfx

View File

@ -517,7 +517,7 @@ void CControl::Draw()
if ( icon >= 192 )
{
icon -= 192;
m_engine->SetTexture("textures/interface/text.png");
m_engine->SetTexture("textures/effect03.png");
m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
}
else if ( icon >= 128 )

View File

@ -1224,7 +1224,7 @@ void CEdit::DrawPart(Math::Point pos, Math::Point dim, int icon)
Math::Point uv1, uv2;
float dp;
m_engine->SetTexture("textures/interface/text.png");
m_engine->SetTexture("textures/effect03.png");
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
uv1.x = (16.0f/256.0f)*(icon%16);

View File

@ -128,7 +128,7 @@ void CShortcut::Draw()
if ( icon >= 192 )
{
icon -= 192;
m_engine->SetTexture("textures/interface/text.png");
m_engine->SetTexture("textures/effect03.png");
}
else if ( icon >= 128 )
{