summaryrefslogtreecommitdiffstats
path: root/src/ui/edit.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-16 10:38:08 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-16 10:38:08 +0200
commit6a0d150539897ec65ccc161305db48de10ea35ba (patch)
tree7064e569459bd8d704edd28552f48bf2978d61a0 /src/ui/edit.cpp
parentaf9af56bb007050c969af310c4e816d260b9ce7f (diff)
downloadcolobot-6a0d150539897ec65ccc161305db48de10ea35ba.tar.gz
colobot-6a0d150539897ec65ccc161305db48de10ea35ba.tar.bz2
colobot-6a0d150539897ec65ccc161305db48de10ea35ba.zip
Interface works
- removed mock of CInterface and fixed event passing to CRobotMain - changed texture names from tga and bmp to png - UI now works but interaction is still broken
Diffstat (limited to 'src/ui/edit.cpp')
-rw-r--r--src/ui/edit.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index d298ad3..cde3aee 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -1131,9 +1131,9 @@ void CEdit::DrawImage(Math::Point pos, const char *name, float width,
float dp;
char filename[100];
-//? sprintf(filename, "diagram\\%s.bmp", name);
+//? sprintf(filename, "diagram\\%s.png", name);
UserDir(filename, name, "diagram");
- strcat(filename, ".bmp");
+ strcat(filename, ".png");
m_engine->SetTexture(filename);
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
@@ -1163,7 +1163,7 @@ void CEdit::DrawBack(Math::Point pos, Math::Point dim)
if ( m_bGeneric ) return;
- m_engine->SetTexture("button2.tga");
+ m_engine->SetTexture("button2.png");
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
if ( m_bMulti )
@@ -1214,9 +1214,9 @@ void CEdit::DrawPart(Math::Point pos, Math::Point dim, int icon)
float dp;
#if _POLISH
- m_engine->SetTexture("textp.tga");
+ m_engine->SetTexture("textp.png");
#else
- m_engine->SetTexture("text.tga");
+ m_engine->SetTexture("text.png");
#endif
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
@@ -1426,9 +1426,9 @@ void CEdit::FreeImage()
for ( i=0 ; i<m_imageTotal ; i++ )
{
-//? sprintf(filename, "diagram\\%s.bmp", m_image[i].name);
+//? sprintf(filename, "diagram\\%s.png", m_image[i].name);
UserDir(filename, m_image[i].name, "diagram");
- strcat(filename, ".bmp");
+ strcat(filename, ".png");
m_engine->DeleteTexture(filename);
}
}
@@ -1439,9 +1439,9 @@ void CEdit::LoadImage(const char *name)
{
char filename[100];
-//? sprintf(filename, "diagram\\%s.bmp", name);
+//? sprintf(filename, "diagram\\%s.png", name);
UserDir(filename, name, "diagram");
- strcat(filename, ".bmp");
+ strcat(filename, ".png");
m_engine->LoadTexture(filename);
}