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

Merge pull request #1206 from iceslab/dev 

Fixes for #1203 and #1194
1008-fix
tomangelo 2019-01-29 20:31:57 +01:00 committed by GitHub
parent 04b8bf6c42 7c88a6e667
commit 02fd258697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/engine/engine.cpp
View File

@ -4048,7 +4048,9 @@ void CEngine::UseMSAA(bool enable)
} }
} }
framebuffer->Bind(); if (framebuffer != nullptr) {
framebuffer->Bind();
}
m_device->SetRenderState(RENDER_STATE_DEPTH_TEST, true); m_device->SetRenderState(RENDER_STATE_DEPTH_TEST, true);
m_device->SetRenderState(RENDER_STATE_DEPTH_WRITE, true); m_device->SetRenderState(RENDER_STATE_DEPTH_WRITE, true);

6
src/object/old_object.cpp
View File

@ -284,13 +284,19 @@ void COldObject::DeleteObject(bool bAll)
if (m_power != nullptr) if (m_power != nullptr)
{ {
if (m_power->Implements(ObjectInterfaceType::Old)) if (m_power->Implements(ObjectInterfaceType::Old))
{
dynamic_cast<COldObject*>(m_power)->SetTransporter(nullptr);
dynamic_cast<COldObject*>(m_power)->DeleteObject(bAll); dynamic_cast<COldObject*>(m_power)->DeleteObject(bAll);
}
m_power = nullptr; m_power = nullptr;
} }
if (m_cargo != nullptr) if (m_cargo != nullptr)
{ {
if (m_cargo->Implements(ObjectInterfaceType::Old)) if (m_cargo->Implements(ObjectInterfaceType::Old))
{
dynamic_cast<COldObject*>(m_cargo)->SetTransporter(nullptr);
dynamic_cast<COldObject*>(m_cargo)->DeleteObject(bAll); dynamic_cast<COldObject*>(m_cargo)->DeleteObject(bAll);
}
m_cargo = nullptr; m_cargo = nullptr;
} }
} }