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
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
// Copyright (C) 2003 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
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
|
2006-10-26 00:48:00 +00:00
|
|
|
|
2011-02-15 09:30:46 +00:00
|
|
|
#ifdef NDEBUG
|
|
|
|
|
#undef NDEBUG
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef DEBUG
|
|
|
|
|
#define DEBUG
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
#include "IGEntityExerciser.h"
|
2012-11-26 00:21:40 +00:00
|
|
|
#include "TestBase.h"
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
#include "allOperations.h"
|
|
|
|
|
|
|
|
|
|
#include "rulesets/Character.h"
|
|
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
#include "rulesets/AtlasProperties.h"
|
|
|
|
|
#include "rulesets/BBoxProperty.h"
|
|
|
|
|
#include "rulesets/Domain.h"
|
|
|
|
|
#include "rulesets/EntityProperty.h"
|
2012-11-26 00:21:40 +00:00
|
|
|
#include "rulesets/ExternalMind.h"
|
2014-09-29 19:24:05 +02:00
|
|
|
#include "rulesets/ExternalProperty.h"
|
2010-04-04 22:49:39 +01:00
|
|
|
#include "rulesets/OutfitProperty.h"
|
|
|
|
|
#include "rulesets/Pedestrian.h"
|
|
|
|
|
#include "rulesets/Script.h"
|
|
|
|
|
#include "rulesets/StatusProperty.h"
|
2011-11-03 20:57:06 +00:00
|
|
|
#include "rulesets/Task.h"
|
2010-04-04 22:49:39 +01:00
|
|
|
#include "rulesets/TasksProperty.h"
|
|
|
|
|
|
|
|
|
|
#include "common/const.h"
|
|
|
|
|
#include "common/id.h"
|
|
|
|
|
#include "common/log.h"
|
2012-11-26 00:21:40 +00:00
|
|
|
#include "common/Link.h"
|
2010-04-04 22:49:39 +01:00
|
|
|
#include "common/Property_impl.h"
|
2007-12-31 18:31:26 +00:00
|
|
|
#include "common/TypeNode.h"
|
|
|
|
|
|
2014-09-29 19:24:05 +02:00
|
|
|
#include "stubs/rulesets/stubThing.h"
|
|
|
|
|
#include "stubs/rulesets/stubExternalProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubEntityProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubOutfitProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubTasksProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubTask.h"
|
|
|
|
|
#include "stubs/common/stubProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubSoftProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubContainsProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubStatusProperty.h"
|
|
|
|
|
#include "stubs/rulesets/stubBBoxProperty.h"
|
2015-05-23 16:47:45 +02:00
|
|
|
#include "stubs/rulesets/stubProxyMind.h"
|
|
|
|
|
#include "stubs/rulesets/stubBaseMind.h"
|
|
|
|
|
#include "stubs/rulesets/stubMemEntity.h"
|
|
|
|
|
#include "stubs/rulesets/stubMemMap.h"
|
2014-09-29 19:24:05 +02:00
|
|
|
#include "stubs/common/stubPropertyManager.h"
|
|
|
|
|
#include "stubs/rulesets/stubContainsProperty.h"
|
|
|
|
|
|
|
|
|
|
#include "stubs/common/stubLink.h"
|
|
|
|
|
#include "stubs/common/stubTypeNode.h"
|
|
|
|
|
#include "stubs/common/stubCustom.h"
|
|
|
|
|
#include "stubs/modules/stubLocation.h"
|
2015-05-23 16:47:45 +02:00
|
|
|
#include "stubs/modules/stubWorldTime.h"
|
|
|
|
|
#include "stubs/modules/stubDateTime.h"
|
2014-09-29 19:24:05 +02:00
|
|
|
#include "stubs/rulesets/stubScript.h"
|
|
|
|
|
#include "stubs/common/stubRouter.h"
|
|
|
|
|
#include "stubs/rulesets/stubLocatedEntity.h"
|
|
|
|
|
#include "stubs/rulesets/stubMovement.h"
|
|
|
|
|
#include "stubs/rulesets/stubDomain.h"
|
|
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
#include <cstdlib>
|
|
|
|
|
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
#include <cassert>
|
|
|
|
|
|
2010-04-04 22:49:39 +01: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::ListType;
|
2010-04-04 22:49:39 +01:00
|
|
|
using Atlas::Message::MapType;
|
|
|
|
|
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
|
|
|
|
2012-11-26 00:21:40 +00:00
|
|
|
class TestLink : public Link
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
TestLink(CommSocket & s, const std::string & id, long iid) :
|
|
|
|
|
Link(s, id, iid)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-04 20:39:35 +00:00
|
|
|
void externalOperation(const Operation & op, Link &)
|
2012-11-26 00:21:40 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void operation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class Charactertest : public Cyphesis::TestBase
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
{
|
2012-11-26 00:21:40 +00:00
|
|
|
private:
|
2012-12-03 15:37:40 +00:00
|
|
|
static Operation m_BaseWorld_message_called;
|
2013-01-17 10:17:07 +00:00
|
|
|
static LocatedEntity * m_BaseWorld_message_called_from;
|
2012-12-03 15:37:40 +00:00
|
|
|
|
2012-11-26 00:21:40 +00:00
|
|
|
Character * m_character;
|
|
|
|
|
TypeNode * m_type;
|
|
|
|
|
public:
|
|
|
|
|
Charactertest();
|
|
|
|
|
|
|
|
|
|
void setup();
|
|
|
|
|
void teardown();
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
|
2012-11-26 00:21:40 +00:00
|
|
|
void test_exerciser();
|
2012-12-05 09:45:16 +00:00
|
|
|
void test_linkExternal();
|
|
|
|
|
void test_linkExternal_mind();
|
|
|
|
|
void test_linkExternal_linked();
|
|
|
|
|
void test_linkExternal_linked_other();
|
|
|
|
|
void test_unlinkExternal();
|
|
|
|
|
void test_unlinkExternal_linked_other();
|
|
|
|
|
void test_unlinkExternal_unlinked();
|
|
|
|
|
void test_unlinkExternal_nomind();
|
2012-12-03 15:37:40 +00:00
|
|
|
void test_filterExternalOperation();
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
static void BaseWorld_message_called(const Operation & op, LocatedEntity &);
|
2012-11-26 00:21:40 +00:00
|
|
|
};
|
|
|
|
|
|
2012-12-03 15:37:40 +00:00
|
|
|
Operation Charactertest::m_BaseWorld_message_called(0);
|
2013-01-17 10:17:07 +00:00
|
|
|
LocatedEntity * Charactertest::m_BaseWorld_message_called_from(0);
|
2012-12-03 15:37:40 +00:00
|
|
|
|
|
|
|
|
void Charactertest::BaseWorld_message_called(const Operation & op,
|
2013-01-17 10:17:07 +00:00
|
|
|
LocatedEntity & ent)
|
2012-12-03 15:37:40 +00:00
|
|
|
{
|
|
|
|
|
m_BaseWorld_message_called = op;
|
|
|
|
|
m_BaseWorld_message_called_from = &ent;
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-26 00:21:40 +00:00
|
|
|
Charactertest::Charactertest()
|
|
|
|
|
{
|
|
|
|
|
ADD_TEST(Charactertest::test_exerciser);
|
2012-12-05 09:45:16 +00:00
|
|
|
ADD_TEST(Charactertest::test_linkExternal);
|
|
|
|
|
ADD_TEST(Charactertest::test_linkExternal_mind);
|
|
|
|
|
ADD_TEST(Charactertest::test_linkExternal_linked);
|
|
|
|
|
ADD_TEST(Charactertest::test_linkExternal_linked_other);
|
|
|
|
|
ADD_TEST(Charactertest::test_unlinkExternal);
|
|
|
|
|
ADD_TEST(Charactertest::test_unlinkExternal_linked_other);
|
|
|
|
|
ADD_TEST(Charactertest::test_unlinkExternal_unlinked);
|
|
|
|
|
ADD_TEST(Charactertest::test_unlinkExternal_nomind);
|
2012-12-03 15:37:40 +00:00
|
|
|
ADD_TEST(Charactertest::test_filterExternalOperation);
|
2012-11-26 00:21:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Charactertest::setup()
|
|
|
|
|
{
|
|
|
|
|
m_character = new Character("1", 1);
|
|
|
|
|
m_type = new TypeNode("character");
|
|
|
|
|
m_character->setType(m_type);
|
2012-12-11 22:40:16 +00:00
|
|
|
|
|
|
|
|
m_BaseWorld_message_called = 0;
|
|
|
|
|
m_BaseWorld_message_called_from = 0;
|
2012-11-26 00:21:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Charactertest::teardown()
|
|
|
|
|
{
|
|
|
|
|
delete m_character;
|
|
|
|
|
delete m_type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Charactertest::test_exerciser()
|
|
|
|
|
{
|
|
|
|
|
IGEntityExerciser ee(*m_character);
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
|
|
|
|
|
// Throw an op of every type at the entity
|
|
|
|
|
ee.runOperations();
|
|
|
|
|
|
|
|
|
|
// Subscribe the entity to every class of op
|
|
|
|
|
std::set<std::string> opNames;
|
|
|
|
|
ee.addAllOperations(opNames);
|
|
|
|
|
|
|
|
|
|
// Throw an op of every type at the entity again now it is subscribed
|
|
|
|
|
ee.runOperations();
|
2012-11-26 00:21:40 +00:00
|
|
|
}
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
|
2012-11-26 00:21:40 +00:00
|
|
|
// The common case as a link up with a new ExternalMind object
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_linkExternal()
|
2012-11-26 00:21:40 +00:00
|
|
|
{
|
|
|
|
|
ASSERT_NULL(m_character->m_externalMind);
|
|
|
|
|
|
|
|
|
|
Link * l = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->linkExternal(l);
|
2012-11-27 10:15:45 +00:00
|
|
|
ASSERT_EQUAL(ret, 0);
|
2012-11-26 00:21:40 +00:00
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind)
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked())
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(l))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// An existing, non-linked ExternalMind should be left in place, and used
|
|
|
|
|
// for the link up.
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_linkExternal_mind()
|
2012-11-26 00:21:40 +00:00
|
|
|
{
|
|
|
|
|
ExternalMind * existing_mind = m_character->m_externalMind =
|
|
|
|
|
new ExternalMind(*m_character);
|
|
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind);
|
|
|
|
|
ASSERT_TRUE(!m_character->m_externalMind->isLinked());
|
|
|
|
|
|
|
|
|
|
Link * l = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->linkExternal(l);
|
2012-11-27 10:15:45 +00:00
|
|
|
ASSERT_EQUAL(ret, 0);
|
2012-11-26 00:21:40 +00:00
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind)
|
|
|
|
|
ASSERT_EQUAL(m_character->m_externalMind, existing_mind);
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked())
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(l))
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-27 18:40:27 +00:00
|
|
|
// A link already done should be unaffected
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_linkExternal_linked()
|
2012-11-27 18:40:27 +00:00
|
|
|
{
|
|
|
|
|
ExternalMind * existing_mind = m_character->m_externalMind =
|
|
|
|
|
new ExternalMind(*m_character);
|
|
|
|
|
|
|
|
|
|
Link * l = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
existing_mind->linkUp(l);
|
|
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind);
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked());
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(l));
|
|
|
|
|
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->linkExternal(l);
|
2012-11-27 18:40:27 +00:00
|
|
|
ASSERT_EQUAL(ret, -1);
|
|
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind)
|
|
|
|
|
ASSERT_EQUAL(m_character->m_externalMind, existing_mind);
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked())
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(l))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// An existing link should be unaffected, and linkup should fail
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_linkExternal_linked_other()
|
2012-11-26 00:21:40 +00:00
|
|
|
{
|
|
|
|
|
ExternalMind * existing_mind = m_character->m_externalMind =
|
|
|
|
|
new ExternalMind(*m_character);
|
|
|
|
|
Link * existing_link = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
existing_mind->linkUp(existing_link);
|
|
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind);
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked());
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(existing_link));
|
|
|
|
|
|
|
|
|
|
Link * l = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->linkExternal(l);
|
2012-11-27 10:15:45 +00:00
|
|
|
ASSERT_EQUAL(ret, -1);
|
2012-11-26 00:21:40 +00:00
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind)
|
|
|
|
|
ASSERT_EQUAL(m_character->m_externalMind, existing_mind);
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked())
|
|
|
|
|
ASSERT_TRUE(!m_character->m_externalMind->isLinkedTo(l))
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(existing_link));
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-26 21:23:33 +00:00
|
|
|
// Common case. Character has a link, and this removes it.
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_unlinkExternal()
|
2012-11-26 21:23:33 +00:00
|
|
|
{
|
|
|
|
|
ExternalMind * existing_mind = m_character->m_externalMind =
|
|
|
|
|
new ExternalMind(*m_character);
|
|
|
|
|
Link * existing_link = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
existing_mind->linkUp(existing_link);
|
|
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind);
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked());
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(existing_link));
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->unlinkExternal(existing_link);
|
2012-11-27 10:15:45 +00:00
|
|
|
ASSERT_EQUAL(ret, 0);
|
2012-11-26 21:23:33 +00:00
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind)
|
|
|
|
|
ASSERT_TRUE(!m_character->m_externalMind->isLinked())
|
2012-12-12 00:07:26 +00:00
|
|
|
ASSERT_TRUE(m_BaseWorld_message_called.isValid());
|
|
|
|
|
ASSERT_EQUAL(m_BaseWorld_message_called_from, m_character);
|
|
|
|
|
ASSERT_EQUAL(m_BaseWorld_message_called->getClassNo(),
|
|
|
|
|
Atlas::Objects::Operation::MOVE_NO);
|
2012-11-26 21:23:33 +00:00
|
|
|
}
|
|
|
|
|
|
2012-11-27 19:22:41 +00:00
|
|
|
// Character has a link to another connection.
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_unlinkExternal_linked_other()
|
2012-11-27 19:22:41 +00:00
|
|
|
{
|
|
|
|
|
ExternalMind * existing_mind = m_character->m_externalMind =
|
|
|
|
|
new ExternalMind(*m_character);
|
|
|
|
|
Link * existing_link = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
existing_mind->linkUp(existing_link);
|
|
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind);
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked());
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(existing_link));
|
|
|
|
|
|
|
|
|
|
Link * l = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->unlinkExternal(l);
|
2012-11-27 19:22:41 +00:00
|
|
|
ASSERT_EQUAL(ret, -2);
|
|
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind)
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinked())
|
|
|
|
|
ASSERT_TRUE(m_character->m_externalMind->isLinkedTo(existing_link))
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-26 21:23:33 +00:00
|
|
|
// Check the case where the Character has no link
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_unlinkExternal_unlinked()
|
2012-11-26 21:23:33 +00:00
|
|
|
{
|
|
|
|
|
m_character->m_externalMind = new ExternalMind(*m_character);
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind);
|
|
|
|
|
ASSERT_TRUE(!m_character->m_externalMind->isLinked())
|
|
|
|
|
|
|
|
|
|
Link * l = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->unlinkExternal(l);
|
2012-11-27 10:15:45 +00:00
|
|
|
ASSERT_EQUAL(ret, -1);
|
2012-11-26 21:23:33 +00:00
|
|
|
|
|
|
|
|
ASSERT_NOT_NULL(m_character->m_externalMind)
|
|
|
|
|
ASSERT_TRUE(!m_character->m_externalMind->isLinked())
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
void Charactertest::test_unlinkExternal_nomind()
|
2012-11-26 21:23:33 +00:00
|
|
|
{
|
|
|
|
|
ASSERT_NULL(m_character->m_externalMind);
|
|
|
|
|
|
|
|
|
|
Link * l = new TestLink(*(CommSocket*)0, "2", 2);
|
|
|
|
|
|
2012-12-05 09:45:16 +00:00
|
|
|
int ret = m_character->unlinkExternal(l);
|
2012-11-27 10:15:45 +00:00
|
|
|
ASSERT_EQUAL(ret, -1);
|
2012-11-26 21:23:33 +00:00
|
|
|
|
|
|
|
|
ASSERT_NULL(m_character->m_externalMind)
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-03 15:37:40 +00:00
|
|
|
void Charactertest::test_filterExternalOperation()
|
|
|
|
|
{
|
|
|
|
|
// Dispatching a Talk external op from the character should result in
|
|
|
|
|
// it being passed on to the world.
|
|
|
|
|
|
|
|
|
|
Atlas::Objects::Operation::Talk op;
|
|
|
|
|
op->setFrom(m_character->getId());
|
|
|
|
|
|
|
|
|
|
m_character->filterExternalOperation(op);
|
|
|
|
|
|
|
|
|
|
// BaseWorld::message should have been called from Enitty::sendWorld
|
|
|
|
|
// with the Talk operation, modified to have TO set to the character.
|
|
|
|
|
ASSERT_TRUE(m_BaseWorld_message_called.isValid());
|
|
|
|
|
ASSERT_EQUAL(m_BaseWorld_message_called->getClassNo(),
|
|
|
|
|
Atlas::Objects::Operation::TALK_NO);
|
|
|
|
|
ASSERT_TRUE(!m_BaseWorld_message_called->isDefaultTo());
|
|
|
|
|
ASSERT_EQUAL(m_BaseWorld_message_called->getTo(), m_character->getId());
|
|
|
|
|
ASSERT_NOT_NULL(m_BaseWorld_message_called_from);
|
|
|
|
|
ASSERT_EQUAL(m_BaseWorld_message_called_from, m_character);
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-26 00:21:40 +00:00
|
|
|
int main(int argc, char ** argv)
|
|
|
|
|
{
|
|
|
|
|
Charactertest t;
|
|
|
|
|
|
|
|
|
|
return t.run();
|
2010-04-04 22:49:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// stubs
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
void TestWorld::message(const Operation & op, LocatedEntity & ent)
|
2012-09-11 22:53:15 +01:00
|
|
|
{
|
2012-12-03 15:37:40 +00:00
|
|
|
Charactertest::BaseWorld_message_called(op, ent);
|
2012-09-11 22:53:15 +01:00
|
|
|
}
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
LocatedEntity * TestWorld::addNewEntity(const std::string &,
|
2012-09-06 13:48:40 +01:00
|
|
|
const Atlas::Objects::Entity::RootEntity &)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
|
2013-01-18 19:21:46 +00:00
|
|
|
ExternalMind::ExternalMind(LocatedEntity & e) : Router(e.getId(), e.getIntId()),
|
2012-11-26 00:21:40 +00:00
|
|
|
m_external(0),
|
|
|
|
|
m_entity(e),
|
|
|
|
|
m_lossTime(0.)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ExternalMind::~ExternalMind()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-04 20:39:35 +00:00
|
|
|
void ExternalMind::externalOperation(const Operation & op, Link &)
|
2012-11-26 00:21:40 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ExternalMind::linkUp(Link * c)
|
|
|
|
|
{
|
|
|
|
|
m_external = c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ExternalMind::operation(const Operation & op, OpVector & res)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
Pedestrian::Pedestrian(LocatedEntity & body) : Movement(body)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Pedestrian::~Pedestrian()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
double Pedestrian::getTickAddition(const Point3D & coordinates,
|
|
|
|
|
const Vector3D & velocity) const
|
|
|
|
|
{
|
|
|
|
|
return consts::basic_tick;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int Pedestrian::getUpdatedLocation(Location & return_location)
|
|
|
|
|
{
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Operation Pedestrian::generateMove(const Location & new_location)
|
|
|
|
|
{
|
|
|
|
|
Atlas::Objects::Operation::Move moveOp;
|
|
|
|
|
return moveOp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-09-29 19:24:05 +02:00
|
|
|
void addToEntity(const Point3D & p, std::vector<double> & vd)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
2014-09-29 19:24:05 +02:00
|
|
|
vd.resize(3);
|
|
|
|
|
vd[0] = p[0];
|
|
|
|
|
vd[1] = p[1];
|
|
|
|
|
vd[2] = p[2];
|
2010-04-04 22:49:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Entity::Entity(const std::string & id, long intId) :
|
2013-01-14 09:59:54 +00:00
|
|
|
LocatedEntity(id, intId), m_motion(0)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Entity::~Entity()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::destroy()
|
|
|
|
|
{
|
|
|
|
|
destroyed.emit();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::ActuateOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::AppearanceOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::AttackOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::CombineOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::CreateOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::DeleteOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::DisappearanceOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::DivideOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::EatOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
|
2012-06-30 01:06:14 -07:00
|
|
|
void Entity::GetOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::InfoOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
void Entity::ImaginaryOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::LookOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::MoveOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::NourishOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::SetOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::SightOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::SoundOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::TalkOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::TickOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::TouchOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::UpdateOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::UseOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::WieldOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-22 14:20:33 +02:00
|
|
|
void Entity::RelayOperation(const Operation &, OpVector &)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-04 20:39:35 +00:00
|
|
|
void Entity::externalOperation(const Operation & op, Link &)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::operation(const Operation & op, OpVector & res)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::addToMessage(Atlas::Message::MapType & omap) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::addToEntity(const Atlas::Objects::Entity::RootEntity & ent) const
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-28 00:28:25 +00:00
|
|
|
PropertyBase * Entity::setAttr(const std::string & name,
|
|
|
|
|
const Atlas::Message::Element & attr)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
2011-02-28 00:28:25 +00:00
|
|
|
return 0;
|
2010-04-04 22:49:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const PropertyBase * Entity::getProperty(const std::string & name) const
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PropertyBase * Entity::modProperty(const std::string & name)
|
|
|
|
|
{
|
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 21:54:03 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
2010-04-04 22:49:39 +01:00
|
|
|
|
2012-11-26 00:21:40 +00:00
|
|
|
PropertyBase * Entity::setProperty(const std::string & name,
|
|
|
|
|
PropertyBase * prop)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
void Entity::installDelegate(int class_no, const std::string & delegate)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-25 22:42:00 +02:00
|
|
|
void Entity::removeDelegate(int class_no, const std::string & delegate)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
Domain * Entity::getMovementDomain()
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::sendWorld(const Operation & op)
|
|
|
|
|
{
|
|
|
|
|
BaseWorld::instance().message(op, *this);
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-15 22:53:14 +02:00
|
|
|
void Entity::onContainered(const LocatedEntity*)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Entity::onUpdated()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-09 14:50:45 +02:00
|
|
|
void Entity::setType(const TypeNode* t)
|
|
|
|
|
{
|
|
|
|
|
m_type = t;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
BaseWorld * BaseWorld::m_instance = 0;
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
BaseWorld::BaseWorld(LocatedEntity & gw) : m_gameWorld(gw)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
m_instance = this;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BaseWorld::~BaseWorld()
|
|
|
|
|
{
|
|
|
|
|
m_instance = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 22:17:09 +02:00
|
|
|
LocatedEntity& BaseWorld::getDefaultLocation() {
|
|
|
|
|
return m_gameWorld;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
LocatedEntity * BaseWorld::getEntity(const std::string & id) const
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
long intId = integerId(id);
|
|
|
|
|
|
|
|
|
|
EntityDict::const_iterator I = m_eobjects.find(intId);
|
|
|
|
|
if (I != m_eobjects.end()) {
|
|
|
|
|
assert(I->second != 0);
|
|
|
|
|
return I->second;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
LocatedEntity * BaseWorld::getEntity(long id) const
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
EntityDict::const_iterator I = m_eobjects.find(id);
|
|
|
|
|
if (I != m_eobjects.end()) {
|
|
|
|
|
assert(I->second != 0);
|
|
|
|
|
return I->second;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-02-22 09:57:10 +00:00
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
void log(LogLevel lvl, const std::string & msg)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-04 21:19:34 +00:00
|
|
|
void logEvent(LogEvent lev, const std::string & msg)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
long integerId(const std::string & id)
|
|
|
|
|
{
|
|
|
|
|
long intId = strtol(id.c_str(), 0, 10);
|
|
|
|
|
if (intId == 0 && id != "0") {
|
|
|
|
|
intId = -1L;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return intId;
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-26 21:23:33 +00:00
|
|
|
void addToEntity(const Vector3D & v, std::vector<double> & vd)
|
|
|
|
|
{
|
|
|
|
|
vd.resize(3);
|
|
|
|
|
vd[0] = v[0];
|
|
|
|
|
vd[1] = v[1];
|
|
|
|
|
vd[2] = v[2];
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-04 22:49:39 +01:00
|
|
|
template <typename FloatT>
|
|
|
|
|
int fromStdVector(Point3D & p, const std::vector<FloatT> & vf)
|
|
|
|
|
{
|
|
|
|
|
if (vf.size() != 3) {
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
p[0] = vf[0];
|
|
|
|
|
p[1] = vf[1];
|
|
|
|
|
p[2] = vf[2];
|
|
|
|
|
p.setValid();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename FloatT>
|
|
|
|
|
int fromStdVector(Vector3D & v, const std::vector<FloatT> & vf)
|
|
|
|
|
{
|
|
|
|
|
if (vf.size() != 3) {
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
v[0] = vf[0];
|
|
|
|
|
v[1] = vf[1];
|
|
|
|
|
v[2] = vf[2];
|
|
|
|
|
v.setValid();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template int fromStdVector<double>(Point3D & p, const std::vector<double> & vf);
|
|
|
|
|
template int fromStdVector<double>(Vector3D & v, const std::vector<double> & vf);
|
|
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
EntityRef::EntityRef(LocatedEntity* e) : m_inner(e)
|
2010-04-04 22:49:39 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EntityRef::EntityRef(const EntityRef& ref) : m_inner(ref.m_inner)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EntityRef& EntityRef::operator=(const EntityRef& ref)
|
|
|
|
|
{
|
|
|
|
|
m_inner = ref.m_inner;
|
|
|
|
|
|
|
|
|
|
return *this;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void EntityRef::onEntityDeleted()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
template<class V>
|
|
|
|
|
const Quaternion quaternionFromTo(const V & from, const V & to)
|
|
|
|
|
{
|
|
|
|
|
return Quaternion(1.f, 0.f, 0.f, 0.f);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template
|
|
|
|
|
const Quaternion quaternionFromTo<Vector3D>(const Vector3D &, const Vector3D&);
|