Added field "item" to class "object" in CBot

src/CMakeLists.txt

@@ -128,6 +128,7 @@ object/motion/motionvehicle.cpp
 object/motion/motionworm.cpp
 object/object.cpp
 object/robotmain.cpp
+object/objman.cpp
 object/task/task.cpp
 object/task/taskadvance.cpp
 object/task/taskbuild.cpp

src/app/app.cpp

@@ -95,6 +95,7 @@ CApplication::CApplication()
 {
     m_private       = new ApplicationPrivate();
     m_iMan          = new CInstanceManager();
+    m_objMan        = new CObjectManager;
     m_eventQueue    = new CEventQueue();
     m_profile       = new CProfile();
 

src/app/app.h

@@ -31,6 +31,8 @@
 #include "graphics/engine/engine.h"
 #include "graphics/opengl/gldevice.h"
 
+#include "object/objman.h"
+
 
 #include <string>
 #include <vector>
@@ -374,6 +376,8 @@ protected:
     //! Instance manager
     // TODO: to be removed
     CInstanceManager*       m_iMan;
+    //! Object manager
+    CObjectManager*         m_objMan;
     //! Global event queue
     CEventQueue*            m_eventQueue;
     //! Graphics engine

src/object/object.cpp

@@ -71,6 +71,7 @@
 #include "object/motion/motionvehicle.h"
 #include "object/motion/motionworm.h"
 #include "object/robotmain.h"
+#include "object/objman.h"
 
 #include "physics/physics.h"
 
@@ -202,6 +203,10 @@ void uObject(CBotVar* botThis, void* user)
     fret = object->GetFret();
     if ( fret == 0 )  pVar->SetPointer(0);
     else              pVar->SetPointer(fret->GetBotVar());
+
+    pVar = pVar->GetNext();  // "id"
+    value = object->GetID();
+    pVar->SetValInt(value);
 }
 
 
@@ -337,6 +342,8 @@ CObject::CObject()
     m_botVar = CBotVar::Create("", CBotTypResult(CBotTypClass, "object"));
     m_botVar->SetUserPtr(this);
     m_botVar->SetIdent(m_id);
+    
+    CObjectManager::GetInstancePointer()->AddInstance(this);
 }
 
 // Object's destructor.
@@ -360,6 +367,7 @@ CObject::~CObject()
     m_auto = nullptr;
 
     CInstanceManager::GetInstancePointer()->DeleteInstance(CLASS_OBJECT, this);
+    CObjectManager::GetInstancePointer()->DeleteInstance(this);
 
     m_app = nullptr;
 }

src/object/objman.cpp

@@ -0,0 +1,388 @@
+// * This file is part of the COLOBOT source code
+// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
+// *
+// * This program is free software: you can redistribute it and/or modify
+// * it under the terms of the GNU General Public License as published by
+// * the Free Software Foundation, either version 3 of the License, or
+// * (at your option) any later version.
+// *
+// * This program is distributed in the hope that it will be useful,
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// * GNU General Public License for more details.
+// *
+// * You should have received a copy of the GNU General Public License
+// * along with this program. If not, see  http://www.gnu.org/licenses/.
+
+
+#include "object/object.h"
+#include "object/auto/auto.h"
+
+#include "object/objman.h"
+
+
+template<> CObjectManager* CSingleton<CObjectManager>::m_instance = nullptr;
+
+
+CObjectManager::CObjectManager()
+{
+    for (int i = 0; i < MAX_OBJECTS; i++)
+    {
+        m_table[i] = nullptr;
+    }
+    usedCount = 0;
+}
+
+CObjectManager::~CObjectManager()
+{
+}
+
+bool CObjectManager::AddInstance(CObject* instance)
+{
+    if (usedCount >= MAX_OBJECTS) return false;
+
+    m_table[instance->GetID()] = instance;
+    usedCount++;
+    return true;
+}
+
+bool CObjectManager::DeleteInstance(CObject* instance)
+{
+    for (int i = 0; i < usedCount; i++)
+    {
+        if (m_table[i] == instance)
+            m_table[i] = nullptr;
+    }
+
+    return true;
+}
+
+CObject* CObjectManager::SearchInstance(int id)
+{
+    if (id >= MAX_OBJECTS) return nullptr;
+    return m_table[id];
+}
+
+CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, float zoom, float height,
+                                  ObjectType type, float power,
+                                  bool trainer, bool toy,
+                                  int option)
+{
+    CObject* object = nullptr;
+
+    if ( type == OBJECT_NULL ) return nullptr;
+
+    if ( type == OBJECT_HUMAN ||
+         type == OBJECT_TECH  )
+    {
+        trainer = false;  // necessarily
+    }
+
+    if ( type == OBJECT_PORTICO  ||
+         type == OBJECT_BASE     ||
+         type == OBJECT_DERRICK  ||
+         type == OBJECT_FACTORY  ||
+         type == OBJECT_STATION  ||
+         type == OBJECT_CONVERT  ||
+         type == OBJECT_REPAIR   ||
+         type == OBJECT_DESTROYER||
+         type == OBJECT_TOWER    ||
+         type == OBJECT_NEST     ||
+         type == OBJECT_RESEARCH ||
+         type == OBJECT_RADAR    ||
+         type == OBJECT_INFO     ||
+         type == OBJECT_ENERGY   ||
+         type == OBJECT_LABO     ||
+         type == OBJECT_NUCLEAR  ||
+         type == OBJECT_PARA     ||
+         type == OBJECT_SAFE     ||
+         type == OBJECT_HUSTON   ||
+         type == OBJECT_TARGET1  ||
+         type == OBJECT_TARGET2  ||
+         type == OBJECT_START    ||
+         type == OBJECT_END      )
+    {
+        object = new CObject();
+        object->CreateBuilding(pos, angle, height, type, power);
+
+        CAuto* automat = object->GetAuto();
+        if (automat != nullptr)
+        {
+            automat->Init();
+        }
+    }
+    else
+    if ( type == OBJECT_FRET        ||
+         type == OBJECT_STONE       ||
+         type == OBJECT_URANIUM     ||
+         type == OBJECT_METAL       ||
+         type == OBJECT_POWER       ||
+         type == OBJECT_ATOMIC      ||
+         type == OBJECT_BULLET      ||
+         type == OBJECT_BBOX        ||
+         type == OBJECT_KEYa        ||
+         type == OBJECT_KEYb        ||
+         type == OBJECT_KEYc        ||
+         type == OBJECT_KEYd        ||
+         type == OBJECT_TNT         ||
+         type == OBJECT_SCRAP1      ||
+         type == OBJECT_SCRAP2      ||
+         type == OBJECT_SCRAP3      ||
+         type == OBJECT_SCRAP4      ||
+         type == OBJECT_SCRAP5      ||
+         type == OBJECT_BOMB        ||
+         type == OBJECT_WAYPOINT    ||
+         type == OBJECT_SHOW        ||
+         type == OBJECT_WINFIRE     ||
+         type == OBJECT_BAG         ||
+         type == OBJECT_MARKPOWER   ||
+         type == OBJECT_MARKSTONE   ||
+         type == OBJECT_MARKURANIUM ||
+         type == OBJECT_MARKKEYa    ||
+         type == OBJECT_MARKKEYb    ||
+         type == OBJECT_MARKKEYc    ||
+         type == OBJECT_MARKKEYd    ||
+         type == OBJECT_EGG         )
+    {
+        object = new CObject();
+        object->CreateResource(pos, angle, type, power);
+    }
+    else
+    if ( type == OBJECT_FLAGb ||
+         type == OBJECT_FLAGr ||
+         type == OBJECT_FLAGg ||
+         type == OBJECT_FLAGy ||
+         type == OBJECT_FLAGv )
+    {
+        object = new CObject();
+        object->CreateFlag(pos, angle, type);
+    }
+    else
+    if ( type == OBJECT_BARRIER0 ||
+         type == OBJECT_BARRIER1 ||
+         type == OBJECT_BARRIER2 ||
+         type == OBJECT_BARRIER3 ||
+         type == OBJECT_BARRIER4 )
+    {
+        object = new CObject();
+        object->CreateBarrier(pos, angle, height, type);
+    }
+    else
+    if ( type == OBJECT_PLANT0  ||
+         type == OBJECT_PLANT1  ||
+         type == OBJECT_PLANT2  ||
+         type == OBJECT_PLANT3  ||
+         type == OBJECT_PLANT4  ||
+         type == OBJECT_PLANT5  ||
+         type == OBJECT_PLANT6  ||
+         type == OBJECT_PLANT7  ||
+         type == OBJECT_PLANT8  ||
+         type == OBJECT_PLANT9  ||
+         type == OBJECT_PLANT10 ||
+         type == OBJECT_PLANT11 ||
+         type == OBJECT_PLANT12 ||
+         type == OBJECT_PLANT13 ||
+         type == OBJECT_PLANT14 ||
+         type == OBJECT_PLANT15 ||
+         type == OBJECT_PLANT16 ||
+         type == OBJECT_PLANT17 ||
+         type == OBJECT_PLANT18 ||
+         type == OBJECT_PLANT19 ||
+         type == OBJECT_TREE0   ||
+         type == OBJECT_TREE1   ||
+         type == OBJECT_TREE2   ||
+         type == OBJECT_TREE3   ||
+         type == OBJECT_TREE4   ||
+         type == OBJECT_TREE5   ||
+         type == OBJECT_TREE6   ||
+         type == OBJECT_TREE7   ||
+         type == OBJECT_TREE8   ||
+         type == OBJECT_TREE9   )
+    {
+        object = new CObject();
+        object->CreatePlant(pos, angle, height, type);
+    }
+    else
+    if ( type == OBJECT_MUSHROOM0 ||
+         type == OBJECT_MUSHROOM1 ||
+         type == OBJECT_MUSHROOM2 ||
+         type == OBJECT_MUSHROOM3 ||
+         type == OBJECT_MUSHROOM4 ||
+         type == OBJECT_MUSHROOM5 ||
+         type == OBJECT_MUSHROOM6 ||
+         type == OBJECT_MUSHROOM7 ||
+         type == OBJECT_MUSHROOM8 ||
+         type == OBJECT_MUSHROOM9 )
+    {
+        object = new CObject();
+        object->CreateMushroom(pos, angle, height, type);
+    }
+    else
+    if ( type == OBJECT_TEEN0  ||
+         type == OBJECT_TEEN1  ||
+         type == OBJECT_TEEN2  ||
+         type == OBJECT_TEEN3  ||
+         type == OBJECT_TEEN4  ||
+         type == OBJECT_TEEN5  ||
+         type == OBJECT_TEEN6  ||
+         type == OBJECT_TEEN7  ||
+         type == OBJECT_TEEN8  ||
+         type == OBJECT_TEEN9  ||
+         type == OBJECT_TEEN10 ||
+         type == OBJECT_TEEN11 ||
+         type == OBJECT_TEEN12 ||
+         type == OBJECT_TEEN13 ||
+         type == OBJECT_TEEN14 ||
+         type == OBJECT_TEEN15 ||
+         type == OBJECT_TEEN16 ||
+         type == OBJECT_TEEN17 ||
+         type == OBJECT_TEEN18 ||
+         type == OBJECT_TEEN19 ||
+         type == OBJECT_TEEN20 ||
+         type == OBJECT_TEEN21 ||
+         type == OBJECT_TEEN22 ||
+         type == OBJECT_TEEN23 ||
+         type == OBJECT_TEEN24 ||
+         type == OBJECT_TEEN25 ||
+         type == OBJECT_TEEN26 ||
+         type == OBJECT_TEEN27 ||
+         type == OBJECT_TEEN28 ||
+         type == OBJECT_TEEN29 ||
+         type == OBJECT_TEEN30 ||
+         type == OBJECT_TEEN31 ||
+         type == OBJECT_TEEN32 ||
+         type == OBJECT_TEEN33 ||
+         type == OBJECT_TEEN34 ||
+         type == OBJECT_TEEN35 ||
+         type == OBJECT_TEEN36 ||
+         type == OBJECT_TEEN37 ||
+         type == OBJECT_TEEN38 ||
+         type == OBJECT_TEEN39 ||
+         type == OBJECT_TEEN40 ||
+         type == OBJECT_TEEN41 ||
+         type == OBJECT_TEEN42 ||
+         type == OBJECT_TEEN43 ||
+         type == OBJECT_TEEN44 ||
+         type == OBJECT_TEEN45 ||
+         type == OBJECT_TEEN46 ||
+         type == OBJECT_TEEN47 ||
+         type == OBJECT_TEEN48 ||
+         type == OBJECT_TEEN49 )
+    {
+        object = new CObject();
+        object->SetOption(option);
+        object->CreateTeen(pos, angle, zoom, height, type);
+    }
+    else
+    if ( type == OBJECT_QUARTZ0 ||
+         type == OBJECT_QUARTZ1 ||
+         type == OBJECT_QUARTZ2 ||
+         type == OBJECT_QUARTZ3 ||
+         type == OBJECT_QUARTZ4 ||
+         type == OBJECT_QUARTZ5 ||
+         type == OBJECT_QUARTZ6 ||
+         type == OBJECT_QUARTZ7 ||
+         type == OBJECT_QUARTZ8 ||
+         type == OBJECT_QUARTZ9 )
+    {
+        object = new CObject();
+        object->CreateQuartz(pos, angle, height, type);
+    }
+    else
+    if ( type == OBJECT_ROOT0 ||
+         type == OBJECT_ROOT1 ||
+         type == OBJECT_ROOT2 ||
+         type == OBJECT_ROOT3 ||
+         type == OBJECT_ROOT4 ||
+         type == OBJECT_ROOT5 ||
+         type == OBJECT_ROOT6 ||
+         type == OBJECT_ROOT7 ||
+         type == OBJECT_ROOT8 ||
+         type == OBJECT_ROOT9 )
+    {
+        object = new CObject();
+        object->CreateRoot(pos, angle, height, type);
+    }
+    else
+    if ( type == OBJECT_HOME1 )
+    {
+        object = new CObject();
+        object->CreateHome(pos, angle, height, type);
+    }
+    else
+    if ( type == OBJECT_RUINmobilew1 ||
+         type == OBJECT_RUINmobilew2 ||
+         type == OBJECT_RUINmobilet1 ||
+         type == OBJECT_RUINmobilet2 ||
+         type == OBJECT_RUINmobiler1 ||
+         type == OBJECT_RUINmobiler2 ||
+         type == OBJECT_RUINfactory  ||
+         type == OBJECT_RUINdoor     ||
+         type == OBJECT_RUINsupport  ||
+         type == OBJECT_RUINradar    ||
+         type == OBJECT_RUINconvert  ||
+         type == OBJECT_RUINbase     ||
+         type == OBJECT_RUINhead     )
+    {
+        object = new CObject();
+        object->CreateRuin(pos, angle, height, type);
+    }
+    else
+    if ( type == OBJECT_APOLLO1 ||
+         type == OBJECT_APOLLO3 ||
+         type == OBJECT_APOLLO4 ||
+         type == OBJECT_APOLLO5 )
+    {
+        object = new CObject();
+        object->CreateApollo(pos, angle, type);
+    }
+    else
+    if ( type == OBJECT_MOTHER ||
+         type == OBJECT_ANT    ||
+         type == OBJECT_SPIDER ||
+         type == OBJECT_BEE    ||
+         type == OBJECT_WORM   )
+    {
+        object = new CObject();
+        object->CreateInsect(pos, angle, type);  // no eggs
+    }
+    else
+    if ( type == OBJECT_HUMAN    ||
+         type == OBJECT_TECH     ||
+         type == OBJECT_TOTO     ||
+         type == OBJECT_MOBILEfa ||
+         type == OBJECT_MOBILEta ||
+         type == OBJECT_MOBILEwa ||
+         type == OBJECT_MOBILEia ||
+         type == OBJECT_MOBILEfc ||
+         type == OBJECT_MOBILEtc ||
+         type == OBJECT_MOBILEwc ||
+         type == OBJECT_MOBILEic ||
+         type == OBJECT_MOBILEfi ||
+         type == OBJECT_MOBILEti ||
+         type == OBJECT_MOBILEwi ||
+         type == OBJECT_MOBILEii ||
+         type == OBJECT_MOBILEfs ||
+         type == OBJECT_MOBILEts ||
+         type == OBJECT_MOBILEws ||
+         type == OBJECT_MOBILEis ||
+         type == OBJECT_MOBILErt ||
+         type == OBJECT_MOBILErc ||
+         type == OBJECT_MOBILErr ||
+         type == OBJECT_MOBILErs ||
+         type == OBJECT_MOBILEsa ||
+         type == OBJECT_MOBILEtg ||
+         type == OBJECT_MOBILEft ||
+         type == OBJECT_MOBILEtt ||
+         type == OBJECT_MOBILEwt ||
+         type == OBJECT_MOBILEit ||
+         type == OBJECT_MOBILEdr ||
+         type == OBJECT_APOLLO2  )
+    {
+        object = new CObject();
+        object->SetOption(option);
+        object->CreateVehicle(pos, angle, type, power, trainer, toy);
+    }
+
+    return object;
+}

src/object/objman.h

@@ -0,0 +1,54 @@
+// * This file is part of the COLOBOT source code
+// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
+// *
+// * This program is free software: you can redistribute it and/or modify
+// * it under the terms of the GNU General Public License as published by
+// * the Free Software Foundation, either version 3 of the License, or
+// * (at your option) any later version.
+// *
+// * This program is distributed in the hope that it will be useful,
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// * GNU General Public License for more details.
+// *
+// * You should have received a copy of the GNU General Public License
+// * along with this program. If not, see  http://www.gnu.org/licenses/.
+
+/**
+ * \file common/objman.h
+ * \brief Instance manager for objects
+ */
+
+#pragma once
+
+#include "object/object.h"
+
+#include "common/singleton.h"
+
+const int MAX_OBJECTS = 500;
+
+/**
+ * \class ObjectManager
+ * \brief Manager for objects
+ */
+class CObjectManager : public CSingleton<CObjectManager>
+{
+public:
+    CObjectManager();
+    virtual ~CObjectManager();
+
+    //! Registers new object
+    bool      AddInstance(CObject* instance);
+    //! Deletes the registered object
+    bool      DeleteInstance(CObject* instance);
+    //! Seeks for an object
+    CObject*  SearchInstance(int id);
+    //! Creates an object
+    CObject*  CreateObject(Math::Vector pos, float angle, float zoom, float height, ObjectType type, float power, bool trainer, bool toy, int option);
+
+protected:
+    CObject* m_table[MAX_OBJECTS];
+    int usedCount;
+};
+
+

src/object/robotmain.cpp

@@ -831,6 +831,7 @@ CRobotMain::CRobotMain(CApplication* app)
     bc->AddItem("material",    CBotTypResult(CBotTypInt), PR_READ);
     bc->AddItem("energyCell",  CBotTypResult(CBotTypPointer, "object"), PR_READ);
     bc->AddItem("load",        CBotTypResult(CBotTypPointer, "object"), PR_READ);
+    bc->AddItem("id",          CBotTypResult(CBotTypInt), PR_READ);
 
     // Initializes the class FILE.
     InitClassFILE();

src/script/script.cpp

@@ -33,6 +33,7 @@
 #include "object/object.h"
 #include "object/robotmain.h"
 #include "object/task/taskmanager.h"
+#include "object/objman.h"
 
 #include "physics/physics.h"
 
@@ -335,9 +336,7 @@ bool CScript::rGetObject(CBotVar* var, CBotVar* result, int& exception, void* us
 
     rank = var->GetValInt();
 
-    CInstanceManager* iMan = CInstanceManager::GetInstancePointer();
-
-    pObj = static_cast<CObject*>(iMan->SearchInstance(CLASS_OBJECT, rank));
+    pObj = static_cast<CObject*>(CObjectManager::GetInstancePointer()->SearchInstance(rank));
     if ( pObj == 0 )
     {
         result->SetPointer(0);
@@ -371,9 +370,7 @@ bool CScript::rDestroy(CBotVar* var, CBotVar* result, int& exception, void* user
 
     rank = var->GetValInt();
 
-    CInstanceManager* iMan = CInstanceManager::GetInstancePointer();
-
-    pObj = static_cast<CObject*>(iMan->SearchInstance(CLASS_OBJECT, rank));
+    pObj = static_cast<CObject*>(CObjectManager::GetInstancePointer()->SearchInstance(rank));
     if ( pObj == 0 )
     {
         return true;