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

Fixed object creation after loading save file 

Looks like @piotrdz broke it when creating the ObjectCreateParams struct. I'm kinda suprised this remained unnoticed for so long ;)
Reported in issue #570
master
krzys-h 2015-08-19 20:05:36 +02:00
parent 9d6543a947
commit 27bbc27948
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/object/object_manager.cpp
View File

@ -126,6 +126,13 @@ CObject* CObjectManager::CreateObject(ObjectCreateParams params)
params.id = m_nextId; params.id = m_nextId;
m_nextId++; m_nextId++;
} }
else
{
if (params.id >= m_nextId)
{
m_nextId = params.id + 1;
}
}
assert(m_objects.find(params.id) == m_objects.end()); assert(m_objects.find(params.id) == m_objects.end());

1
src/physics/physics.cpp
View File

@ -3659,7 +3659,6 @@ void CPhysics::WheelParticle(TraceColor color, float width)
{ {
Math::Matrix* mat; Math::Matrix* mat;
Math::Vector goal1, goal2, wheel1, wheel2; Math::Vector goal1, goal2, wheel1, wheel2;
Gfx::ParticleType parti;
float dist1, dist2, step; float dist1, dist2, step;
mat = m_object->GetWorldMatrix(0); mat = m_object->GetWorldMatrix(0);