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

Fix for #228 

* "empty" objects were wrongly handled in CPyro
dev-ui
Piotr Dziwinski 2013-06-26 20:40:48 +02:00
parent 26870551d7
commit f8a6c6750a
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/graphics/engine/pyro.cpp
View File

@ -1553,15 +1553,18 @@ void CPyro::ExploStart()
for (int i = 0; i < OBJECTMAXPART; i++) for (int i = 0; i < OBJECTMAXPART; i++)
{ {
int objRank = m_object->GetObjectRank(i); int objRank = m_object->GetObjectRank(i);
if (objRank == -1) continue; if (objRank == -1) continue;
// TODO: refactor later to material change // TODO: refactor later to material change
int oldBaseObjRank = m_engine->GetObjectBaseRank(objRank); int oldBaseObjRank = m_engine->GetObjectBaseRank(objRank);
int newBaseObjRank = m_engine->CreateBaseObject(); if (oldBaseObjRank != -1)
m_engine->CopyBaseObject(oldBaseObjRank, newBaseObjRank); {
m_engine->SetObjectBaseRank(objRank, newBaseObjRank); int newBaseObjRank = m_engine->CreateBaseObject();
m_engine->CopyBaseObject(oldBaseObjRank, newBaseObjRank);
m_engine->SetObjectBaseRank(objRank, newBaseObjRank);
m_engine->ChangeSecondTexture(objRank, "dirty04.png"); m_engine->ChangeSecondTexture(objRank, "dirty04.png");
}
Math::Vector pos = m_object->GetPosition(i); Math::Vector pos = m_object->GetPosition(i);
@ -1625,11 +1628,14 @@ void CPyro::BurnStart()
// TODO: refactor later to material change // TODO: refactor later to material change
int oldBaseObjRank = m_engine->GetObjectBaseRank(objRank); int oldBaseObjRank = m_engine->GetObjectBaseRank(objRank);
int newBaseObjRank = m_engine->CreateBaseObject(); if (oldBaseObjRank != -1)
m_engine->CopyBaseObject(oldBaseObjRank, newBaseObjRank); {
m_engine->SetObjectBaseRank(objRank, newBaseObjRank); int newBaseObjRank = m_engine->CreateBaseObject();
m_engine->CopyBaseObject(oldBaseObjRank, newBaseObjRank);
m_engine->SetObjectBaseRank(objRank, newBaseObjRank);
m_engine->ChangeSecondTexture(objRank, "dirty04.png"); m_engine->ChangeSecondTexture(objRank, "dirty04.png");
}
} }
m_engine->LoadTexture("dirty04.png"); m_engine->LoadTexture("dirty04.png");