diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-09-26 21:05:55 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-09-26 21:05:55 +0200 |
| commit | d3eaf2e1ce9e1275bc0c68be890a939fca666909 (patch) | |
| tree | 6d454ca329b8b1f64bb9207bea1732aa33b0d154 | |
| parent | de375548ade0015f6466fae74dc1fe9bba7c8357 (diff) | |
| parent | 71f84d1e16d8a0c24ea245236e84e3136bd7b79b (diff) | |
| download | colobot-d3eaf2e1ce9e1275bc0c68be890a939fca666909.tar.gz colobot-d3eaf2e1ce9e1275bc0c68be890a939fca666909.tar.bz2 colobot-d3eaf2e1ce9e1275bc0c68be890a939fca666909.zip | |
Merge branch 'dev-physfs' into dev-physfs-levels
| m--------- | data | 0 | ||||
| -rw-r--r-- | src/ui/window.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/data b/data -Subproject 97366e7f8bdb781bbda78290a0146887990e562 +Subproject 933ba1930466880db0a751f64ce536ff1d55cb8 diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 60aad0d..204acf9 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -1237,7 +1237,7 @@ void CWindow::DrawVertex(Math::Point pos, Math::Point dim, int icon) dim.x += 100.0f/640.0f; dim.y += 60.0f/480.0f; - m_engine->SetTexture("textures/interface/human.png"); + m_engine->SetTexture("textures/human.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 140.0f/256.0f; uv1.y = 32.0f/256.0f; |