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

Fix for #232 - Images in SatCom 

Only images, icons still don't work
dev-ui
krzys-h 2013-09-28 11:13:45 +02:00
parent 39866db502
commit d70d31acc1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/edit.cpp
View File

@ -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 ++;
}
}

4
src/ui/edit.h
View File

@ -89,7 +89,7 @@ enum OperUndo
struct ImageLine
{
//! name of the image (without diagram \)
//! name of the image (without icons/)
std::string name;
//! vertical offset (v texture)
float offset;
@ -101,7 +101,7 @@ struct ImageLine
struct HyperLink
{
//! text file name (without help \)
//! text file name (without help/)
std::string name;
//! name of the marker
std::string marker;