diff options
| author | erihel <erihel@gmail.com> | 2013-03-30 16:04:58 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-03-30 16:04:58 +0100 |
| commit | 5a60a7a21958e2d8cfd33148f575d36e3bbd9ebb (patch) | |
| tree | dee4ac380eb5d14d2a123b7b7b63b9cfa83ce9fb /src/object | |
| parent | b7b5f002a636154033166a2c828765386c14e5a5 (diff) | |
| parent | 845c8e9437e26cf3193d4e3dae2a02f03e17747d (diff) | |
| download | colobot-5a60a7a21958e2d8cfd33148f575d36e3bbd9ebb.tar.gz colobot-5a60a7a21958e2d8cfd33148f575d36e3bbd9ebb.tar.bz2 colobot-5a60a7a21958e2d8cfd33148f575d36e3bbd9ebb.zip | |
Merge branch 'dev' of github:colobot/colobot into dev
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/object.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/object/object.cpp b/src/object/object.cpp index a0a3f09..23a757a 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -2658,7 +2658,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_ENERGY ) { - modelManager->AddModelReference("energy.mod", false, rank); + modelManager->AddModelCopy("energy.mod", false, rank); SetPosition(0, pos); SetAngleY(0, angle); SetFloorHeight(0.0f); @@ -2841,7 +2841,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_STATION ) { - modelManager->AddModelReference("station.mod", false, rank); + modelManager->AddModelCopy("station.mod", false, rank); SetPosition(0, pos); SetAngleY(0, angle); SetFloorHeight(0.0f); @@ -3207,7 +3207,14 @@ bool CObject::CreateResource(Math::Vector pos, float angle, ObjectType type, if ( type == OBJECT_MARKKEYd ) name = "crossd.mod"; if ( type == OBJECT_EGG ) name = "egg.mod"; - modelManager->AddModelReference(name, false, rank); + if (type == OBJECT_POWER || type == OBJECT_ATOMIC) + { + modelManager->AddModelCopy(name, false, rank); + } + else + { + modelManager->AddModelReference(name, false, rank); + } SetPosition(0, pos); SetAngleY(0, angle); |