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
|
2006-01-20 02:11:40 +00:00
|
|
|
// Copyright (C) 2000-2006 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
|
2001-01-26 16:38:23 +00:00
|
|
|
|
2006-10-26 00:48:00 +00:00
|
|
|
|
2002-07-14 21:04:50 +00:00
|
|
|
#include "Thing.h"
|
2005-04-21 00:28:25 +00:00
|
|
|
|
|
|
|
|
#include "Motion.h"
|
2009-05-12 23:30:19 +01:00
|
|
|
#include "Domain.h"
|
2016-01-17 17:02:50 +01:00
|
|
|
#include "TransformsProperty.h"
|
2002-07-14 21:04:50 +00:00
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
#include "common/BaseWorld.h"
|
2003-03-07 00:22:12 +00:00
|
|
|
#include "common/log.h"
|
|
|
|
|
#include "common/const.h"
|
|
|
|
|
#include "common/debug.h"
|
2005-09-11 21:53:17 +00:00
|
|
|
#include "common/compose.hpp"
|
2006-12-29 01:00:07 +00:00
|
|
|
#include "common/Property.h"
|
2002-07-14 21:04:50 +00:00
|
|
|
|
2005-09-26 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/custom.cpp, common/op_switch.h,
common/types.h, rulesets/BaseMind.cpp, rulesets/Character.cpp,
rulesets/Creator.cpp, rulesets/Food.cpp, rulesets/Plant.cpp,
rulesets/Thing.cpp, rulesets/World.cpp, server/Admin.cpp,
server/Admin.cpp: Replace OpNo enumeration with defines for the
integer class numbers. Expand the switch statements used for op
dispatch because runtime extended op definitions don't have a const
number.
* server/EntityFactory.cpp: Re-order installation of ops to ensure
the number registered in enumeration maps is the one returned by
the Atlas factories.
* rulesets/Character.cpp: Improve debug output for op handling when
debug is enabled for this file.
2005-09-26 00:06:19 +00:00
|
|
|
#include "common/Burn.h"
|
2003-03-07 00:22:12 +00:00
|
|
|
#include "common/Nourish.h"
|
2005-02-17 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/types.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Thing.cpp,
rulesets/Thing.h: Add core op handling for update operation, used
to handle move ops better.
2005-02-17 01:47:32 +00:00
|
|
|
#include "common/Update.h"
|
2006-01-20 02:11:40 +00:00
|
|
|
#include "common/Pickup.h"
|
|
|
|
|
#include "common/Drop.h"
|
2015-04-15 23:06:33 +02:00
|
|
|
#include "common/Unseen.h"
|
2002-07-14 21:04:50 +00:00
|
|
|
|
2003-07-18 00:43:53 +00:00
|
|
|
#include <wfmath/atlasconv.h>
|
|
|
|
|
|
2005-08-27 14:52:12 +00:00
|
|
|
#include <Atlas/Objects/Operation.h>
|
|
|
|
|
#include <Atlas/Objects/Anonymous.h>
|
|
|
|
|
|
|
|
|
|
using Atlas::Objects::smart_dynamic_cast;
|
2000-08-21 11:31:18 +00:00
|
|
|
|
2005-06-03 14:56:17 +00:00
|
|
|
using Atlas::Message::Element;
|
2004-12-03 Al Riddoch <alriddoch@zepler.org>
* 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/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.h, common/custom.cpp,
common/inheritance.cpp, common/inheritance.h,
common/inheritance_impl.h, common/op_switch.h, common/type_utils.h,
common/types.h, common/utility.cpp, common/utility.h,
modules/Location.cpp, rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Creator.cpp,
rulesets/Creator.h, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/EntityProperties.cpp, rulesets/Entity_getLocation.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/Missile.h, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Operation.h, rulesets/Py_Thing.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.h, rulesets/Python_API.cpp,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/EntityFactory.cpp, server/EntityFactory.h, server/Lobby.cpp,
server/Lobby.h, server/Persistance.cpp, server/Persistance.h,
server/Persistor.cpp, server/Player.cpp, server/Player.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h, tests/Areatest.cpp,
tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/IGEntityExerciser.h, tests/Linetest.cpp, tests/Planttest.cpp,
tests/Stackabletest.cpp, tests/Structuretest.cpp, tests/Thingtest.cpp,
tests/Worldtest.cpp, tests/allOperations.h, tests/inheritancetest.cpp,
tests/utilitytest.cpp, tools/cycmd.cpp:
Modify the entity interface so that all Operation methods
take references to RootOperation, as its cleaner, and requires
less nasty casts. Clean up operations in headers generally.
2004-12-03 14:49:13 +00:00
|
|
|
using Atlas::Message::MapType;
|
2005-08-27 14:52:12 +00:00
|
|
|
using Atlas::Objects::Root;
|
2004-12-03 Al Riddoch <alriddoch@zepler.org>
* 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/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.h, common/custom.cpp,
common/inheritance.cpp, common/inheritance.h,
common/inheritance_impl.h, common/op_switch.h, common/type_utils.h,
common/types.h, common/utility.cpp, common/utility.h,
modules/Location.cpp, rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Creator.cpp,
rulesets/Creator.h, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/EntityProperties.cpp, rulesets/Entity_getLocation.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/Missile.h, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Operation.h, rulesets/Py_Thing.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.h, rulesets/Python_API.cpp,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/EntityFactory.cpp, server/EntityFactory.h, server/Lobby.cpp,
server/Lobby.h, server/Persistance.cpp, server/Persistance.h,
server/Persistor.cpp, server/Player.cpp, server/Player.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h, tests/Areatest.cpp,
tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/IGEntityExerciser.h, tests/Linetest.cpp, tests/Planttest.cpp,
tests/Stackabletest.cpp, tests/Structuretest.cpp, tests/Thingtest.cpp,
tests/Worldtest.cpp, tests/allOperations.h, tests/inheritancetest.cpp,
tests/utilitytest.cpp, tools/cycmd.cpp:
Modify the entity interface so that all Operation methods
take references to RootOperation, as its cleaner, and requires
less nasty casts. Clean up operations in headers generally.
2004-12-03 14:49:13 +00:00
|
|
|
using Atlas::Objects::Operation::Set;
|
|
|
|
|
using Atlas::Objects::Operation::Sight;
|
|
|
|
|
using Atlas::Objects::Operation::Delete;
|
2006-01-20 02:11:40 +00:00
|
|
|
using Atlas::Objects::Operation::Drop;
|
2012-06-29 14:53:15 -07:00
|
|
|
using Atlas::Objects::Operation::Info;
|
2006-05-31 17:43:39 +00:00
|
|
|
using Atlas::Objects::Operation::Move;
|
2004-12-03 Al Riddoch <alriddoch@zepler.org>
* 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/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.h, common/custom.cpp,
common/inheritance.cpp, common/inheritance.h,
common/inheritance_impl.h, common/op_switch.h, common/type_utils.h,
common/types.h, common/utility.cpp, common/utility.h,
modules/Location.cpp, rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Creator.cpp,
rulesets/Creator.h, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/EntityProperties.cpp, rulesets/Entity_getLocation.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/Missile.h, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Operation.h, rulesets/Py_Thing.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.h, rulesets/Python_API.cpp,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/EntityFactory.cpp, server/EntityFactory.h, server/Lobby.cpp,
server/Lobby.h, server/Persistance.cpp, server/Persistance.h,
server/Persistor.cpp, server/Player.cpp, server/Player.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h, tests/Areatest.cpp,
tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/IGEntityExerciser.h, tests/Linetest.cpp, tests/Planttest.cpp,
tests/Stackabletest.cpp, tests/Structuretest.cpp, tests/Thingtest.cpp,
tests/Worldtest.cpp, tests/allOperations.h, tests/inheritancetest.cpp,
tests/utilitytest.cpp, tools/cycmd.cpp:
Modify the entity interface so that all Operation methods
take references to RootOperation, as its cleaner, and requires
less nasty casts. Clean up operations in headers generally.
2004-12-03 14:49:13 +00:00
|
|
|
using Atlas::Objects::Operation::Nourish;
|
2006-01-20 02:11:40 +00:00
|
|
|
using Atlas::Objects::Operation::Pickup;
|
2004-12-03 Al Riddoch <alriddoch@zepler.org>
* 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/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.h, common/custom.cpp,
common/inheritance.cpp, common/inheritance.h,
common/inheritance_impl.h, common/op_switch.h, common/type_utils.h,
common/types.h, common/utility.cpp, common/utility.h,
modules/Location.cpp, rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Creator.cpp,
rulesets/Creator.h, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/EntityProperties.cpp, rulesets/Entity_getLocation.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/Missile.h, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Operation.h, rulesets/Py_Thing.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.h, rulesets/Python_API.cpp,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/EntityFactory.cpp, server/EntityFactory.h, server/Lobby.cpp,
server/Lobby.h, server/Persistance.cpp, server/Persistance.h,
server/Persistor.cpp, server/Player.cpp, server/Player.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h, tests/Areatest.cpp,
tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/IGEntityExerciser.h, tests/Linetest.cpp, tests/Planttest.cpp,
tests/Stackabletest.cpp, tests/Structuretest.cpp, tests/Thingtest.cpp,
tests/Worldtest.cpp, tests/allOperations.h, tests/inheritancetest.cpp,
tests/utilitytest.cpp, tools/cycmd.cpp:
Modify the entity interface so that all Operation methods
take references to RootOperation, as its cleaner, and requires
less nasty casts. Clean up operations in headers generally.
2004-12-03 14:49:13 +00:00
|
|
|
using Atlas::Objects::Operation::Appearance;
|
|
|
|
|
using Atlas::Objects::Operation::Disappearance;
|
2006-05-31 17:43:39 +00:00
|
|
|
using Atlas::Objects::Operation::Update;
|
2006-02-05 01:39:46 +00:00
|
|
|
using Atlas::Objects::Operation::Wield;
|
2015-04-15 23:06:33 +02:00
|
|
|
using Atlas::Objects::Operation::Unseen;
|
2005-08-27 14:52:12 +00:00
|
|
|
using Atlas::Objects::Entity::Anonymous;
|
|
|
|
|
using Atlas::Objects::Entity::RootEntity;
|
2004-12-03 Al Riddoch <alriddoch@zepler.org>
* 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/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.h, common/custom.cpp,
common/inheritance.cpp, common/inheritance.h,
common/inheritance_impl.h, common/op_switch.h, common/type_utils.h,
common/types.h, common/utility.cpp, common/utility.h,
modules/Location.cpp, rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Creator.cpp,
rulesets/Creator.h, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/EntityProperties.cpp, rulesets/Entity_getLocation.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/Missile.h, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Operation.h, rulesets/Py_Thing.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.h, rulesets/Python_API.cpp,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/EntityFactory.cpp, server/EntityFactory.h, server/Lobby.cpp,
server/Lobby.h, server/Persistance.cpp, server/Persistance.h,
server/Persistor.cpp, server/Player.cpp, server/Player.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h, tests/Areatest.cpp,
tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/IGEntityExerciser.h, tests/Linetest.cpp, tests/Planttest.cpp,
tests/Stackabletest.cpp, tests/Structuretest.cpp, tests/Thingtest.cpp,
tests/Worldtest.cpp, tests/allOperations.h, tests/inheritancetest.cpp,
tests/utilitytest.cpp, tools/cycmd.cpp:
Modify the entity interface so that all Operation methods
take references to RootOperation, as its cleaner, and requires
less nasty casts. Clean up operations in headers generally.
2004-12-03 14:49:13 +00:00
|
|
|
|
2006-06-03 11:17:10 +00:00
|
|
|
static const bool debug_flag = false;
|
2000-08-21 11:31:18 +00:00
|
|
|
|
2013-11-24 00:59:35 +01:00
|
|
|
/// \brief Constructor for physical or tangible entities.
|
2008-01-26 Al Riddoch <alriddoch@googlemail.com>
* common/BaseEntity.cpp, common/BaseEntity.h: Remove the code that
handle ID, and just inherit from Identified.
* client/CharacterClient.cpp, client/CreatorClient.cpp,
common/OOGThing.cpp, rulesets/BaseMind.cpp, rulesets/Character.cpp,
rulesets/Creator.cpp, rulesets/Entity.cpp,
rulesets/LocatedEntity.cpp, rulesets/MemEntity.cpp,
rulesets/Plant.cpp, rulesets/Stackable.cpp, rulesets/Structure.cpp,
rulesets/Thing.cpp, rulesets/World.cpp, server/Account.cpp,
server/Admin.cpp, server/ExternalMind.cpp, server/Lobby.cpp,
server/Peer.cpp, server/Player.cpp, server/ServerRouting.cpp,
server/SlaveClientConnection.cpp: Add calls to the virtually
inherited Identified constructor as required.
2008-01-26 17:43:20 +00:00
|
|
|
Thing::Thing(const std::string & id, long intId) :
|
2012-12-04 23:48:40 +00:00
|
|
|
Entity(id, intId)
|
2000-08-21 11:31:18 +00:00
|
|
|
{
|
2000-10-24 12:50:22 +00:00
|
|
|
}
|
|
|
|
|
|
2005-05-17 18:00:50 +00:00
|
|
|
Thing::~Thing()
|
|
|
|
|
{
|
|
|
|
|
}
|
2001-04-05 18:01:12 +00:00
|
|
|
|
2004-12-06 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h, client/CreatorClient.cpp,
client/CreatorClient.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/BaseWorld.h, common/OOGThing.cpp, common/OOGThing.h,
common/op_switch.h, common/refno.h, common/types.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, rulesets/Character.cpp,
rulesets/Character.h, rulesets/Creator.cpp, rulesets/Creator.h,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Food.h, rulesets/MemMap.cpp, rulesets/Plant.cpp,
rulesets/Plant.h, rulesets/Py_Map.cpp, rulesets/PythonMindScript.cpp,
rulesets/PythonThingScript.cpp, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h, server/Account.cpp,
server/Account.h, server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/Connection_methods.h, server/ExternalMind.cpp,
server/ExternalMind.h, server/Lobby.cpp, server/Lobby.h,
server/Player.cpp, server/Player.h, server/WorldRouter.cpp,
server/WorldRouter.h, tests/Creatortest.cpp, tests/Worldtest.cpp:
Add a new Operation typedef to clean up headers, and get round
limitation in doxygen.
2004-12-06 16:35:44 +00:00
|
|
|
void Thing::DeleteOperation(const Operation & op, OpVector & res)
|
2000-08-21 11:31:18 +00:00
|
|
|
{
|
2007-07-06 14:58:28 +00:00
|
|
|
if (m_location.m_loc == 0) {
|
2007-07-29 Al Riddoch <alriddoch@zepler.org>
* common/log.cpp, common/log.h: Switch to taking a C++ string reference
rather than a char *, as it is not really an optimisation, and it
makes the code simpler to read and write.
* client/BaseClient.cpp, client/ClientConnection.cpp,
common/AtlasFileLoader.cpp, common/BaseEntity.cpp,
common/Database.cpp, common/globals.cpp, common/id.cpp,
common/inheritance.cpp, common/log.cpp, common/log.h,
rulesets/Character.cpp, rulesets/Creator.cpp, rulesets/Entity.cpp,
rulesets/MemMap.cpp, rulesets/Motion.cpp, rulesets/Pedestrian.cpp,
rulesets/Py_Object.cpp, rulesets/Py_RootEntity.cpp,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Python_API.cpp, rulesets/Thing.cpp, server/Account.cpp,
server/Admin.cpp, server/ArithmeticFactory.cpp,
server/CommClient.cpp, server/CommListener.cpp,
server/CommMDNSPublisher.cpp, server/CommServer.cpp,
server/Connection.cpp, server/EntityFactory.cpp,
server/Persistance.cpp, server/Restoration.cpp,
server/ScriptFactory.cpp, server/TaskFactory.cpp,
server/WorldRouter.cpp, server/server.cpp: Convert over to using
new API correctly.
* data/mason.xml: Add biomass and transient to fircone, making its
script obsolete:
2007-07-29 03:33:33 +00:00
|
|
|
log(ERROR, String::compose("Deleting %1(%2) when it is not "
|
|
|
|
|
"in the world.", getType(), getId()));
|
2007-07-06 15:09:39 +00:00
|
|
|
assert(m_location.m_loc != 0);
|
2007-07-06 14:58:28 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2001-05-14 17:25:32 +00:00
|
|
|
// The actual destruction and removal of this entity will be handled
|
|
|
|
|
// by the WorldRouter
|
2013-08-05 11:21:39 +02:00
|
|
|
|
2013-11-24 00:59:35 +01:00
|
|
|
if (isPerceptive()) {
|
|
|
|
|
//We need to send a sight operation directly to the entity.
|
|
|
|
|
//The reason is that else the entity will be deleted before it can receive the broadcast Sight
|
|
|
|
|
//of the Delete op, which will leave any external clients hanging.
|
|
|
|
|
Sight sToEntity;
|
|
|
|
|
sToEntity->setArgs1(op);
|
|
|
|
|
sToEntity->setTo(getId());
|
|
|
|
|
operation(sToEntity, res);
|
|
|
|
|
}
|
2013-08-05 11:21:39 +02:00
|
|
|
|
2005-08-29 02:28:53 +00:00
|
|
|
Sight s;
|
2005-08-27 14:52:12 +00:00
|
|
|
s->setArgs1(op);
|
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-03 00:33:19 +00:00
|
|
|
res.push_back(s);
|
2013-11-24 00:59:35 +01:00
|
|
|
|
2013-11-15 22:55:17 +01:00
|
|
|
Entity::DeleteOperation(op, res);
|
2000-08-21 11:31:18 +00:00
|
|
|
}
|
|
|
|
|
|
2004-12-06 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h, client/CreatorClient.cpp,
client/CreatorClient.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/BaseWorld.h, common/OOGThing.cpp, common/OOGThing.h,
common/op_switch.h, common/refno.h, common/types.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, rulesets/Character.cpp,
rulesets/Character.h, rulesets/Creator.cpp, rulesets/Creator.h,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Food.h, rulesets/MemMap.cpp, rulesets/Plant.cpp,
rulesets/Plant.h, rulesets/Py_Map.cpp, rulesets/PythonMindScript.cpp,
rulesets/PythonThingScript.cpp, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h, server/Account.cpp,
server/Account.h, server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/Connection_methods.h, server/ExternalMind.cpp,
server/ExternalMind.h, server/Lobby.cpp, server/Lobby.h,
server/Player.cpp, server/Player.h, server/WorldRouter.cpp,
server/WorldRouter.h, tests/Creatortest.cpp, tests/Worldtest.cpp:
Add a new Operation typedef to clean up headers, and get round
limitation in doxygen.
2004-12-06 16:35:44 +00:00
|
|
|
void Thing::MoveOperation(const Operation & op, OpVector & res)
|
2000-08-21 11:31:18 +00:00
|
|
|
{
|
2001-08-14 17:52:50 +00:00
|
|
|
debug( std::cout << "Thing::move_operation" << std::endl << std::flush;);
|
2006-05-31 16:31:52 +00:00
|
|
|
|
2007-07-06 15:09:39 +00:00
|
|
|
if (m_location.m_loc == 0) {
|
2007-07-29 Al Riddoch <alriddoch@zepler.org>
* common/log.cpp, common/log.h: Switch to taking a C++ string reference
rather than a char *, as it is not really an optimisation, and it
makes the code simpler to read and write.
* client/BaseClient.cpp, client/ClientConnection.cpp,
common/AtlasFileLoader.cpp, common/BaseEntity.cpp,
common/Database.cpp, common/globals.cpp, common/id.cpp,
common/inheritance.cpp, common/log.cpp, common/log.h,
rulesets/Character.cpp, rulesets/Creator.cpp, rulesets/Entity.cpp,
rulesets/MemMap.cpp, rulesets/Motion.cpp, rulesets/Pedestrian.cpp,
rulesets/Py_Object.cpp, rulesets/Py_RootEntity.cpp,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Python_API.cpp, rulesets/Thing.cpp, server/Account.cpp,
server/Admin.cpp, server/ArithmeticFactory.cpp,
server/CommClient.cpp, server/CommListener.cpp,
server/CommMDNSPublisher.cpp, server/CommServer.cpp,
server/Connection.cpp, server/EntityFactory.cpp,
server/Persistance.cpp, server/Restoration.cpp,
server/ScriptFactory.cpp, server/TaskFactory.cpp,
server/WorldRouter.cpp, server/server.cpp: Convert over to using
new API correctly.
* data/mason.xml: Add biomass and transient to fircone, making its
script obsolete:
2007-07-29 03:33:33 +00:00
|
|
|
log(ERROR, String::compose("Moving %1(%2) when it is not in the world.",
|
|
|
|
|
getType(), getId()));
|
2007-07-06 15:09:39 +00:00
|
|
|
assert(m_location.m_loc != 0);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-31 16:31:52 +00:00
|
|
|
// Check the validity of the operation.
|
2005-08-27 14:52:12 +00:00
|
|
|
const std::vector<Root> & args = op->getArgs();
|
2002-03-06 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, server/WorldRouter.cpp, server/EntityFactory.cpp,
server/Connection.cpp, server/Admin.cpp, server/Account.cpp,
rulesets/World.cpp, rulesets/Thing.cpp, rulesets/Py_Operation.cpp,
rulesets/MemMap_methods.h, rulesets/MemMap.cpp, rulesets/Entity.cpp,
rulesets/Character.cpp, rulesets/BaseMind.cpp:
Use empty() instead of size() == 0 for STL sequence types.
* rulesets/ThingFactory.h, server/EntityFactory.cpp: Modified the
way adding classes to the inheritance tree is handled, so types
no longer have to inherit directly from a C++ class.
* server/WorldRouter.cpp: Modified the way broadcast operations are
handled to make them more efficient, and catch NULL pointers in
the world dictionary.
2002-03-06 00:23:28 +00:00
|
|
|
if (args.empty()) {
|
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-03 00:33:19 +00:00
|
|
|
error(op, "Move has no argument", res, getId());
|
|
|
|
|
return;
|
2004-05-12 23:45:02 +00:00
|
|
|
}
|
2005-08-29 00:44:56 +00:00
|
|
|
RootEntity ent = smart_dynamic_cast<RootEntity>(args.front());
|
2005-08-29 03:34:24 +00:00
|
|
|
if (!ent.isValid()) {
|
|
|
|
|
error(op, "Move op arg is malformed", res, getId());
|
|
|
|
|
return;
|
|
|
|
|
}
|
2005-08-27 14:52:12 +00:00
|
|
|
if (getId() != ent->getId()) {
|
|
|
|
|
error(op, "Move op does not have correct id in argument", res, getId());
|
2005-08-29 03:34:24 +00:00
|
|
|
return;
|
2004-11-14 02:43:29 +00:00
|
|
|
}
|
2005-11-02 02:06:38 +00:00
|
|
|
|
2005-08-29 00:44:56 +00:00
|
|
|
if (!ent->hasAttrFlag(Atlas::Objects::Entity::LOC_FLAG)) {
|
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-03 00:33:19 +00:00
|
|
|
error(op, "Move op has no loc", res, getId());
|
|
|
|
|
return;
|
2004-05-12 23:45:02 +00:00
|
|
|
}
|
2005-08-29 00:44:56 +00:00
|
|
|
const std::string & new_loc_id = ent->getLoc();
|
2013-01-17 10:17:07 +00:00
|
|
|
LocatedEntity * new_loc = 0;
|
2005-11-02 02:06:38 +00:00
|
|
|
if (new_loc_id != m_location.m_loc->getId()) {
|
|
|
|
|
// If the LOC has not changed, we don't need to look it up, or do
|
|
|
|
|
// any of the following checks.
|
2007-01-01 17:57:06 +00:00
|
|
|
new_loc = BaseWorld::instance().getEntity(new_loc_id);
|
2005-11-11 Al Riddoch <alriddoch@zepler.org>
* common/types.h, server/Persistance.h, common/BaseWorld.h,
common/BaseWorld.cpp, server/WorldRouter.cpp:
Switch core world map to reference by integer ID rather than string.
Add version of getEntity() which converts from string to integer
automatically.
* rulesets/Character.cpp, rulesets/Thing.cpp, rulesets/World.cpp,
server/EntityFactory.cpp,
Use getEntity() when looking up an entity, so that conversion of
ID from string to integer is automatic.
* rulesets/BaseMind.cpp, rulesets/MemMap.cpp, rulesets/MemMap.h:
Switch to using integer IDs in MemMap's core mapping.
* server/Account.cpp, server/Account.h: Switch a few function
parameters to use integer ID values, making the code cleaner.
* server/Account.cpp, server/Admin.cpp, server/Persistance.cpp:
Handle string ID to integer conversions as required.
2005-11-11 02:04:56 +00:00
|
|
|
if (new_loc == 0) {
|
2005-11-02 02:06:38 +00:00
|
|
|
error(op, "Move op loc does not exist", res, getId());
|
2005-04-24 22:57:09 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2005-11-02 02:06:38 +00:00
|
|
|
debug(std::cout << "LOC: " << new_loc_id << std::endl << std::flush;);
|
2007-12-02 Al Riddoch <alriddoch@zepler.org>
* client/CreatorClient.cpp, client/CreatorClient.h,
client/Py_CreatorClient.cpp, common/BaseWorld.h, common/types.h,
modules/Location.cpp, modules/Location.h,
rulesets/AtlasProperties.cpp, rulesets/AtlasProperties.h,
rulesets/BaseMind.cpp, rulesets/Character.cpp, rulesets/Character.h,
rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/EntityProperties.cpp, rulesets/LocatedEntity.cpp,
rulesets/LocatedEntity.h, rulesets/MemEntity.cpp,
rulesets/MemEntity.h, rulesets/MemMap.cpp, rulesets/Motion.cpp,
rulesets/Motion.h, rulesets/Py_Location.h, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Py_Thing.h,
rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.cpp, rulesets/PythonThingScript.h,
rulesets/Python_API.cpp, rulesets/Script.cpp, rulesets/Script.h,
rulesets/Thing.cpp, rulesets/World.cpp, server/WorldRouter.cpp,
server/WorldRouter.h: Refactor all the entity code so there is now
a new base class for entities in the world simulation, and in the
mind which only contains things which are trully common to both.
This moves a lot of functionality which should not have been
present in mind entities away, and makes that code safer and more
efficient.
* tests/TestWorld.h: Update the test world API to match the base
class.
2007-12-02 23:49:05 +00:00
|
|
|
LocatedEntity * test_loc = new_loc;
|
2005-11-02 02:06:38 +00:00
|
|
|
for (; test_loc != 0; test_loc = test_loc->m_location.m_loc) {
|
|
|
|
|
if (test_loc == this) {
|
|
|
|
|
error(op, "Attempt to move into itself", res, getId());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-05-31 16:31:52 +00:00
|
|
|
assert(new_loc != 0);
|
|
|
|
|
assert(m_location.m_loc != new_loc);
|
2004-05-12 23:45:02 +00:00
|
|
|
}
|
2005-11-02 02:06:38 +00:00
|
|
|
|
2005-08-29 00:44:56 +00:00
|
|
|
if (!ent->hasAttrFlag(Atlas::Objects::Entity::POS_FLAG)) {
|
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-03 00:33:19 +00:00
|
|
|
error(op, "Move op has no pos", res, getId());
|
|
|
|
|
return;
|
2000-08-30 17:49:11 +00:00
|
|
|
}
|
2002-12-01 22:54:12 +00:00
|
|
|
|
2004-05-12 23:45:02 +00:00
|
|
|
// Up until this point nothing should have changed, but the changes
|
|
|
|
|
// have all now been checked for validity.
|
2001-04-16 16:26:44 +00:00
|
|
|
|
2014-09-18 22:41:23 +02:00
|
|
|
const Location old_loc = m_location;
|
|
|
|
|
|
2006-02-05 01:39:46 +00:00
|
|
|
// Check if the location has changed
|
2006-02-21 01:41:59 +00:00
|
|
|
if (new_loc != 0) {
|
|
|
|
|
// new_loc should only be non-null if the LOC specified is
|
|
|
|
|
// different from the current LOC
|
|
|
|
|
assert(m_location.m_loc != new_loc);
|
2006-02-05 01:39:46 +00:00
|
|
|
// Check for pickup, ie if the new LOC is the actor, and the
|
|
|
|
|
// previous LOC is the actor's LOC.
|
2006-01-20 01:26:03 +00:00
|
|
|
if (new_loc->getId() == op->getFrom() &&
|
|
|
|
|
m_location.m_loc == new_loc->m_location.m_loc) {
|
2006-01-20 02:11:40 +00:00
|
|
|
|
|
|
|
|
Pickup p;
|
2006-01-24 18:55:01 +00:00
|
|
|
p->setFrom(op->getFrom());
|
|
|
|
|
p->setTo(getId());
|
2006-01-20 02:11:40 +00:00
|
|
|
Sight s;
|
|
|
|
|
s->setArgs1(p);
|
|
|
|
|
res.push_back(s);
|
2006-02-05 01:39:46 +00:00
|
|
|
|
|
|
|
|
Anonymous wield_arg;
|
|
|
|
|
wield_arg->setId(getId());
|
|
|
|
|
Wield w;
|
|
|
|
|
w->setTo(op->getFrom());
|
|
|
|
|
w->setArgs1(wield_arg);
|
|
|
|
|
res.push_back(w);
|
2006-01-20 01:26:03 +00:00
|
|
|
}
|
2006-02-05 01:39:46 +00:00
|
|
|
// Check for drop, ie if the old LOC is the actor, and the
|
|
|
|
|
// new LOC is the actor's LOC.
|
2006-01-20 01:26:03 +00:00
|
|
|
if (m_location.m_loc->getId() == op->getFrom() &&
|
|
|
|
|
new_loc == m_location.m_loc->m_location.m_loc) {
|
2006-01-20 02:11:40 +00:00
|
|
|
|
|
|
|
|
Drop d;
|
2006-01-24 18:55:01 +00:00
|
|
|
d->setFrom(op->getFrom());
|
|
|
|
|
d->setTo(getId());
|
2006-01-20 02:11:40 +00:00
|
|
|
Sight s;
|
|
|
|
|
s->setArgs1(d);
|
|
|
|
|
res.push_back(s);
|
2006-01-20 01:26:03 +00:00
|
|
|
}
|
2006-06-05 22:52:54 +00:00
|
|
|
|
2005-01-16 14:44:23 +00:00
|
|
|
// Update loc
|
2006-06-05 23:18:55 +00:00
|
|
|
changeContainer(new_loc);
|
2004-05-12 23:45:02 +00:00
|
|
|
}
|
2000-08-30 17:49:11 +00:00
|
|
|
|
2005-06-03 14:56:17 +00:00
|
|
|
std::string mode;
|
|
|
|
|
|
2006-07-03 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, rulesets/Character.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Thing.cpp, server/WorldRouter.cpp:
Rename Entity members get(), set() and has() to getAttr(), setAttr()
and hasAttr().
2006-07-03 01:41:29 +00:00
|
|
|
if (hasAttr("mode")) {
|
2005-06-03 14:56:17 +00:00
|
|
|
Element mode_attr;
|
2006-07-03 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, rulesets/Character.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Thing.cpp, server/WorldRouter.cpp:
Rename Entity members get(), set() and has() to getAttr(), setAttr()
and hasAttr().
2006-07-03 01:41:29 +00:00
|
|
|
getAttr("mode", mode_attr);
|
2005-06-03 14:56:17 +00:00
|
|
|
if (mode_attr.isString()) {
|
2005-08-30 Al Riddoch <alriddoch@zepler.org>
* common/AtlasFileLoader.cpp, common/Database.cpp,
common/FormattedXMLWriter.cpp, common/Property.cpp,
common/accountbase.cpp, rulesets/Character.cpp,
rulesets/Entity_getLocation.h, rulesets/MemMap.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp,
rulesets/Py_Object.cpp, rulesets/Thing.cpp,
server/Admin.cpp, server/Connection.cpp, server/EntityFactory.cpp,
server/WorldRouter.cpp, tools/AdminClient.cpp, tools/cycmd.cpp,
tools/cyconvertrules.cpp: After an Element has been checked
with isFoo(), it is more efficient to get its value using Foo()
rather than asFoo() which repeats the check.
2005-08-30 20:43:19 +00:00
|
|
|
mode = mode_attr.String();
|
2005-06-03 14:56:17 +00:00
|
|
|
} else {
|
2007-07-29 Al Riddoch <alriddoch@zepler.org>
* common/log.cpp, common/log.h: Switch to taking a C++ string reference
rather than a char *, as it is not really an optimisation, and it
makes the code simpler to read and write.
* client/BaseClient.cpp, client/ClientConnection.cpp,
common/AtlasFileLoader.cpp, common/BaseEntity.cpp,
common/Database.cpp, common/globals.cpp, common/id.cpp,
common/inheritance.cpp, common/log.cpp, common/log.h,
rulesets/Character.cpp, rulesets/Creator.cpp, rulesets/Entity.cpp,
rulesets/MemMap.cpp, rulesets/Motion.cpp, rulesets/Pedestrian.cpp,
rulesets/Py_Object.cpp, rulesets/Py_RootEntity.cpp,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Python_API.cpp, rulesets/Thing.cpp, server/Account.cpp,
server/Admin.cpp, server/ArithmeticFactory.cpp,
server/CommClient.cpp, server/CommListener.cpp,
server/CommMDNSPublisher.cpp, server/CommServer.cpp,
server/Connection.cpp, server/EntityFactory.cpp,
server/Persistance.cpp, server/Restoration.cpp,
server/ScriptFactory.cpp, server/TaskFactory.cpp,
server/WorldRouter.cpp, server/server.cpp: Convert over to using
new API correctly.
* data/mason.xml: Add biomass and transient to fircone, making its
script obsolete:
2007-07-29 03:33:33 +00:00
|
|
|
log(ERROR, String::compose("Mode on entity is a \"%1\" in "
|
|
|
|
|
"Thing::MoveOperation",
|
|
|
|
|
Element::typeName(mode_attr.getType())));
|
2005-06-03 14:56:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Move ops often include a mode change, so we handle it here, even
|
|
|
|
|
// though it is not a special attribute for efficiency. Otherwise
|
|
|
|
|
// an additional Set op would be required.
|
2005-08-27 14:52:12 +00:00
|
|
|
Element attr_mode;
|
2005-08-30 23:53:34 +00:00
|
|
|
if (ent->copyAttr("mode", attr_mode) == 0) {
|
2005-08-27 14:52:12 +00:00
|
|
|
if (!attr_mode.isString()) {
|
2005-06-03 14:56:17 +00:00
|
|
|
log(ERROR, "Non string mode set in Thing::MoveOperation");
|
|
|
|
|
} else {
|
2005-07-02 12:06:23 +00:00
|
|
|
// Update the mode
|
2006-07-03 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, rulesets/Character.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Thing.cpp, server/WorldRouter.cpp:
Rename Entity members get(), set() and has() to getAttr(), setAttr()
and hasAttr().
2006-07-03 01:41:29 +00:00
|
|
|
setAttr("mode", attr_mode);
|
2014-09-30 23:15:02 +02:00
|
|
|
if (m_motion) {
|
|
|
|
|
m_motion->setMode(attr_mode.String());
|
|
|
|
|
}
|
2005-08-30 Al Riddoch <alriddoch@zepler.org>
* common/AtlasFileLoader.cpp, common/Database.cpp,
common/FormattedXMLWriter.cpp, common/Property.cpp,
common/accountbase.cpp, rulesets/Character.cpp,
rulesets/Entity_getLocation.h, rulesets/MemMap.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp,
rulesets/Py_Object.cpp, rulesets/Thing.cpp,
server/Admin.cpp, server/Connection.cpp, server/EntityFactory.cpp,
server/WorldRouter.cpp, tools/AdminClient.cpp, tools/cycmd.cpp,
tools/cyconvertrules.cpp: After an Element has been checked
with isFoo(), it is more efficient to get its value using Foo()
rather than asFoo() which repeats the check.
2005-08-30 20:43:19 +00:00
|
|
|
mode = attr_mode.String();
|
2005-06-03 14:56:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-01 17:57:06 +00:00
|
|
|
const double & current_time = BaseWorld::instance().getTime();
|
2006-06-01 01:26:17 +00:00
|
|
|
|
2016-01-20 11:08:35 +01:00
|
|
|
auto transformsProp = requirePropertyClassFixed<TransformsProperty>();
|
|
|
|
|
|
2004-05-12 23:45:02 +00:00
|
|
|
// Update pos
|
2016-01-17 17:02:50 +01:00
|
|
|
const auto& posVector = ent->getPos();
|
2016-01-20 11:08:35 +01:00
|
|
|
if (posVector.size() == 3) {
|
|
|
|
|
Vector3D translate;
|
|
|
|
|
translate.fromAtlas(ent->getPosAsList());
|
|
|
|
|
//Adjust the supplied position by the inverse of all external transformation.
|
|
|
|
|
//This is to offset the fact that any client will send an update for position using
|
|
|
|
|
//the position of the entity as it sees it.
|
|
|
|
|
//TODO: is this really the best way? Should we allow for clients to specify if they want to set
|
|
|
|
|
//the position independent of any transformations? Perhaps this is doable if the client
|
|
|
|
|
//instead sends an update for the "transforms" property?
|
|
|
|
|
for (auto entry : transformsProp->external()) {
|
|
|
|
|
if (entry.second.translate.isValid()) {
|
|
|
|
|
translate -= entry.second.translate;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (m_location.bBox().isValid()) {
|
|
|
|
|
for (auto entry : transformsProp->external()) {
|
|
|
|
|
if (entry.second.translateScaled.isValid()) {
|
|
|
|
|
auto size = m_location.bBox().highCorner() - m_location.bBox().lowCorner();
|
|
|
|
|
translate -= WFMath::Vector<3>(
|
|
|
|
|
entry.second.translateScaled.x() * size.x(),
|
|
|
|
|
entry.second.translateScaled.y() * size.y(),
|
|
|
|
|
entry.second.translateScaled.z() * size.z());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
transformsProp->getTranslate() = translate;
|
|
|
|
|
transformsProp->apply(this);
|
2016-01-17 17:02:50 +01:00
|
|
|
}
|
2014-09-18 11:06:05 +02:00
|
|
|
|
|
|
|
|
//We can only move if there's a domain
|
2014-09-13 10:34:30 +02:00
|
|
|
auto domain = getMovementDomain();
|
2014-09-22 20:14:41 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
//Check if we've moved between domains. First check if the location has changed, and if so
|
|
|
|
|
//check if the domain also has changed.
|
|
|
|
|
if (new_loc != 0) {
|
|
|
|
|
if (old_loc.m_loc != m_location.m_loc && old_loc.m_loc) {
|
|
|
|
|
auto domain_old = old_loc.m_loc->getMovementDomain();
|
|
|
|
|
if (domain_old && domain_old != domain) {
|
|
|
|
|
//Everything that saw us at the old domain should get a disappear op.
|
|
|
|
|
//We shouldn't need to send disappear ops to ourselves though, since the top
|
|
|
|
|
//level entity will have changed.
|
|
|
|
|
//TODO: We can't use a broadcast op here, since the broadcast will look at the
|
|
|
|
|
//location of the entity when it's processed, not when it's created. We should
|
|
|
|
|
//alter this so that any op that's to be broadcast instead should include
|
|
|
|
|
//the location data in the op itself.
|
|
|
|
|
domain_old->processDisappearanceOfEntity(*this, old_loc, res);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-13 10:34:30 +02:00
|
|
|
if (domain) {
|
2014-09-18 11:06:05 +02:00
|
|
|
// FIXME Quick height hack
|
2016-01-17 17:02:50 +01:00
|
|
|
float height = domain->constrainHeight(*this, m_location.m_loc, m_location.pos(), mode);
|
|
|
|
|
//Translate height in relation to the standard translation as set in "transforms".
|
2016-01-18 14:59:12 +01:00
|
|
|
transformsProp->getTranslate().z() = height;
|
2015-07-09 23:04:43 +02:00
|
|
|
|
2016-01-17 17:02:50 +01:00
|
|
|
Element attr_orientation;
|
|
|
|
|
if (ent->copyAttr("orientation", attr_orientation) == 0) {
|
|
|
|
|
// Update orientation
|
2016-01-20 11:08:35 +01:00
|
|
|
Quaternion rotate;
|
|
|
|
|
rotate.fromAtlas(attr_orientation.asList());
|
|
|
|
|
|
|
|
|
|
//Adjust the supplied orientation by the inverse of all external transformation.
|
|
|
|
|
//This is to offset the fact that any client will send an update for orientation using
|
|
|
|
|
//the orientation of the entity as it sees it.
|
|
|
|
|
//TODO: is this really the best way? Should we allow for clients to specify if they want to set
|
|
|
|
|
//the position independent of any transformations? Perhaps this is doable if the client
|
|
|
|
|
//instead sends an update for the "transforms" property?
|
|
|
|
|
for (auto entry : transformsProp->external()) {
|
|
|
|
|
if (entry.second.rotate.isValid()) {
|
|
|
|
|
|
|
|
|
|
Quaternion localRotation(entry.second.rotate.inverse());
|
|
|
|
|
//normalize to avoid drift
|
|
|
|
|
localRotation.normalize();
|
|
|
|
|
rotate = localRotation * rotate;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
transformsProp->getRotate() = rotate;
|
|
|
|
|
|
2016-01-17 17:02:50 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
transformsProp->apply(this);
|
2005-08-27 14:52:12 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
if (ent->hasAttrFlag(Atlas::Objects::Entity::VELOCITY_FLAG)) {
|
|
|
|
|
// Update velocity
|
2016-01-21 09:26:43 +01:00
|
|
|
auto propelProp = requirePropertyClassFixed<PropelProperty>();
|
|
|
|
|
fromStdVector(propelProp->mData, ent->getVelocity());
|
2014-09-18 11:06:05 +02:00
|
|
|
// Velocity is not persistent so has no flag
|
|
|
|
|
}
|
2005-08-27 14:52:12 +00:00
|
|
|
|
2016-01-17 17:02:50 +01:00
|
|
|
|
|
|
|
|
m_location.update(current_time);
|
|
|
|
|
m_flags &= ~(entity_clean);
|
2004-05-12 23:45:02 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
// At this point the Location data for this entity has been updated.
|
2005-04-03 16:36:13 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
bool moving = false;
|
2006-06-01 15:23:33 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
if (m_location.velocity().isValid() &&
|
|
|
|
|
m_location.velocity().sqrMag() > WFMath::numeric_constants<WFMath::CoordType>::epsilon()) {
|
|
|
|
|
moving = true;
|
|
|
|
|
}
|
2006-06-01 15:23:33 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
// Take into account terrain following etc.
|
|
|
|
|
// Take into account mode also.
|
|
|
|
|
// m_motion->adjustNewPostion();
|
2005-04-03 16:36:13 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
float update_time = consts::move_tick;
|
2005-04-03 16:36:13 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
if (moving) {
|
|
|
|
|
//We've just started moving; create a motion instance.
|
|
|
|
|
if (!m_motion) {
|
2015-04-28 20:59:20 +02:00
|
|
|
m_motion = new Motion(*this);
|
2014-09-18 11:06:05 +02:00
|
|
|
}
|
2006-06-02 17:08:28 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
|
|
|
|
|
// If we are moving, check for collisions
|
2015-04-28 20:59:20 +02:00
|
|
|
update_time = m_motion->checkCollisions(*domain);
|
2014-09-18 11:06:05 +02:00
|
|
|
|
|
|
|
|
if (m_motion->collision()) {
|
|
|
|
|
if (update_time < WFMath::numeric_constants<WFMath::CoordType>::epsilon()) {
|
|
|
|
|
moving = m_motion->resolveCollision();
|
|
|
|
|
} else {
|
|
|
|
|
m_motion->m_collisionTime = current_time + update_time;
|
|
|
|
|
}
|
2006-06-02 17:08:28 +00:00
|
|
|
}
|
2006-06-01 01:26:17 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
// Serial number must be changed regardless of whether we will use it
|
|
|
|
|
++m_motion->serialno();
|
2004-06-25 10:08:57 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
// If we are moving, schedule an update to track the movement
|
|
|
|
|
debug(std::cout << "Move Update in " << update_time << std::endl << std::flush;);
|
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-03 00:33:19 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
Update u;
|
|
|
|
|
u->setFutureSeconds(update_time);
|
|
|
|
|
u->setTo(getId());
|
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-03 00:33:19 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
u->setRefno(m_motion->serialno());
|
2006-06-05 13:00:15 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
res.push_back(u);
|
2006-06-05 01:01:02 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
} else {
|
|
|
|
|
if (m_motion) {
|
|
|
|
|
//We moved previously, but have now stopped.
|
2005-02-17 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/types.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Thing.cpp,
rulesets/Thing.h: Add core op handling for update operation, used
to handle move ops better.
2005-02-17 01:47:32 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
delete m_motion;
|
|
|
|
|
m_motion = nullptr;
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-06-05 13:00:15 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
Operation m(op.copy());
|
|
|
|
|
RootEntity marg = smart_dynamic_cast<RootEntity>(m->getArgs().front());
|
|
|
|
|
assert(marg.isValid());
|
|
|
|
|
m_location.addToEntity(marg);
|
2005-02-17 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/types.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Thing.cpp,
rulesets/Thing.h: Add core op handling for update operation, used
to handle move ops better.
2005-02-17 01:47:32 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
Sight s;
|
|
|
|
|
s->setArgs1(m);
|
2006-09-17 22:43:29 +00:00
|
|
|
|
2014-09-18 11:06:05 +02:00
|
|
|
res.push_back(s);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// This code handles sending Appearance and Disappearance operations
|
|
|
|
|
// to this entity and others to indicate if one has gained or lost
|
|
|
|
|
// sight of the other because of this movement
|
|
|
|
|
|
|
|
|
|
// FIXME Why only for a perceptive moving entity? Surely other entities
|
|
|
|
|
// must gain/lose sight of this entity if it's moving?
|
|
|
|
|
if (isPerceptive()) {
|
|
|
|
|
checkVisibility(old_loc, res);
|
|
|
|
|
}
|
2006-05-30 00:57:27 +00:00
|
|
|
}
|
2006-07-23 00:43:11 +00:00
|
|
|
m_seq++;
|
2008-08-16 23:21:06 +00:00
|
|
|
|
|
|
|
|
onUpdated();
|
2006-05-30 00:57:27 +00:00
|
|
|
}
|
|
|
|
|
|
2006-12-10 17:53:52 +00:00
|
|
|
/// \brief Check changes in visibility of this entity
|
|
|
|
|
///
|
|
|
|
|
/// Check how this entity's position has changed since the last update
|
|
|
|
|
/// and how this has affected which entities it can see, and which can see
|
|
|
|
|
/// it. Return Appearance and Disappearance operations as required.
|
2007-07-29 21:23:40 +00:00
|
|
|
/// @param old_pos The coordinates of this entity before the update
|
2006-12-10 17:53:52 +00:00
|
|
|
/// @param res Resulting operations are returned here
|
2014-09-15 18:50:54 +02:00
|
|
|
void Thing::checkVisibility(const Location & old_loc, OpVector & res)
|
2006-05-30 00:57:27 +00:00
|
|
|
{
|
2014-09-15 18:50:54 +02:00
|
|
|
auto domain = getMovementDomain();
|
|
|
|
|
if (domain) {
|
|
|
|
|
domain->processVisibilityForMovedEntity(*this, old_loc, res);
|
2006-05-30 00:57:27 +00:00
|
|
|
}
|
2000-08-21 11:31:18 +00:00
|
|
|
}
|
|
|
|
|
|
2004-12-06 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h, client/CreatorClient.cpp,
client/CreatorClient.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/BaseWorld.h, common/OOGThing.cpp, common/OOGThing.h,
common/op_switch.h, common/refno.h, common/types.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, rulesets/Character.cpp,
rulesets/Character.h, rulesets/Creator.cpp, rulesets/Creator.h,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Food.h, rulesets/MemMap.cpp, rulesets/Plant.cpp,
rulesets/Plant.h, rulesets/Py_Map.cpp, rulesets/PythonMindScript.cpp,
rulesets/PythonThingScript.cpp, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h, server/Account.cpp,
server/Account.h, server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/Connection_methods.h, server/ExternalMind.cpp,
server/ExternalMind.h, server/Lobby.cpp, server/Lobby.h,
server/Player.cpp, server/Player.h, server/WorldRouter.cpp,
server/WorldRouter.h, tests/Creatortest.cpp, tests/Worldtest.cpp:
Add a new Operation typedef to clean up headers, and get round
limitation in doxygen.
2004-12-06 16:35:44 +00:00
|
|
|
void Thing::SetOperation(const Operation & op, OpVector & res)
|
2000-08-21 11:31:18 +00:00
|
|
|
{
|
2005-08-27 14:52:12 +00:00
|
|
|
const std::vector<Root> & args = op->getArgs();
|
|
|
|
|
if (args.empty()) {
|
|
|
|
|
error(op, "Set has no argument", res, getId());
|
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-03 00:33:19 +00:00
|
|
|
return;
|
2000-10-24 12:50:22 +00:00
|
|
|
}
|
2005-08-27 14:52:12 +00:00
|
|
|
const Root & ent = args.front();
|
|
|
|
|
merge(ent->asMessage());
|
|
|
|
|
Sight s;
|
|
|
|
|
s->setArgs1(op);
|
2004-11-02 18:15:22 +00:00
|
|
|
res.push_back(s);
|
2006-07-23 00:43:11 +00:00
|
|
|
m_seq++;
|
2008-09-03 10:17:50 +00:00
|
|
|
if (~m_flags & entity_clean) {
|
2008-08-16 23:21:06 +00:00
|
|
|
onUpdated();
|
2000-10-24 12:50:22 +00:00
|
|
|
}
|
2016-01-19 15:38:03 +01:00
|
|
|
|
|
|
|
|
//Send an update in case there are properties that were updated as a side effect of the merge
|
|
|
|
|
//TODO: only do this if there actually are changes
|
|
|
|
|
Update update;
|
|
|
|
|
update->setTo(getId());
|
|
|
|
|
res.push_back(update);
|
2000-08-21 11:31:18 +00:00
|
|
|
}
|
2005-02-17 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/types.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Thing.cpp,
rulesets/Thing.h: Add core op handling for update operation, used
to handle move ops better.
2005-02-17 01:47:32 +00:00
|
|
|
|
2006-12-29 01:00:07 +00:00
|
|
|
/// \brief Generate a Sight(Set) operation giving an update on named attributes
|
|
|
|
|
///
|
|
|
|
|
/// When another operation causes the properties of an entity to be changed,
|
|
|
|
|
/// it can trigger propagation of this change by sending an Update operation
|
|
|
|
|
/// nameing the attributes or properties that need to be updated. This
|
|
|
|
|
/// member function handles the Operation, sending a Sight(Set) for
|
|
|
|
|
/// any perceptible changes, and will in future handle persisting those
|
|
|
|
|
/// changes. Should this also handle side effects?
|
|
|
|
|
/// The main reason for this up is that if other ops need to generate a
|
|
|
|
|
/// Set op to update attributes, there are race conditions all over the
|
|
|
|
|
/// place.
|
|
|
|
|
/// @param op Update operation that notifies of the changes.
|
|
|
|
|
/// @param res The result of the operation is returned here.
|
2008-10-01 15:32:39 +00:00
|
|
|
void Thing::updateProperties(const Operation & op, OpVector & res)
|
2006-12-29 01:00:07 +00:00
|
|
|
{
|
2007-01-08 23:30:04 +00:00
|
|
|
debug(std::cout << "Generating property update" << std::endl << std::flush;);
|
2006-12-29 18:48:04 +00:00
|
|
|
|
2006-12-29 01:00:07 +00:00
|
|
|
Anonymous set_arg;
|
|
|
|
|
set_arg->setId(getId());
|
|
|
|
|
|
|
|
|
|
|
2016-01-19 15:38:03 +01:00
|
|
|
bool hadChanges = false;
|
|
|
|
|
|
|
|
|
|
for (auto entry : m_properties) {
|
|
|
|
|
PropertyBase * prop = entry.second;
|
2008-09-22 23:47:04 +00:00
|
|
|
assert(prop != 0);
|
|
|
|
|
if (prop->flags() & flag_unsent) {
|
2016-01-19 15:38:03 +01:00
|
|
|
debug(std::cout << "UPDATE: " << flag_unsent << " " << entry.first
|
2008-09-22 23:47:04 +00:00
|
|
|
<< std::endl << std::flush;);
|
2006-12-29 01:00:07 +00:00
|
|
|
|
2016-01-19 15:38:03 +01:00
|
|
|
prop->add(entry.first, set_arg);
|
2008-10-01 10:47:53 +00:00
|
|
|
prop->resetFlags(flag_unsent | per_clean);
|
|
|
|
|
resetFlags(entity_clean);
|
2016-01-19 15:38:03 +01:00
|
|
|
hadChanges = true;
|
2008-10-01 10:47:53 +00:00
|
|
|
// FIXME Make sure we handle separately for private properties
|
2006-12-29 01:00:07 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-19 15:38:03 +01:00
|
|
|
if (hadChanges) {
|
|
|
|
|
Set set;
|
|
|
|
|
set->setTo(getId());
|
|
|
|
|
set->setFrom(getId());
|
|
|
|
|
set->setSeconds(op->getSeconds());
|
|
|
|
|
set->setArgs1(set_arg);
|
|
|
|
|
|
|
|
|
|
Sight sight;
|
|
|
|
|
sight->setArgs1(set);
|
|
|
|
|
res.push_back(sight);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//Location changes must be communicated through a Move op.
|
|
|
|
|
if (m_flags & entity_dirty_location) {
|
|
|
|
|
Move m;
|
|
|
|
|
Anonymous move_arg;
|
|
|
|
|
move_arg->setId(getId());
|
|
|
|
|
m_location.addToEntity(move_arg);
|
|
|
|
|
m->setArgs1(move_arg);
|
|
|
|
|
m->setFrom(getId());
|
|
|
|
|
m->setTo(getId());
|
|
|
|
|
|
|
|
|
|
Sight s;
|
|
|
|
|
s->setArgs1(m);
|
|
|
|
|
|
|
|
|
|
res.push_back(s);
|
|
|
|
|
resetFlags(entity_dirty_location);
|
|
|
|
|
hadChanges = true;
|
2008-10-01 10:47:53 +00:00
|
|
|
}
|
|
|
|
|
|
2006-12-29 01:00:07 +00:00
|
|
|
|
2016-01-19 15:38:03 +01:00
|
|
|
//Only change sequence number and call onUpdated if something actually changed.
|
|
|
|
|
if (hadChanges) {
|
|
|
|
|
m_seq++;
|
|
|
|
|
if (~m_flags & entity_clean) {
|
|
|
|
|
onUpdated();
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-12-29 01:00:07 +00:00
|
|
|
}
|
|
|
|
|
|
2005-02-17 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/types.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Thing.cpp,
rulesets/Thing.h: Add core op handling for update operation, used
to handle move ops better.
2005-02-17 01:47:32 +00:00
|
|
|
void Thing::UpdateOperation(const Operation & op, OpVector & res)
|
|
|
|
|
{
|
2006-12-30 23:13:32 +00:00
|
|
|
// If it has no refno, then it is a generic request to broadcast
|
|
|
|
|
// an update of some properties which have changed.
|
|
|
|
|
if (op->isDefaultRefno()) {
|
2006-12-29 01:00:07 +00:00
|
|
|
updateProperties(op, res);
|
2006-06-05 01:01:02 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-01 23:05:28 +00:00
|
|
|
// If LOC is null, this cannot be part of the world, or must be the
|
|
|
|
|
// world itself, so should not be involved in any movement.
|
|
|
|
|
if (m_location.m_loc == 0) {
|
|
|
|
|
log(ERROR, String::compose("Updating %1(%2) when it is not in the world.",
|
|
|
|
|
getType(), getId()));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-30 23:13:32 +00:00
|
|
|
// If it has a refno, then it is a movement update. If it does not
|
|
|
|
|
// match the current movement serialno, then its obsolete, and can
|
|
|
|
|
// be discarded.
|
2014-09-18 11:06:05 +02:00
|
|
|
if (m_motion == nullptr || op->getRefno() != m_motion->serialno()) {
|
2006-12-30 23:13:32 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If somehow a movement update arrives with the correct refno, but
|
|
|
|
|
// we are not moving, then something has gone wrong.
|
2006-05-30 00:57:27 +00:00
|
|
|
if (!m_location.velocity().isValid() ||
|
2012-02-28 13:41:33 +00:00
|
|
|
m_location.velocity().sqrMag() < WFMath::numeric_constants<WFMath::CoordType>::epsilon()) {
|
2006-06-05 14:41:34 +00:00
|
|
|
log(ERROR, "Update got for entity not moving");
|
2006-05-31 17:43:39 +00:00
|
|
|
return;
|
2006-05-30 00:57:27 +00:00
|
|
|
}
|
|
|
|
|
|
2005-02-17 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/types.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Thing.cpp,
rulesets/Thing.h: Add core op handling for update operation, used
to handle move ops better.
2005-02-17 01:47:32 +00:00
|
|
|
// This is where we will handle movement simulation from now on, rather
|
|
|
|
|
// than in the mind interface. The details will be sorted by a new type
|
|
|
|
|
// of object which will handle the specifics.
|
2006-05-31 17:43:39 +00:00
|
|
|
|
2007-01-01 17:57:06 +00:00
|
|
|
const double & current_time = BaseWorld::instance().getTime();
|
2011-04-27 19:55:32 +01:00
|
|
|
float time_diff = (float)(current_time - m_location.timeStamp());
|
2006-05-31 17:43:39 +00:00
|
|
|
|
|
|
|
|
std::string mode;
|
|
|
|
|
|
2006-07-03 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, rulesets/Character.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Thing.cpp, server/WorldRouter.cpp:
Rename Entity members get(), set() and has() to getAttr(), setAttr()
and hasAttr().
2006-07-03 01:41:29 +00:00
|
|
|
if (hasAttr("mode")) {
|
2006-05-31 17:43:39 +00:00
|
|
|
Element mode_attr;
|
2006-07-03 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, rulesets/Character.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Thing.cpp, server/WorldRouter.cpp:
Rename Entity members get(), set() and has() to getAttr(), setAttr()
and hasAttr().
2006-07-03 01:41:29 +00:00
|
|
|
getAttr("mode", mode_attr);
|
2006-05-31 17:43:39 +00:00
|
|
|
if (mode_attr.isString()) {
|
|
|
|
|
mode = mode_attr.String();
|
|
|
|
|
} else {
|
2007-07-29 Al Riddoch <alriddoch@zepler.org>
* common/log.cpp, common/log.h: Switch to taking a C++ string reference
rather than a char *, as it is not really an optimisation, and it
makes the code simpler to read and write.
* client/BaseClient.cpp, client/ClientConnection.cpp,
common/AtlasFileLoader.cpp, common/BaseEntity.cpp,
common/Database.cpp, common/globals.cpp, common/id.cpp,
common/inheritance.cpp, common/log.cpp, common/log.h,
rulesets/Character.cpp, rulesets/Creator.cpp, rulesets/Entity.cpp,
rulesets/MemMap.cpp, rulesets/Motion.cpp, rulesets/Pedestrian.cpp,
rulesets/Py_Object.cpp, rulesets/Py_RootEntity.cpp,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Python_API.cpp, rulesets/Thing.cpp, server/Account.cpp,
server/Admin.cpp, server/ArithmeticFactory.cpp,
server/CommClient.cpp, server/CommListener.cpp,
server/CommMDNSPublisher.cpp, server/CommServer.cpp,
server/Connection.cpp, server/EntityFactory.cpp,
server/Persistance.cpp, server/Restoration.cpp,
server/ScriptFactory.cpp, server/TaskFactory.cpp,
server/WorldRouter.cpp, server/server.cpp: Convert over to using
new API correctly.
* data/mason.xml: Add biomass and transient to fircone, making its
script obsolete:
2007-07-29 03:33:33 +00:00
|
|
|
log(ERROR, String::compose("Mode on entity is a \"%1\" "
|
|
|
|
|
"in Thing::UpdateOperation",
|
|
|
|
|
Element::typeName(mode_attr.getType())));
|
2006-05-31 17:43:39 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-15 18:50:54 +02:00
|
|
|
const Location old_loc = m_location;
|
2006-05-31 17:43:39 +00:00
|
|
|
|
2006-06-01 15:23:33 +00:00
|
|
|
bool moving = true;
|
2006-06-01 01:26:17 +00:00
|
|
|
|
2006-06-02 17:08:28 +00:00
|
|
|
// Check if a predicted collision is due.
|
2006-06-01 01:26:17 +00:00
|
|
|
if (m_motion->collision()) {
|
|
|
|
|
if (current_time >= m_motion->m_collisionTime) {
|
2011-04-27 19:55:32 +01:00
|
|
|
time_diff = (float)(m_motion->m_collisionTime - m_location.timeStamp());
|
2006-06-03 10:19:38 +00:00
|
|
|
// This flag signals that collision resolution is required later.
|
|
|
|
|
// Whether or not we are actually moving is determined by the
|
|
|
|
|
// collision resolution.
|
2006-06-01 15:23:33 +00:00
|
|
|
moving = false;
|
2006-06-01 01:26:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-02 17:08:28 +00:00
|
|
|
// Update entity position
|
2016-01-18 15:37:05 +01:00
|
|
|
auto transformsProp = requirePropertyClassFixed<TransformsProperty>();
|
2016-01-17 17:02:50 +01:00
|
|
|
transformsProp->getTranslate() += (m_location.velocity() * time_diff);
|
|
|
|
|
|
|
|
|
|
//We need to apply transforms here to figure our position in order to adjust height further down
|
|
|
|
|
transformsProp->apply(this);
|
2006-05-31 17:43:39 +00:00
|
|
|
|
2006-06-03 10:19:38 +00:00
|
|
|
// Collision resolution has to occur after position has been updated.
|
2006-06-02 17:08:28 +00:00
|
|
|
if (!moving) {
|
2006-06-03 10:19:38 +00:00
|
|
|
moving = m_motion->resolveCollision();
|
2006-06-02 17:08:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Adjust the position to world constraints - essentially fit
|
|
|
|
|
// to the terrain height at this stage.
|
2009-05-12 23:30:19 +01:00
|
|
|
// FIXME Get the constraints from the movement domain
|
2014-09-13 10:34:30 +02:00
|
|
|
auto domain = getMovementDomain();
|
|
|
|
|
if (domain) {
|
2016-01-17 17:02:50 +01:00
|
|
|
float z = domain->constrainHeight(*this, m_location.m_loc, m_location.pos(), "standing");
|
2016-01-18 14:59:12 +01:00
|
|
|
transformsProp->getTranslate().z() = z;
|
2016-01-17 17:02:50 +01:00
|
|
|
transformsProp->apply(this);
|
2015-04-28 20:59:20 +02:00
|
|
|
} else {
|
|
|
|
|
|
2014-09-13 10:34:30 +02:00
|
|
|
}
|
2006-06-01 01:26:17 +00:00
|
|
|
m_location.update(current_time);
|
2016-01-17 17:02:50 +01:00
|
|
|
m_flags &= ~entity_clean;
|
2006-05-31 17:43:39 +00:00
|
|
|
|
2006-06-01 15:23:33 +00:00
|
|
|
float update_time = consts::move_tick;
|
|
|
|
|
|
2015-04-28 20:59:20 +02:00
|
|
|
if (moving && domain) {
|
2006-06-02 17:08:28 +00:00
|
|
|
// If we are moving, check for collisions
|
2015-04-28 20:59:20 +02:00
|
|
|
update_time = m_motion->checkCollisions(*domain);
|
2006-06-01 15:23:33 +00:00
|
|
|
|
|
|
|
|
if (m_motion->collision()) {
|
2012-02-28 13:41:33 +00:00
|
|
|
if (update_time < WFMath::numeric_constants<WFMath::CoordType>::epsilon()) {
|
2006-06-03 10:19:38 +00:00
|
|
|
moving = m_motion->resolveCollision();
|
2006-06-01 15:23:33 +00:00
|
|
|
} else {
|
|
|
|
|
m_motion->m_collisionTime = current_time + update_time;
|
|
|
|
|
}
|
2006-06-01 01:26:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-31 17:43:39 +00:00
|
|
|
Move m;
|
|
|
|
|
Anonymous move_arg;
|
|
|
|
|
move_arg->setId(getId());
|
|
|
|
|
m_location.addToEntity(move_arg);
|
|
|
|
|
m->setArgs1(move_arg);
|
|
|
|
|
m->setFrom(getId());
|
|
|
|
|
m->setTo(getId());
|
|
|
|
|
|
|
|
|
|
Sight s;
|
|
|
|
|
s->setArgs1(m);
|
|
|
|
|
|
|
|
|
|
res.push_back(s);
|
|
|
|
|
|
2006-06-01 15:23:33 +00:00
|
|
|
if (moving) {
|
2006-06-05 14:41:34 +00:00
|
|
|
debug(std::cout << "New Update in " << update_time << std::endl << std::flush;);
|
|
|
|
|
|
2006-06-01 15:23:33 +00:00
|
|
|
Update u;
|
|
|
|
|
u->setFutureSeconds(update_time);
|
|
|
|
|
u->setTo(getId());
|
|
|
|
|
|
2006-06-05 13:00:15 +00:00
|
|
|
// If the update op has no serial number, we need our own
|
|
|
|
|
// ref number
|
|
|
|
|
if (op->isDefaultSerialno()) {
|
|
|
|
|
u->setRefno(++m_motion->serialno());
|
|
|
|
|
} else {
|
|
|
|
|
// We should respect the serial number if it is present
|
|
|
|
|
// as the core code will set the reference number
|
|
|
|
|
// correctly.
|
|
|
|
|
m_motion->serialno() = op->getSerialno();
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-01 15:23:33 +00:00
|
|
|
res.push_back(u);
|
2014-09-18 11:06:05 +02:00
|
|
|
} else {
|
|
|
|
|
delete m_motion;
|
|
|
|
|
m_motion = nullptr;
|
2006-06-01 15:23:33 +00:00
|
|
|
}
|
2006-05-31 17:43:39 +00:00
|
|
|
|
2006-06-01 15:23:33 +00:00
|
|
|
// This code handles sending Appearance and Disappearance operations
|
|
|
|
|
// to this entity and others to indicate if one has gained or lost
|
|
|
|
|
// sight of the other because of this movement
|
2006-09-17 22:43:29 +00:00
|
|
|
|
|
|
|
|
// FIXME Why only for a perceptive moving entity? Surely other entities
|
|
|
|
|
// must gain/lose sight of this entity if it's moving?
|
2006-07-08 20:45:10 +00:00
|
|
|
if (isPerceptive()) {
|
2014-09-15 18:50:54 +02:00
|
|
|
checkVisibility(old_loc, res);
|
2006-06-01 15:23:33 +00:00
|
|
|
}
|
2008-08-16 23:21:06 +00:00
|
|
|
onUpdated();
|
2005-02-17 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/types.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Thing.cpp,
rulesets/Thing.h: Add core op handling for update operation, used
to handle move ops better.
2005-02-17 01:47:32 +00:00
|
|
|
}
|
2006-07-22 18:13:29 +00:00
|
|
|
|
|
|
|
|
void Thing::LookOperation(const Operation & op, OpVector & res)
|
|
|
|
|
{
|
2014-09-14 10:37:11 +02:00
|
|
|
LocatedEntity * from = BaseWorld::instance().getEntity(op->getFrom());
|
|
|
|
|
if (from == nullptr) {
|
|
|
|
|
log(ERROR, "Look op has invalid from");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2014-09-14 00:30:26 +02:00
|
|
|
// Register the entity with the world router as perceptive.
|
2014-09-14 10:37:11 +02:00
|
|
|
BaseWorld::instance().addPerceptive(from);
|
2006-07-22 18:13:29 +00:00
|
|
|
|
2014-09-14 10:37:11 +02:00
|
|
|
//Let the domain handle the Look op.
|
2014-09-14 00:30:26 +02:00
|
|
|
auto domain = getMovementDomain();
|
|
|
|
|
if (domain) {
|
|
|
|
|
domain->lookAtEntity(*from, *this, op, res);
|
|
|
|
|
} else {
|
2015-04-15 23:06:33 +02:00
|
|
|
Unseen u;
|
|
|
|
|
u->setTo(op->getFrom());
|
|
|
|
|
u->setArgs(op->getArgs());
|
|
|
|
|
if (!op->isDefaultSerialno()) {
|
|
|
|
|
u->setRefno(op->getSerialno());
|
|
|
|
|
}
|
|
|
|
|
res.push_back(u);
|
2014-09-14 00:30:26 +02:00
|
|
|
log(WARNING, "Entity being looked at don't belong to any Domain, so sights cannot be determined.");
|
2012-06-09 18:39:45 -07:00
|
|
|
}
|
2006-07-22 18:13:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Thing::CreateOperation(const Operation & op, OpVector & res)
|
|
|
|
|
{
|
|
|
|
|
const std::vector<Root> & args = op->getArgs();
|
|
|
|
|
if (args.empty()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
try {
|
|
|
|
|
RootEntity ent = smart_dynamic_cast<RootEntity>(args.front());
|
|
|
|
|
if (!ent.isValid()) {
|
|
|
|
|
error(op, "Entity to be created is malformed", res, getId());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const std::list<std::string> & parents = ent->getParents();
|
|
|
|
|
if (parents.empty()) {
|
|
|
|
|
error(op, "Entity to be created has empty parents", res, getId());
|
|
|
|
|
return;
|
|
|
|
|
}
|
2016-01-17 17:02:50 +01:00
|
|
|
|
|
|
|
|
if (ent->hasAttr("transforms")) {
|
|
|
|
|
ent->removeAttr("pos");
|
|
|
|
|
ent->removeAttr("orientation");
|
|
|
|
|
} else {
|
|
|
|
|
Atlas::Message::MapType transforms;
|
|
|
|
|
if (ent->hasAttrFlag(Atlas::Objects::Entity::POS_FLAG)) {
|
|
|
|
|
//Only copy x and y values; let terrain adjust z.
|
|
|
|
|
transforms["translate"] = ent->getPosAsList();
|
|
|
|
|
ent->removeAttr("pos");
|
|
|
|
|
}
|
|
|
|
|
Element orientation;
|
|
|
|
|
if (ent->copyAttr("orientation", orientation) == 0) {
|
|
|
|
|
transforms["rotate"] = orientation;
|
|
|
|
|
ent->removeAttr("orientation");
|
|
|
|
|
}
|
|
|
|
|
ent->setAttr("transforms", transforms);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//If there's no location set we'll use the same one as the current entity.
|
2006-07-22 18:13:29 +00:00
|
|
|
if (!ent->hasAttrFlag(Atlas::Objects::Entity::LOC_FLAG) &&
|
|
|
|
|
(m_location.m_loc != 0)) {
|
|
|
|
|
ent->setLoc(m_location.m_loc->getId());
|
|
|
|
|
if (!ent->hasAttrFlag(Atlas::Objects::Entity::POS_FLAG)) {
|
2016-01-17 17:02:50 +01:00
|
|
|
//Don't actually set the pos; instead set the transform.
|
|
|
|
|
//We don't allow external clients to directly set the pos.
|
|
|
|
|
if (!ent->hasAttr("transforms")) {
|
|
|
|
|
Atlas::Message::MapType transforms;
|
|
|
|
|
//Only copy x and y values; let terrain adjust z.
|
|
|
|
|
transforms["translate"] = Vector3D(m_location.pos().x(), m_location.pos().y(), 0).toAtlas();
|
|
|
|
|
ent->setAttr("transforms", transforms);
|
|
|
|
|
}
|
2006-07-22 18:13:29 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
const std::string & type = parents.front();
|
|
|
|
|
debug( std::cout << getId() << " creating " << type;);
|
|
|
|
|
|
2016-01-17 17:02:50 +01:00
|
|
|
LocatedEntity * obj = BaseWorld::instance().addNewEntity(type, ent);
|
2006-07-22 18:13:29 +00:00
|
|
|
|
|
|
|
|
if (obj == 0) {
|
|
|
|
|
error(op, "Create op failed.", res, op->getFrom());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Anonymous new_ent;
|
|
|
|
|
obj->addToEntity(new_ent);
|
2012-06-29 14:53:15 -07:00
|
|
|
|
|
|
|
|
if (!op->isDefaultSerialno()) {
|
|
|
|
|
log(NOTICE, "Sending create response");
|
|
|
|
|
|
|
|
|
|
Info i;
|
|
|
|
|
i->setArgs1(new_ent);
|
|
|
|
|
i->setTo(op->getFrom());
|
|
|
|
|
res.push_back(i);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Operation c(op.copy());
|
2006-07-22 18:13:29 +00:00
|
|
|
c->setArgs1(new_ent);
|
|
|
|
|
|
|
|
|
|
Sight s;
|
|
|
|
|
s->setArgs1(c);
|
|
|
|
|
res.push_back(s);
|
|
|
|
|
}
|
|
|
|
|
catch (Atlas::Message::WrongTypeException&) {
|
|
|
|
|
log(ERROR, "EXCEPTION: Malformed object to be created");
|
|
|
|
|
error(op, "Malformed object to be created", res, getId());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|