diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 17:36:10 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 17:36:10 +0200 |
| commit | b1edcc822f95bdf619e1164e0d42325a71073452 (patch) | |
| tree | be8c39560b809ab0f75143df3960323b135cca6b /src/graphics/engine/engine.cpp | |
| parent | fd09071c29452bdfea2c519f0defbffebee42f4c (diff) | |
| download | colobot-b1edcc822f95bdf619e1164e0d42325a71073452.tar.gz colobot-b1edcc822f95bdf619e1164e0d42325a71073452.tar.bz2 colobot-b1edcc822f95bdf619e1164e0d42325a71073452.zip | |
Various fixes
- disabled UserDir() in path lookup
- fixed crashes on loading missions in CObject
- fixed texture bug in CTerrain
- changed mouse move event handling to avoid flooding event queue
- enabled all missions for testing
Diffstat (limited to 'src/graphics/engine/engine.cpp')
| -rw-r--r-- | src/graphics/engine/engine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index beb7508..37f9b00 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -162,7 +162,7 @@ CEngine::CEngine(CInstanceManager *iMan, CApplication *app) m_limitLOD[1] = 200.0f; m_particleDensity = 1.0f; m_clippingDistance = 1.0f; - m_lastClippingDistance = m_clippingDistance; + m_lastClippingDistance = m_clippingDistance = 1.0f; m_objectDetail = 1.0f; m_lastObjectDetail = m_objectDetail; m_terrainVision = 1000.0f; @@ -2096,6 +2096,9 @@ void CEngine::SetViewParams(const Math::Vector& eyePt, const Math::Vector& looka Texture CEngine::CreateTexture(const std::string& texName, const TextureCreateParams& params) { + if (texName.empty()) + return Texture(); // invalid texture + if (m_texBlacklist.find(texName) != m_texBlacklist.end()) return Texture(); // invalid texture |