From cba3863d75c0d62ace10c44b1dfa20fe31cb38e5 Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Wed, 22 Jul 2015 12:51:29 +0200
Subject: [PATCH] Fixed bug with object loading introduced in
 083f21652949d48fc1c9dada0cfb8937e9ee2b71

---
 src/object/old_object.cpp | 1 -
 src/object/robotmain.cpp  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp
index 97fcebe1..66af95b5 100644
--- a/src/object/old_object.cpp
+++ b/src/object/old_object.cpp
@@ -1006,7 +1006,6 @@ void COldObject::Read(CLevelParserLine* line)
     SetProxyDistance(line->GetParam("proxyDistance")->AsFloat(15.0f)*g_unit);
     SetRange(line->GetParam("range")->AsFloat(30.0f));
     SetMagnifyDamage(line->GetParam("magnifyDamage")->AsFloat(1.0f));
-    SetTeam(line->GetParam("team")->AsInt(0));
     SetGunGoalV(line->GetParam("aimV")->AsFloat(0.0f));
     SetGunGoalH(line->GetParam("aimH")->AsFloat(0.0f));
 
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 6eabad59..8628e2ea 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -5065,8 +5065,9 @@ CObject* CRobotMain::IOReadObject(CLevelParserLine *line, const char* filename,
     bool trainer = line->GetParam("trainer")->AsBool(false);
     bool toy = line->GetParam("toy")->AsBool(false);
     int option = line->GetParam("option")->AsInt(0);
+    int team = line->GetParam("team")->AsInt(0);
 
-    CObject* obj = m_objMan->CreateObject(pos, dir.y, type, 0.0f, 1.0f, 0.0f, trainer, toy, option, id);
+    CObject* obj = m_objMan->CreateObject(pos, dir.y, type, 0.0f, 1.0f, 0.0f, trainer, toy, option, team, id);
 
     if (obj->Implements(ObjectInterfaceType::Old))
     {