2006-01-19 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientAccount.cpp, aiclient/ClientAccount.h,
aiclient/ClientConnection.cpp, aiclient/ClientConnection.h,
aiclient/client.cpp, aiclient/client.h, client/BaseClient.cpp,
client/BaseClient.h, client/CharacterClient.cpp,
client/CharacterClient.h, client/ClientConnection.cpp,
client/ClientConnection.h, client/CreatorClient.cpp,
client/CreatorClient.h, client/ObserverClient.cpp,
client/ObserverClient.h, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp,
client/define_world.cpp, client/define_world.h, common/Add.h,
common/Affect.h, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/Attack.h, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.cpp, common/BaseWorld.h,
common/Burn.h, common/Chop.h, common/Connect.h, common/CustomOp.cpp,
common/CustomOp.h, common/CustomOp_impl.h, common/Cut.h,
common/Database.cpp, common/Database.h, common/Delve.h, common/Dig.h,
common/Eat.h, common/FormattedXMLWriter.cpp,
common/FormattedXMLWriter.h, common/Generic.h, common/Load.h,
common/Monitor.h, common/Mow.h, common/Nourish.h,
common/OOGThing.cpp, common/OOGThing.h, common/Property.cpp,
common/Property.h, common/Property_impl.h, common/Save.h,
common/Setup.h, common/Tick.h, common/Unseen.h, common/Update.h,
common/Use.h, common/Wield.h, common/accountbase.cpp,
common/accountbase.h, common/const.cpp, common/const.h,
common/custom.cpp, common/debug.h, common/globals.cpp,
common/globals.h, common/id.cpp, common/id.h, common/inheritance.cpp,
common/inheritance.h, common/inheritance_impl.h, common/log.cpp,
common/log.h, common/newid.cpp, common/nls.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/random.h,
common/refno.h, common/serialno.cpp, common/serialno.h,
common/system.cpp, common/system.h, common/terrain_utils.cpp,
common/terrain_utils.h, common/type_utils.h, common/types.h,
common/utility.cpp, common/utility.h, modules/DateTime.cpp,
modules/DateTime.h, modules/Location.cpp, modules/Location.h,
modules/WorldTime.cpp, modules/WorldTime.h, physics/BBox.cpp,
physics/BBox.h, physics/Collision.cpp, physics/Collision.h,
physics/Quaternion.cpp, physics/Quaternion.h, physics/Vector3D.cpp,
physics/Vector3D.h, physics/VectorPol.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/ArithmeticScript.cpp, rulesets/ArithmeticScript.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/CalendarProperty.cpp, rulesets/CalendarProperty.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Combat.cpp,
rulesets/Combat.h, rulesets/Container.cpp, rulesets/Container.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/EntityProperties.cpp,
rulesets/Entity_getLocation.h, rulesets/Fell.cpp, rulesets/Fell.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/Line.cpp,
rulesets/Line.h, rulesets/LineProperty.cpp, rulesets/LineProperty.h,
rulesets/MemEntity.cpp, rulesets/MemEntity.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/MemMap_methods.h,
rulesets/MindFactory.cpp, rulesets/MindFactory.h, rulesets/Missile.h,
rulesets/Motion.cpp, rulesets/Motion.h, rulesets/Movement.cpp,
rulesets/Movement.h, rulesets/Pedestrian.cpp, rulesets/Pedestrian.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_BBox.cpp,
rulesets/Py_BBox.h, rulesets/Py_EntityWrapper.h,
rulesets/Py_Location.cpp, rulesets/Py_Location.h,
rulesets/Py_Map.cpp, rulesets/Py_Map.h, rulesets/Py_Mind.cpp,
rulesets/Py_Mind.h, rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Operation.h,
rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp,
rulesets/Py_Optime.h, rulesets/Py_Point3D.cpp, rulesets/Py_Point3D.h,
rulesets/Py_Property.cpp, rulesets/Py_Property.h,
rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_RootEntity.cpp, rulesets/Py_RootEntity.h,
rulesets/Py_Statistics.cpp, rulesets/Py_Statistics.h,
rulesets/Py_Task.cpp, rulesets/Py_Task.h, rulesets/Py_Thing.cpp,
rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp,
rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonArithmeticScript.cpp,
rulesets/PythonArithmeticScript.h, rulesets/PythonMindScript.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.cpp,
rulesets/PythonScript.h, rulesets/PythonThingScript.cpp,
rulesets/PythonThingScript.h, rulesets/PythonWrapper.cpp,
rulesets/PythonWrapper.h, rulesets/Python_API.cpp,
rulesets/Python_API.h, rulesets/Python_Script_Utils.h,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Statistics.cpp, rulesets/Statistics.h,
rulesets/StatisticsProperty.cpp, rulesets/StatisticsProperty.h,
rulesets/Structure.cpp, rulesets/Structure.h, rulesets/Task.cpp,
rulesets/Task.h, rulesets/TaskScript.cpp, rulesets/TaskScript.h,
rulesets/TerrainProperty.cpp, rulesets/TerrainProperty.h,
rulesets/Thing.cpp, rulesets/Thing.h, rulesets/ThingFactory.cpp,
rulesets/ThingFactory.h, rulesets/World.cpp, rulesets/World.h,
rulesets/attributes.h, server/Account.cpp, server/Account.h,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.cpp,
server/ArithmeticFactory.h, server/CommClient.cpp,
server/CommClient.h, server/CommIdleSocket.cpp,
server/CommIdleSocket.h, server/CommListener.cpp,
server/CommListener.h, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommMDNSPublisher.cpp,
server/CommMDNSPublisher.h, server/CommMaster.cpp,
server/CommMaster.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommPeer.cpp,
server/CommPeer.h, server/CommPeerListener.cpp,
server/CommPeerListener.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommServer.cpp,
server/CommServer.h, server/CommSlaveClient.cpp,
server/CommSlaveClient.h, server/CommSlaveListener.cpp,
server/CommSlaveListener.h, server/CommSocket.cpp,
server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/Connection.cpp,
server/Connection.h, server/Connection_methods.h,
server/EntityFactory.cpp, server/EntityFactory.h,
server/ExternalMind.cpp, server/ExternalMind.h,
server/Idle.cpp, server/Idle.h, server/Lobby.cpp, server/Lobby.h,
server/Master.cpp, server/Master.h, server/Peer.cpp, server/Peer.h,
server/Persistance.cpp, server/Persistance.h,
server/PersistantThingFactory.cpp, server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h, server/Persistor.cpp,
server/Persistor.h, server/Persistor_impl.h,
server/Player.cpp, server/Player.h, server/Restoration.cpp,
server/Restoration.h, server/Restorer.cpp, server/Restorer.h,
server/Restorer_impl.h, server/ScriptFactory.cpp,
server/ScriptFactory.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/SlaveClientConnection.cpp, server/SlaveClientConnection.h,
server/TaskFactory.cpp, server/TaskFactory.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h,
server/server.cpp, server/server.h, server/slave.cpp,
tests/Areatest.cpp, tests/BaseEntitytest.cpp,
tests/Charactertest.cpp, tests/Containertest.cpp,
tests/Creatortest.cpp, tests/EntityExerciser.h,
tests/EntityFactorytest.cpp, tests/Entitytest.cpp,
tests/Foodtest.cpp, tests/IGEntityExerciser.h,
tests/Linetest.cpp, tests/Locationtest.cpp, tests/OOGThingtest.cpp,
tests/Planttest.cpp, tests/Propertytest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Tasktest.cpp, tests/TestWorld.h,
tests/Thingtest.cpp, tests/WorldTimetest.cpp, tests/Worldtest.cpp,
tests/allOperations.h, tests/collisiontest.cpp, tests/consttest.cpp,
tests/distancetest.cpp, tests/emergencetest.cpp,
tests/inheritancetest.cpp, tests/logtest.cpp, tests/randomtest.cpp,
tests/systemtest.cpp, tests/transformtest.cpp,
tests/type_utilstest.cpp, tests/utilitytest.cpp,
tools/AdminClient.cpp, tools/AdminClient.h, tools/cyaddrules.cpp,
tools/cycmd.cpp, tools/cyconfig.cpp, tools/cyconvertrules.cpp,
tools/cyctrl.cpp, tools/cydbload.cpp, tools/cydumprules.cpp,
tools/cyisoload.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp,
tools/cywatchdog.cpp: Replace the copyright and license statements
with new versions that include disclaimer of warranty, and
permit distribution under later versions of the GPL.
2006-01-19 02:17:06 +00:00
|
|
|
// Cyphesis Online RPG Server and AI Engine
|
2005-11-18 01:11:42 +00:00
|
|
|
// Copyright (C) 2005 Alistair Riddoch
|
2006-01-19 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientAccount.cpp, aiclient/ClientAccount.h,
aiclient/ClientConnection.cpp, aiclient/ClientConnection.h,
aiclient/client.cpp, aiclient/client.h, client/BaseClient.cpp,
client/BaseClient.h, client/CharacterClient.cpp,
client/CharacterClient.h, client/ClientConnection.cpp,
client/ClientConnection.h, client/CreatorClient.cpp,
client/CreatorClient.h, client/ObserverClient.cpp,
client/ObserverClient.h, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp,
client/define_world.cpp, client/define_world.h, common/Add.h,
common/Affect.h, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/Attack.h, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.cpp, common/BaseWorld.h,
common/Burn.h, common/Chop.h, common/Connect.h, common/CustomOp.cpp,
common/CustomOp.h, common/CustomOp_impl.h, common/Cut.h,
common/Database.cpp, common/Database.h, common/Delve.h, common/Dig.h,
common/Eat.h, common/FormattedXMLWriter.cpp,
common/FormattedXMLWriter.h, common/Generic.h, common/Load.h,
common/Monitor.h, common/Mow.h, common/Nourish.h,
common/OOGThing.cpp, common/OOGThing.h, common/Property.cpp,
common/Property.h, common/Property_impl.h, common/Save.h,
common/Setup.h, common/Tick.h, common/Unseen.h, common/Update.h,
common/Use.h, common/Wield.h, common/accountbase.cpp,
common/accountbase.h, common/const.cpp, common/const.h,
common/custom.cpp, common/debug.h, common/globals.cpp,
common/globals.h, common/id.cpp, common/id.h, common/inheritance.cpp,
common/inheritance.h, common/inheritance_impl.h, common/log.cpp,
common/log.h, common/newid.cpp, common/nls.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/random.h,
common/refno.h, common/serialno.cpp, common/serialno.h,
common/system.cpp, common/system.h, common/terrain_utils.cpp,
common/terrain_utils.h, common/type_utils.h, common/types.h,
common/utility.cpp, common/utility.h, modules/DateTime.cpp,
modules/DateTime.h, modules/Location.cpp, modules/Location.h,
modules/WorldTime.cpp, modules/WorldTime.h, physics/BBox.cpp,
physics/BBox.h, physics/Collision.cpp, physics/Collision.h,
physics/Quaternion.cpp, physics/Quaternion.h, physics/Vector3D.cpp,
physics/Vector3D.h, physics/VectorPol.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/ArithmeticScript.cpp, rulesets/ArithmeticScript.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/CalendarProperty.cpp, rulesets/CalendarProperty.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Combat.cpp,
rulesets/Combat.h, rulesets/Container.cpp, rulesets/Container.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/EntityProperties.cpp,
rulesets/Entity_getLocation.h, rulesets/Fell.cpp, rulesets/Fell.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/Line.cpp,
rulesets/Line.h, rulesets/LineProperty.cpp, rulesets/LineProperty.h,
rulesets/MemEntity.cpp, rulesets/MemEntity.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/MemMap_methods.h,
rulesets/MindFactory.cpp, rulesets/MindFactory.h, rulesets/Missile.h,
rulesets/Motion.cpp, rulesets/Motion.h, rulesets/Movement.cpp,
rulesets/Movement.h, rulesets/Pedestrian.cpp, rulesets/Pedestrian.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_BBox.cpp,
rulesets/Py_BBox.h, rulesets/Py_EntityWrapper.h,
rulesets/Py_Location.cpp, rulesets/Py_Location.h,
rulesets/Py_Map.cpp, rulesets/Py_Map.h, rulesets/Py_Mind.cpp,
rulesets/Py_Mind.h, rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Operation.h,
rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp,
rulesets/Py_Optime.h, rulesets/Py_Point3D.cpp, rulesets/Py_Point3D.h,
rulesets/Py_Property.cpp, rulesets/Py_Property.h,
rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_RootEntity.cpp, rulesets/Py_RootEntity.h,
rulesets/Py_Statistics.cpp, rulesets/Py_Statistics.h,
rulesets/Py_Task.cpp, rulesets/Py_Task.h, rulesets/Py_Thing.cpp,
rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp,
rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonArithmeticScript.cpp,
rulesets/PythonArithmeticScript.h, rulesets/PythonMindScript.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.cpp,
rulesets/PythonScript.h, rulesets/PythonThingScript.cpp,
rulesets/PythonThingScript.h, rulesets/PythonWrapper.cpp,
rulesets/PythonWrapper.h, rulesets/Python_API.cpp,
rulesets/Python_API.h, rulesets/Python_Script_Utils.h,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Statistics.cpp, rulesets/Statistics.h,
rulesets/StatisticsProperty.cpp, rulesets/StatisticsProperty.h,
rulesets/Structure.cpp, rulesets/Structure.h, rulesets/Task.cpp,
rulesets/Task.h, rulesets/TaskScript.cpp, rulesets/TaskScript.h,
rulesets/TerrainProperty.cpp, rulesets/TerrainProperty.h,
rulesets/Thing.cpp, rulesets/Thing.h, rulesets/ThingFactory.cpp,
rulesets/ThingFactory.h, rulesets/World.cpp, rulesets/World.h,
rulesets/attributes.h, server/Account.cpp, server/Account.h,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.cpp,
server/ArithmeticFactory.h, server/CommClient.cpp,
server/CommClient.h, server/CommIdleSocket.cpp,
server/CommIdleSocket.h, server/CommListener.cpp,
server/CommListener.h, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommMDNSPublisher.cpp,
server/CommMDNSPublisher.h, server/CommMaster.cpp,
server/CommMaster.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommPeer.cpp,
server/CommPeer.h, server/CommPeerListener.cpp,
server/CommPeerListener.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommServer.cpp,
server/CommServer.h, server/CommSlaveClient.cpp,
server/CommSlaveClient.h, server/CommSlaveListener.cpp,
server/CommSlaveListener.h, server/CommSocket.cpp,
server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/Connection.cpp,
server/Connection.h, server/Connection_methods.h,
server/EntityFactory.cpp, server/EntityFactory.h,
server/ExternalMind.cpp, server/ExternalMind.h,
server/Idle.cpp, server/Idle.h, server/Lobby.cpp, server/Lobby.h,
server/Master.cpp, server/Master.h, server/Peer.cpp, server/Peer.h,
server/Persistance.cpp, server/Persistance.h,
server/PersistantThingFactory.cpp, server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h, server/Persistor.cpp,
server/Persistor.h, server/Persistor_impl.h,
server/Player.cpp, server/Player.h, server/Restoration.cpp,
server/Restoration.h, server/Restorer.cpp, server/Restorer.h,
server/Restorer_impl.h, server/ScriptFactory.cpp,
server/ScriptFactory.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/SlaveClientConnection.cpp, server/SlaveClientConnection.h,
server/TaskFactory.cpp, server/TaskFactory.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h,
server/server.cpp, server/server.h, server/slave.cpp,
tests/Areatest.cpp, tests/BaseEntitytest.cpp,
tests/Charactertest.cpp, tests/Containertest.cpp,
tests/Creatortest.cpp, tests/EntityExerciser.h,
tests/EntityFactorytest.cpp, tests/Entitytest.cpp,
tests/Foodtest.cpp, tests/IGEntityExerciser.h,
tests/Linetest.cpp, tests/Locationtest.cpp, tests/OOGThingtest.cpp,
tests/Planttest.cpp, tests/Propertytest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Tasktest.cpp, tests/TestWorld.h,
tests/Thingtest.cpp, tests/WorldTimetest.cpp, tests/Worldtest.cpp,
tests/allOperations.h, tests/collisiontest.cpp, tests/consttest.cpp,
tests/distancetest.cpp, tests/emergencetest.cpp,
tests/inheritancetest.cpp, tests/logtest.cpp, tests/randomtest.cpp,
tests/systemtest.cpp, tests/transformtest.cpp,
tests/type_utilstest.cpp, tests/utilitytest.cpp,
tools/AdminClient.cpp, tools/AdminClient.h, tools/cyaddrules.cpp,
tools/cycmd.cpp, tools/cyconfig.cpp, tools/cyconvertrules.cpp,
tools/cyctrl.cpp, tools/cydbload.cpp, tools/cydumprules.cpp,
tools/cyisoload.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp,
tools/cywatchdog.cpp: Replace the copyright and license statements
with new versions that include disclaimer of warranty, and
permit distribution under later versions of the GPL.
2006-01-19 02:17:06 +00:00
|
|
|
//
|
|
|
|
|
// 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 2 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, write to the Free Software Foundation,
|
|
|
|
|
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2008-09-08 11:49:22 +00:00
|
|
|
// $Id$
|
2006-10-26 00:48:00 +00:00
|
|
|
|
2011-02-15 09:30:46 +00:00
|
|
|
#ifdef NDEBUG
|
|
|
|
|
#undef NDEBUG
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef DEBUG
|
|
|
|
|
#define DEBUG
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-11-18 01:11:42 +00:00
|
|
|
#include "TestWorld.h"
|
|
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
#include "server/CorePropertyManager.h"
|
2009-03-14 04:21:31 +00:00
|
|
|
#include "server/EntityBuilder.h"
|
2009-03-22 15:30:23 +00:00
|
|
|
#include "server/EntityFactory.h"
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
#include "rulesets/World.h"
|
|
|
|
|
#include "rulesets/Creator.h"
|
|
|
|
|
#include "rulesets/Plant.h"
|
|
|
|
|
#include "rulesets/Stackable.h"
|
|
|
|
|
#include "rulesets/Script.h"
|
2011-11-03 22:57:46 +00:00
|
|
|
#include "rulesets/Task.h"
|
2010-07-15 23:46:06 +01:00
|
|
|
|
|
|
|
|
#include "common/compose.hpp"
|
|
|
|
|
#include "common/id.h"
|
2009-03-20 15:31:38 +00:00
|
|
|
#include "common/Inheritance.h"
|
2010-07-15 23:46:06 +01:00
|
|
|
#include "common/log.h"
|
|
|
|
|
#include "common/Monitors.h"
|
|
|
|
|
#include "common/Property_impl.h"
|
2009-08-21 00:23:47 +01:00
|
|
|
#include "common/TypeNode.h"
|
2010-07-15 23:46:06 +01:00
|
|
|
#include "common/Variable.h"
|
2011-12-16 08:14:36 +00:00
|
|
|
#include "common/ScriptKit.h"
|
2008-09-08 11:49:22 +00:00
|
|
|
|
2005-11-18 01:11:42 +00:00
|
|
|
#include <Atlas/Objects/Anonymous.h>
|
2010-10-20 22:51:42 +01:00
|
|
|
#include <Atlas/Objects/RootOperation.h>
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
#include <cstdlib>
|
|
|
|
|
|
2005-11-18 01:11:42 +00:00
|
|
|
#include <cassert>
|
|
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
using Atlas::Message::Element;
|
|
|
|
|
using Atlas::Message::ListType;
|
2005-11-18 01:11:42 +00:00
|
|
|
using Atlas::Message::MapType;
|
|
|
|
|
using Atlas::Objects::Entity::Anonymous;
|
2007-11-22 02:06:52 +00:00
|
|
|
using Atlas::Objects::Root;
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2007-12-20 20:00:23 +00:00
|
|
|
class ExposedEntityBuilder : public EntityBuilder {
|
2005-11-18 01:52:10 +00:00
|
|
|
public:
|
2011-09-21 12:45:18 +01:00
|
|
|
explicit ExposedEntityBuilder(BaseWorld & w) : EntityBuilder() { }
|
2005-11-18 01:52:10 +00:00
|
|
|
|
2007-11-22 02:06:52 +00:00
|
|
|
const FactoryDict & factoryDict() const { return m_entityFactories; }
|
2005-11-18 15:09:08 +00:00
|
|
|
|
2005-11-18 01:52:10 +00:00
|
|
|
};
|
|
|
|
|
|
2011-12-14 14:26:01 +00:00
|
|
|
class TestScriptFactory : public ScriptKit<Entity> {
|
2011-11-08 20:32:35 +00:00
|
|
|
protected:
|
|
|
|
|
std::string m_package;
|
2010-07-16 02:12:53 +01:00
|
|
|
public:
|
2011-11-08 20:32:35 +00:00
|
|
|
TestScriptFactory() { }
|
2010-07-16 02:12:53 +01:00
|
|
|
|
2011-11-08 20:32:35 +00:00
|
|
|
const std::string & package() const { return m_package; }
|
|
|
|
|
int addScript(Entity * entity) const { return 0; }
|
2010-07-16 02:12:53 +01:00
|
|
|
int refreshClass() { return 0; }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum action {
|
|
|
|
|
DO_NOTHING,
|
|
|
|
|
SET_POS,
|
|
|
|
|
SET_VELOCITY } LocatedEntity_merge_action = DO_NOTHING;
|
|
|
|
|
|
2006-01-15 21:12:19 +00:00
|
|
|
int main(int argc, char ** argv)
|
2005-11-18 01:11:42 +00:00
|
|
|
{
|
|
|
|
|
{
|
2010-07-15 23:46:06 +01:00
|
|
|
Entity e("1", 1);
|
2005-11-18 01:11:42 +00:00
|
|
|
TestWorld test_world(e);
|
|
|
|
|
Anonymous attributes;
|
|
|
|
|
|
2011-09-21 12:45:18 +01:00
|
|
|
EntityBuilder::init();
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2007-12-20 20:00:23 +00:00
|
|
|
assert(EntityBuilder::instance() != 0);
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2011-09-21 12:45:18 +01:00
|
|
|
assert(EntityBuilder::instance()->newEntity("1", 1, "world", attributes, test_world) == 0);
|
|
|
|
|
assert(EntityBuilder::instance()->newEntity("1", 1, "nonexistant", attributes, test_world) == 0);
|
|
|
|
|
assert(EntityBuilder::instance()->newEntity("1", 1, "thing", attributes, test_world) != 0);
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2007-12-20 20:00:23 +00:00
|
|
|
EntityBuilder::del();
|
|
|
|
|
assert(EntityBuilder::instance() == 0);
|
2008-09-08 11:49:22 +00:00
|
|
|
Inheritance::clear();
|
2005-11-18 01:11:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
2010-07-15 23:46:06 +01:00
|
|
|
Entity e("1", 1);
|
2005-11-18 01:11:42 +00:00
|
|
|
TestWorld test_world(e);
|
|
|
|
|
Anonymous attributes;
|
|
|
|
|
|
2011-09-21 12:45:18 +01:00
|
|
|
EntityBuilder::init();
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2007-12-20 20:00:23 +00:00
|
|
|
assert(EntityBuilder::instance() != 0);
|
2005-11-18 01:11:42 +00:00
|
|
|
|
2010-07-16 02:12:53 +01:00
|
|
|
// Create a normal Entity
|
2011-09-21 12:45:18 +01:00
|
|
|
Entity * test_ent = EntityBuilder::instance()->newEntity("1", 1, "thing", attributes, test_world);
|
2005-11-18 01:11:42 +00:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
2010-07-16 02:12:53 +01:00
|
|
|
// Create an entity specifying an attrbute
|
2005-11-18 01:11:42 +00:00
|
|
|
attributes->setAttr("funky", "true");
|
|
|
|
|
|
2011-09-21 12:45:18 +01:00
|
|
|
test_ent = EntityBuilder::instance()->newEntity("1", 1, "thing", attributes, test_world);
|
2005-11-18 01:11:42 +00:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
2010-07-16 02:12:53 +01:00
|
|
|
// Create an entity causing VELOCITY to be set
|
|
|
|
|
attributes = Anonymous();
|
|
|
|
|
|
|
|
|
|
attributes->setVelocity(std::vector<double>(3, 1.5));
|
|
|
|
|
|
|
|
|
|
LocatedEntity_merge_action = SET_VELOCITY;
|
|
|
|
|
|
2011-09-21 12:45:18 +01:00
|
|
|
test_ent = EntityBuilder::instance()->newEntity("1", 1, "thing", attributes, test_world);
|
2010-07-16 02:12:53 +01:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
|
|
|
|
LocatedEntity_merge_action = DO_NOTHING;
|
|
|
|
|
|
|
|
|
|
// Create an entity causing VELOCITY to be set for no obvious reason
|
|
|
|
|
attributes = Anonymous();
|
|
|
|
|
|
|
|
|
|
LocatedEntity_merge_action = SET_VELOCITY;
|
|
|
|
|
|
2011-09-21 12:45:18 +01:00
|
|
|
test_ent = EntityBuilder::instance()->newEntity("1", 1, "thing", attributes, test_world);
|
2010-07-16 02:12:53 +01:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
|
|
|
|
LocatedEntity_merge_action = DO_NOTHING;
|
|
|
|
|
|
|
|
|
|
// Create an entity specifying a LOC
|
|
|
|
|
attributes = Anonymous();
|
|
|
|
|
|
|
|
|
|
attributes->setLoc("1");
|
|
|
|
|
|
2011-09-21 12:45:18 +01:00
|
|
|
test_ent = EntityBuilder::instance()->newEntity("1", 1, "thing", attributes, test_world);
|
2010-07-16 02:12:53 +01:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
2007-12-20 20:00:23 +00:00
|
|
|
EntityBuilder::del();
|
|
|
|
|
assert(EntityBuilder::instance() == 0);
|
2008-09-08 11:49:22 +00:00
|
|
|
Inheritance::clear();
|
2005-11-18 01:11:42 +00:00
|
|
|
}
|
2005-11-18 15:09:08 +00:00
|
|
|
|
|
|
|
|
{
|
2005-11-18 17:15:31 +00:00
|
|
|
// Create a test world.
|
2010-07-15 23:46:06 +01:00
|
|
|
Entity e("1", 1);
|
2005-11-18 15:09:08 +00:00
|
|
|
TestWorld test_world(e);
|
|
|
|
|
|
2007-12-20 20:00:23 +00:00
|
|
|
// Instance of EntityBuilder with all protected methods exposed
|
2005-11-18 17:15:31 +00:00
|
|
|
// for testing
|
2007-12-20 20:00:23 +00:00
|
|
|
ExposedEntityBuilder entity_factory(test_world);
|
2005-11-18 15:09:08 +00:00
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Attributes for test entities being created
|
|
|
|
|
Anonymous attributes;
|
|
|
|
|
|
|
|
|
|
// Create an entity which is an instance of one of the core classes
|
2011-09-21 12:45:18 +01:00
|
|
|
Entity * test_ent = entity_factory.newEntity("1", 1, "thing", attributes, test_world);
|
2005-11-18 15:09:08 +00:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
2010-07-16 02:12:53 +01:00
|
|
|
Inheritance::clear();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
// Create a test world.
|
|
|
|
|
Entity e("1", 1);
|
|
|
|
|
TestWorld test_world(e);
|
|
|
|
|
|
|
|
|
|
// Instance of EntityBuilder with all protected methods exposed
|
|
|
|
|
// for testing
|
|
|
|
|
ExposedEntityBuilder entity_factory(test_world);
|
|
|
|
|
|
|
|
|
|
// Attributes for test entities being created
|
|
|
|
|
Anonymous attributes;
|
|
|
|
|
|
|
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Check that creating an entity of a type we know we have not yet
|
|
|
|
|
// installed results in a null pointer.
|
2011-09-21 12:45:18 +01:00
|
|
|
assert(entity_factory.newEntity("1", 1, "custom_type", attributes, test_world) == 0);
|
2005-11-18 15:09:08 +00:00
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Get a reference to the internal dictionary of entity factories.
|
2005-11-18 15:09:08 +00:00
|
|
|
const FactoryDict & factory_dict = entity_factory.factoryDict();
|
|
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Make sure it has some factories in it already.
|
2005-11-18 15:09:08 +00:00
|
|
|
assert(!factory_dict.empty());
|
|
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Assert the dictionary does not contain the factory we know we have
|
|
|
|
|
// have not yet installed.
|
2005-11-18 15:09:08 +00:00
|
|
|
assert(factory_dict.find("custom_type") == factory_dict.end());
|
|
|
|
|
|
2009-08-21 00:23:47 +01:00
|
|
|
// Set up a type description for a new type, and install it
|
2010-07-15 23:46:06 +01:00
|
|
|
EntityKit * custom_type_factory = new EntityFactory<Entity>();
|
2009-08-21 00:23:47 +01:00
|
|
|
custom_type_factory->m_attributes["test_custom_type_attr"] =
|
|
|
|
|
"test_value";
|
|
|
|
|
{
|
2011-12-17 18:37:28 +00:00
|
|
|
entity_factory.installFactory("custom_type",
|
|
|
|
|
atlasClass("custom_type", "thing"),
|
2011-09-18 17:26:26 +01:00
|
|
|
custom_type_factory);
|
|
|
|
|
custom_type_factory->m_type = new TypeNode("custom_type");
|
2009-08-21 00:23:47 +01:00
|
|
|
}
|
|
|
|
|
|
2011-09-16 16:52:45 +01:00
|
|
|
PropertyBase * p = new Property<std::string>;
|
|
|
|
|
custom_type_factory->m_type->addProperty("test_custom_type_attr", p);
|
|
|
|
|
p->set("test_value");
|
2009-08-21 00:23:47 +01:00
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Check that the factory dictionary now contains a factory for
|
|
|
|
|
// the custom type we just installed.
|
2005-11-18 15:09:08 +00:00
|
|
|
FactoryDict::const_iterator I = factory_dict.find("custom_type");
|
|
|
|
|
assert(I != factory_dict.end());
|
2009-08-21 00:23:47 +01:00
|
|
|
assert(custom_type_factory == I->second);
|
2005-11-18 15:09:08 +00:00
|
|
|
|
2009-08-21 00:23:47 +01:00
|
|
|
MapType::const_iterator J;
|
2005-11-18 17:15:31 +00:00
|
|
|
// Check the factory has the attributes we described on the custom
|
|
|
|
|
// type.
|
2009-08-21 00:23:47 +01:00
|
|
|
J = custom_type_factory->m_attributes.find("test_custom_type_attr");
|
2005-11-18 15:09:08 +00:00
|
|
|
assert(J != custom_type_factory->m_attributes.end());
|
|
|
|
|
assert(J->second.isString());
|
|
|
|
|
assert(J->second.String() == "test_value");
|
|
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Create an instance of our custom type, ensuring that it works.
|
2011-09-21 12:45:18 +01:00
|
|
|
Entity * test_ent = entity_factory.newEntity("1", 1, "custom_type", attributes, test_world);
|
2005-11-18 15:09:08 +00:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
2009-08-21 00:23:47 +01:00
|
|
|
assert(test_ent->getType() == custom_type_factory->m_type);
|
|
|
|
|
|
2005-11-18 17:15:31 +00:00
|
|
|
// Check that creating an entity of a type we know we have not yet
|
|
|
|
|
// installed results in a null pointer.
|
2011-09-21 12:45:18 +01:00
|
|
|
assert(entity_factory.newEntity("1", 1, "custom_inherited_type", attributes, test_world) == 0);
|
2005-11-18 17:15:31 +00:00
|
|
|
|
|
|
|
|
// Assert the dictionary does not contain the factory we know we have
|
|
|
|
|
// have not yet installed.
|
2005-11-18 15:09:08 +00:00
|
|
|
assert(factory_dict.find("custom_inherited_type") == factory_dict.end());
|
2010-07-16 02:12:53 +01:00
|
|
|
Inheritance::clear();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
Entity e("1", 1);
|
|
|
|
|
TestWorld test_world(e);
|
|
|
|
|
ExposedEntityBuilder entity_factory(test_world);
|
|
|
|
|
Anonymous attributes;
|
|
|
|
|
|
|
|
|
|
// Get a reference to the internal dictionary of entity factories.
|
|
|
|
|
const FactoryDict & factory_dict = entity_factory.factoryDict();
|
|
|
|
|
|
|
|
|
|
// Make sure it has some factories in it already.
|
|
|
|
|
assert(!factory_dict.empty());
|
|
|
|
|
|
|
|
|
|
// Assert the dictionary does not contain the factory we know we have
|
|
|
|
|
// have not yet installed.
|
|
|
|
|
assert(factory_dict.find("custom_scripted_type") == factory_dict.end());
|
|
|
|
|
|
|
|
|
|
// Set up a type description for a new type, and install it
|
|
|
|
|
EntityKit * custom_type_factory = new EntityFactory<Entity>();
|
|
|
|
|
custom_type_factory->m_attributes["test_custom_type_attr"] =
|
|
|
|
|
"test_value";
|
|
|
|
|
|
|
|
|
|
custom_type_factory->m_scriptFactory = new TestScriptFactory();
|
|
|
|
|
|
|
|
|
|
{
|
2011-12-17 18:37:28 +00:00
|
|
|
entity_factory.installFactory("custom_scripted_type",
|
|
|
|
|
atlasClass("custom_scripted_type", "thing"),
|
|
|
|
|
custom_type_factory);
|
2011-09-18 17:26:26 +01:00
|
|
|
custom_type_factory->m_type = new TypeNode("custom_scripted_type");
|
2010-07-16 02:12:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check that the factory dictionary now contains a factory for
|
|
|
|
|
// the custom type we just installed.
|
|
|
|
|
FactoryDict::const_iterator I = factory_dict.find("custom_scripted_type");
|
|
|
|
|
assert(I != factory_dict.end());
|
|
|
|
|
assert(custom_type_factory == I->second);
|
|
|
|
|
|
|
|
|
|
// Create an instance of our custom type, ensuring that it works.
|
2011-09-21 12:45:18 +01:00
|
|
|
Entity * test_ent = entity_factory.newEntity("1", 1, "custom_scripted_type", attributes, test_world);
|
2010-07-16 02:12:53 +01:00
|
|
|
assert(test_ent != 0);
|
|
|
|
|
|
|
|
|
|
assert(test_ent->getType() == custom_type_factory->m_type);
|
|
|
|
|
|
|
|
|
|
Inheritance::clear();
|
2005-11-18 15:09:08 +00:00
|
|
|
}
|
2005-11-18 01:11:42 +00:00
|
|
|
}
|
2010-07-15 23:46:06 +01:00
|
|
|
|
|
|
|
|
// stubs
|
|
|
|
|
|
|
|
|
|
Monitors * Monitors::m_instance = NULL;
|
|
|
|
|
|
|
|
|
|
Monitors::Monitors()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Monitors::~Monitors()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Monitors * Monitors::instance()
|
|
|
|
|
{
|
|
|
|
|
if (m_instance == NULL) {
|
|
|
|
|
m_instance = new Monitors();
|
|
|
|
|
}
|
|
|
|
|
return m_instance;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Monitors::watch(const::std::string & name, VariableBase * monitor)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EntityKit::EntityKit() : m_scriptFactory(0), m_createdCount(0)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EntityKit::~EntityKit()
|
|
|
|
|
{
|
|
|
|
|
if (m_scriptFactory != 0) {
|
|
|
|
|
delete m_scriptFactory;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <>
|
|
|
|
|
Entity * EntityFactory<World>::newEntity(const std::string & id, long intId)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
|
EntityFactory<T>::EntityFactory(EntityFactory<T> & o)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
|
EntityFactory<T>::EntityFactory()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
|
EntityFactory<T>::~EntityFactory()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
|
Entity * EntityFactory<T>::newEntity(const std::string & id, long intId)
|
|
|
|
|
{
|
|
|
|
|
++m_createdCount;
|
|
|
|
|
return new Entity(id, intId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
|
EntityKit * EntityFactory<T>::duplicateFactory()
|
|
|
|
|
{
|
|
|
|
|
EntityKit * f = new EntityFactory<T>(*this);
|
|
|
|
|
f->m_parent = this;
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template class EntityFactory<Entity>;
|
|
|
|
|
template class EntityFactory<Thing>;
|
|
|
|
|
template class EntityFactory<Character>;
|
|
|
|
|
template class EntityFactory<Creator>;
|
|
|
|
|
template class EntityFactory<Plant>;
|
|
|
|
|
template class EntityFactory<Stackable>;
|
|
|
|
|
template class EntityFactory<World>;
|
|
|
|
|
|
|
|
|
|
Entity::Entity(const std::string & id, long intId) :
|
|
|
|
|
LocatedEntity(id, intId), m_motion(0), m_flags(0)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Entity::~Entity()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::destroy()
|
|
|
|
|
{
|
|
|
|
|
destroyed.emit();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::ActuateOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::AppearanceOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::AttackOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::CombineOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::CreateOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::DeleteOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::DisappearanceOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::DivideOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::EatOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::ImaginaryOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::LookOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::MoveOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::NourishOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::SetOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::SightOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::SoundOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::TalkOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::TickOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::TouchOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::UpdateOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::UseOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::WieldOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::externalOperation(const Operation & op)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::operation(const Operation & op, OpVector & res)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::addToMessage(Atlas::Message::MapType & omap) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::addToEntity(const Atlas::Objects::Entity::RootEntity & ent) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-28 00:28:25 +00:00
|
|
|
PropertyBase * Entity::setAttr(const std::string & name,
|
|
|
|
|
const Atlas::Message::Element & attr)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
2011-02-28 00:28:25 +00:00
|
|
|
return 0;
|
2010-07-15 23:46:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const PropertyBase * Entity::getProperty(const std::string & name) const
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PropertyBase * Entity::modProperty(const std::string & name)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::onContainered()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::onUpdated()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
LocatedEntity::LocatedEntity(const std::string & id, long intId) :
|
|
|
|
|
Router(id, intId),
|
|
|
|
|
m_refCount(0), m_seq(0),
|
2011-10-13 15:19:18 +01:00
|
|
|
m_script(0), m_type(0), m_contains(0)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
LocatedEntity::~LocatedEntity()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool LocatedEntity::hasAttr(const std::string & name) const
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-29 17:36:26 +01:00
|
|
|
int LocatedEntity::getAttr(const std::string & name,
|
|
|
|
|
Atlas::Message::Element & attr) const
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
2011-09-29 17:36:26 +01:00
|
|
|
return -1;
|
2010-07-15 23:46:06 +01:00
|
|
|
}
|
|
|
|
|
|
2011-09-29 17:36:26 +01:00
|
|
|
int LocatedEntity::getAttrType(const std::string & name,
|
|
|
|
|
Atlas::Message::Element & attr,
|
|
|
|
|
int type) const
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
2011-09-29 17:36:26 +01:00
|
|
|
return -1;
|
2010-07-15 23:46:06 +01:00
|
|
|
}
|
|
|
|
|
|
2011-02-28 00:28:25 +00:00
|
|
|
PropertyBase * LocatedEntity::setAttr(const std::string & name,
|
|
|
|
|
const Atlas::Message::Element & attr)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
2011-02-28 00:28:25 +00:00
|
|
|
return 0;
|
2010-07-15 23:46:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const PropertyBase * LocatedEntity::getProperty(const std::string & name) const
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void LocatedEntity::onContainered()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void LocatedEntity::onUpdated()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void LocatedEntity::makeContainer()
|
|
|
|
|
{
|
|
|
|
|
if (m_contains == 0) {
|
|
|
|
|
m_contains = new LocatedEntitySet;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void LocatedEntity::merge(const MapType & ent)
|
|
|
|
|
{
|
2010-07-16 02:12:53 +01:00
|
|
|
switch (LocatedEntity_merge_action) {
|
|
|
|
|
case SET_POS:
|
|
|
|
|
this->m_location.m_pos.setValid();
|
|
|
|
|
break;
|
|
|
|
|
case SET_VELOCITY:
|
|
|
|
|
this->m_location.m_velocity.setValid();
|
|
|
|
|
break;
|
|
|
|
|
case DO_NOTHING:
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
};
|
|
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void log(LogLevel lvl, const std::string & msg)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Inheritance * Inheritance::m_instance = NULL;
|
|
|
|
|
|
|
|
|
|
Inheritance::Inheritance()
|
|
|
|
|
{
|
|
|
|
|
Atlas::Objects::Entity::Anonymous root_desc;
|
|
|
|
|
|
|
|
|
|
root_desc->setParents(std::list<std::string>(0));
|
|
|
|
|
root_desc->setObjtype("meta");
|
|
|
|
|
root_desc->setId("root");
|
|
|
|
|
|
2011-09-17 18:54:37 +01:00
|
|
|
TypeNode * root = new TypeNode("root", root_desc);
|
2010-07-15 23:46:06 +01:00
|
|
|
|
|
|
|
|
atlasObjects["root"] = root;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Inheritance & Inheritance::instance()
|
|
|
|
|
{
|
|
|
|
|
if (m_instance == NULL) {
|
|
|
|
|
m_instance = new Inheritance();
|
|
|
|
|
installStandardObjects();
|
|
|
|
|
}
|
|
|
|
|
return *m_instance;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void installStandardObjects()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
i.addChild(atlasClass("root_entity", "root"));
|
|
|
|
|
i.addChild(atlasClass("admin_entity", "root_entity"));
|
|
|
|
|
i.addChild(atlasClass("account", "admin_entity"));
|
|
|
|
|
i.addChild(atlasClass("player", "account"));
|
|
|
|
|
i.addChild(atlasClass("admin", "account"));
|
|
|
|
|
i.addChild(atlasClass("game", "admin_entity"));
|
|
|
|
|
i.addChild(atlasClass("game_entity", "root_entity"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const TypeNode * Inheritance::getType(const std::string & parent)
|
|
|
|
|
{
|
|
|
|
|
TypeNodeDict::const_iterator I = atlasObjects.find(parent);
|
|
|
|
|
if (I == atlasObjects.end()) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return I->second;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool Inheritance::isTypeOf(const TypeNode * instance,
|
|
|
|
|
const std::string & base_type) const
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool Inheritance::isTypeOf(const std::string & instance,
|
|
|
|
|
const std::string & base_type) const
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-16 16:52:45 +01:00
|
|
|
TypeNode * Inheritance::addChild(const Root & obj)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
|
|
|
|
const std::string & child = obj->getId();
|
|
|
|
|
const std::string & parent = obj->getParents().front();
|
|
|
|
|
if (atlasObjects.find(child) != atlasObjects.end()) {
|
|
|
|
|
std::cerr << String::compose("Installing type \"%1\"(\"%2\") "
|
|
|
|
|
"which was already installed",
|
|
|
|
|
child, parent) << std::endl;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
TypeNodeDict::iterator I = atlasObjects.find(parent);
|
|
|
|
|
if (I == atlasObjects.end()) {
|
|
|
|
|
std::cerr << String::compose("Installing type \"%1\" "
|
|
|
|
|
"which has unknown parent \"%2\".",
|
|
|
|
|
child, parent) << std::endl;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
Element children(ListType(1, child));
|
|
|
|
|
if (I->second->description()->copyAttr("children", children) == 0) {
|
|
|
|
|
assert(children.isList());
|
|
|
|
|
children.asList().push_back(child);
|
|
|
|
|
}
|
|
|
|
|
I->second->description()->setAttr("children", children);
|
|
|
|
|
|
2011-09-17 18:54:37 +01:00
|
|
|
TypeNode * type = new TypeNode(child, obj);
|
2010-07-15 23:46:06 +01:00
|
|
|
type->setParent(I->second);
|
|
|
|
|
|
|
|
|
|
atlasObjects[child] = type;
|
|
|
|
|
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritance::clear()
|
|
|
|
|
{
|
|
|
|
|
if (m_instance != NULL) {
|
|
|
|
|
delete m_instance;
|
|
|
|
|
m_instance = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-16 18:30:22 +01:00
|
|
|
TypeNode::TypeNode(const std::string & name) : m_name(name), m_parent(0)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-17 19:09:28 +01:00
|
|
|
TypeNode::TypeNode(const std::string & name,
|
|
|
|
|
const Atlas::Objects::Root & d) : m_name(name),
|
|
|
|
|
m_description(d),
|
|
|
|
|
m_parent(0)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
TypeNode::~TypeNode()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-16 16:52:45 +01:00
|
|
|
void TypeNode::addProperty(const std::string & name,
|
|
|
|
|
PropertyBase * p)
|
|
|
|
|
{
|
|
|
|
|
m_defaults[name] = p;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
PropertyBase::PropertyBase(unsigned int flags) : m_flags(flags)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PropertyBase::~PropertyBase()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PropertyBase::install(Entity *)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PropertyBase::apply(Entity *)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PropertyBase::add(const std::string & s,
|
|
|
|
|
Atlas::Message::MapType & ent) const
|
|
|
|
|
{
|
|
|
|
|
get(ent[s]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PropertyBase::add(const std::string & s,
|
|
|
|
|
const Atlas::Objects::Entity::RootEntity & ent) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template<>
|
|
|
|
|
void Property<int>::set(const Atlas::Message::Element & e)
|
|
|
|
|
{
|
|
|
|
|
if (e.isInt()) {
|
|
|
|
|
this->m_data = e.asInt();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template<>
|
|
|
|
|
void Property<double>::set(const Atlas::Message::Element & e)
|
|
|
|
|
{
|
|
|
|
|
if (e.isNum()) {
|
|
|
|
|
this->m_data = e.asNum();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template<>
|
|
|
|
|
void Property<std::string>::set(const Atlas::Message::Element & e)
|
|
|
|
|
{
|
|
|
|
|
if (e.isString()) {
|
|
|
|
|
this->m_data = e.String();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template class Property<int>;
|
|
|
|
|
template class Property<double>;
|
|
|
|
|
template class Property<std::string>;
|
|
|
|
|
|
|
|
|
|
Router::Router(const std::string & id, long intId) : m_id(id),
|
|
|
|
|
m_intId(intId)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Router::~Router()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Router::addToMessage(Atlas::Message::MapType & omap) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Router::addToEntity(const Atlas::Objects::Entity::RootEntity & ent) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Router::error(const Operation & op,
|
|
|
|
|
const std::string & errstring,
|
|
|
|
|
OpVector & res,
|
|
|
|
|
const std::string & to) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Script::Script()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// \brief Script destructor
|
|
|
|
|
Script::~Script()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool Script::operation(const std::string & opname,
|
|
|
|
|
const Atlas::Objects::Operation::RootOperation & op,
|
|
|
|
|
OpVector & res)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Script::hook(const std::string & function, LocatedEntity * entity)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Location::addToMessage(MapType & omap) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2010-09-16 05:14:35 +01:00
|
|
|
Location::Location() : m_loc(0)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Location::Location(LocatedEntity * rf, const Point3D & pos)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Location::addToEntity(const Atlas::Objects::Entity::RootEntity & ent) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int Location::readFromEntity(const Atlas::Objects::Entity::RootEntity & ent)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-03 21:42:12 +00:00
|
|
|
void Task::initTask(const Operation & op, OpVector & res)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-03 21:42:12 +00:00
|
|
|
void Task::TickOperation(const Operation & op, OpVector & res)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-02 23:10:41 +00:00
|
|
|
Task::Task(LocatedEntity & chr) : m_refCount(0), m_serialno(0), m_obsolete(false), m_progress(-1), m_rate(-1), m_owner(chr)
|
2010-07-15 23:46:06 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Task::~Task()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Task::irrelevant()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-03 21:31:09 +00:00
|
|
|
void Task::setScript(Script*)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-15 23:46:06 +01:00
|
|
|
BaseWorld * BaseWorld::m_instance = 0;
|
|
|
|
|
|
|
|
|
|
BaseWorld::BaseWorld(Entity & gw) : m_gameWorld(gw)
|
|
|
|
|
{
|
|
|
|
|
m_instance = this;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BaseWorld::~BaseWorld()
|
|
|
|
|
{
|
|
|
|
|
m_instance = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Entity * BaseWorld::getEntity(const std::string & id) const
|
|
|
|
|
{
|
|
|
|
|
long intId = integerId(id);
|
|
|
|
|
|
|
|
|
|
EntityDict::const_iterator I = m_eobjects.find(intId);
|
|
|
|
|
if (I != m_eobjects.end()) {
|
|
|
|
|
assert(I->second != 0);
|
|
|
|
|
return I->second;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CorePropertyManager::CorePropertyManager()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CorePropertyManager::~CorePropertyManager()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PropertyBase * CorePropertyManager::addProperty(const std::string & name,
|
|
|
|
|
int type)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PropertyManager * PropertyManager::m_instance = 0;
|
|
|
|
|
|
|
|
|
|
PropertyManager::PropertyManager()
|
|
|
|
|
{
|
|
|
|
|
assert(m_instance == 0);
|
|
|
|
|
m_instance = this;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PropertyManager::~PropertyManager()
|
|
|
|
|
{
|
|
|
|
|
m_instance = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long integerId(const std::string & id)
|
|
|
|
|
{
|
|
|
|
|
long intId = strtol(id.c_str(), 0, 10);
|
|
|
|
|
if (intId == 0 && id != "0") {
|
|
|
|
|
intId = -1L;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return intId;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
VariableBase::~VariableBase()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
Variable<T>::Variable(const T & variable) : m_variable(variable)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
Variable<T>::~Variable()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
void Variable<T>::send(std::ostream & o)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template class Variable<int>;
|
|
|
|
|
template class Variable<std::string>;
|
|
|
|
|
template class Variable<const char *>;
|
|
|
|
|
|
|
|
|
|
Root atlasClass(const std::string & name, const std::string & parent)
|
|
|
|
|
{
|
|
|
|
|
Atlas::Objects::Entity::Anonymous r;
|
|
|
|
|
r->setParents(std::list<std::string>(1, parent));
|
|
|
|
|
r->setObjtype("class");
|
|
|
|
|
r->setId(name);
|
|
|
|
|
return r;
|
|
|
|
|
}
|