summaryrefslogtreecommitdiffstats
path: root/src/ui/edit.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-11-03 13:04:57 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2013-11-03 13:04:57 +0100
commitf1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2 (patch)
treeb9e7e75a2138875ffed59772a2a1c7cf82b7aaa4 /src/ui/edit.cpp
parentec38c14ee8293b2dc7436e0c06b0c294652c84cc (diff)
parentd8e50e4eeb2dde3e0d228e2bead29d73494f8874 (diff)
downloadcolobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.tar.gz
colobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.tar.bz2
colobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.zip
Colobot Gold 0.1.1-alpha
Diffstat (limited to 'src/ui/edit.cpp')
-rw-r--r--src/ui/edit.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index 6fd1735..a187688 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -1144,7 +1144,7 @@ void CEdit::DrawImage(Math::Point pos, std::string name, float width,
float dp;
std::string filename;
- filename = GetProfile().GetUserBasedPath(name, "diagram") + ".png";
+ filename = GetProfile().GetUserBasedPath(name, "../icons") + ".png";
m_engine->SetTexture(filename);
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
@@ -1426,7 +1426,7 @@ void CEdit::FreeImage()
for (int i = 0 ; i < m_imageTotal; i++ )
{
- filename = GetProfile().GetUserBasedPath(m_image[i].name, "diagram") + ".png";
+ filename = GetProfile().GetUserBasedPath(m_image[i].name, "../icons") + ".png";
m_engine->DeleteTexture(filename);
}
}
@@ -1436,7 +1436,7 @@ void CEdit::FreeImage()
void CEdit::LoadImage(std::string name)
{
std::string filename;
- filename = GetProfile().GetUserBasedPath(name, "diagram") + ".png";
+ filename = GetProfile().GetUserBasedPath(name, "../icons") + ".png";
m_engine->LoadTexture(filename);
}
@@ -1653,7 +1653,7 @@ bool CEdit::ReadText(std::string filename, int addSize)
m_image[iIndex].width = iWidth*0.75f;
m_text[j] = static_cast<char>(iIndex++); // as an index into m_image
- m_format[j] = static_cast<unsigned char>(Gfx::FONT_MASK_IMAGE);
+ m_format[j] = Gfx::FONT_MASK_IMAGE;
j ++;
}
}