* rulesets/BaseMind.cpp: Make sure we don't delete ourself from
map.
* server/WorldRouter.h, server/WorldRouter.cpp: Add more advanced
handling for delete ops, so the response is broadcast before
it is removed.
* server/WorldRouter.cpp: Clean up a special case for TO="all" on
ops, which we now disallow. Remove a verbose tests for NULL
pointers in the world dictionary and replace with a simple assert.
* Fix bounding boxes for fir and oak scaling.
* common/globals.cpp: Default to starting at dawn.
* modules/DateTime.h: Make accessors to static vars static.
* server/WorldRouter.cpp: Handle time offest more sanely.
* server/WorldRouter.cpp: Change check in new Entity code to ensure
that entities already have valid location at this point.
* server/EntityFactory.cpp: Implement randomized starting position
in entity factory.
* server/WorldRouter.cpp: Slightly randomize starting position
of characters to avoid getting stuck.
* rulesets/mason/define_world.py: Move the world contents around a bit
to make room for larger spawn area.
* rulesets/World.cpp: Make sure we don't degfault if we get a height
outside current area of terrain.
* client/ClientConnection.cpp, client/CharacterClient.cpp:
Set an error condition if the server disconnects unexpectedly,
and thus return an error to the script causing an exit.
* rulesets/World.cpp, rulesets/World.h: Add accessor to get height
at a particular point.
* server/Account.cpp: Remove redundant check on new character
location.
* common/BaseWorld.h, server/WorldRouter.cpp, server/WorldRouter.h,
rulesets/Thing.cpp: Add new function for correcting height
of entities to ground level, and use it whenever new entities
are created, or whenever an entity moves.
* rulesets/Thing.cpp, rulesets/World.cpp, server/WorldRouter.cpp:
Delete commented out code for old range checks.
* modules/Location.h, physics/BBox.h, physics/Collision.cpp,
physics/Vector3D.h, rulesets/Entity.h: Remove obsolete math
functions for doing silly calculations with boxes.
* common/const.cpp, common/const.h: Add constants for handling
size based visibility calculations.
* rulesets/World.cpp, server/WorldRouter.cpp: Convert op broadcast
and viewing distance to being handled by a visibility calculation
based on size and distance, rather than distance alone. Movement
appearance and disappearance is yet to be done.
* rulesets/Thing.cpp: Send an Appearance op from new entities
rather than Sight(Create).
* server/WorldRouter.cpp: Accept Appearance and Disappearance
as ops which can be broadcast.
* common/BaseWorld.h, server/CommServer.cpp, server/CommServer.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/ServerRouting_methods.h, server/WorldRouter.cpp,
server/WorldRouter.h: Modify idle to return if there are ops due
so that select can be called with zero timeout. Server now processes
op as quickly as possible and hopefully is still responsive.
* common/BaseWorld.h, server/Connection.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/WorldRouter.cpp, server/WorldRouter.h:
Get rid of obsolete return value, from idle functions, and
adjust WorldRouter::idle() so it only dispatches a certain
number of ops at a time.
* server/Admin.cpp: Remove debugging output for monitoring code.
* server/ExternalMind.cpp, server/ExternalMind.h: Rename member
variables to fit with convention.
* tools/cycmd.cpp: Document monitor features.
* tools/cycmd.cpp: Add new command to enable and disable server
monitoring.
* server/WorldRouter.cpp, common/BaseWorld.h: Add facility to
notify using a SigC signal each type an op is dispatched.
* server/CommClient.h, server/CommClient.cpp: Fix typo in
overridden method which meant it didn't work.
* server/Admin.h, server/Admin.cpp: Add handler for Monitor operation
which turns on and off sending all IG ops to the admin client.
* rulesets/Python_API.cpp, common/types.h, common/Generic.h,
common/BaseEntity.h: Fix Generic op so it can be used, and
clean up its use. Add an enumeration for monitor ops.
* tests/Worldtest.cpp: Update test to take account of changes
in the BaseWorld interface.
* server/WorldRouter.cpp: Report an error if an entity creation
attempt of unknown type is attempted.
* server/EntityFactory.h, server/EntityFactory.cpp: Modify
unbound rule queue so it handles multiple rules depending
on a single parent.
* server/EntityFactory.cpp: Be much stricter about missing types,
and missing parents of types. Refuse to add types or instances
which have non-existant parents.
* common/BaseWorld.h, rulesets/Thing.cpp, server/Account.cpp,
server/Account.h, server/EntityFactory.h,
server/WorldRouter.cpp, server/WorldRouter.h:
Change names of functions used to add new objects to the world
to reflect that they do this. Handle failure to create an
entity.
* server/Lobby.cpp: Add some debugging messages.
* server/CommServer.cpp: Tweak select loop so that closed connections
are cleaned up as soon as they are detected.
* rulesets/World.cpp: Make demo terrain a bit more mountainous.
* Convert entire codebase over to using Atlas-C++ 0.4.90, as
start of transition to 0.6 API.
* common/Database.h, server/Account.cpp, server/Account.h,
server/Admin.h, server/Connection.cpp, server/Player.h,
server/WorldRouter.cpp: Change the form of the getEntityId()
method in the database code and re-work the code that uses it.
* common/Database.cpp, common/Database.h: Use PQClear() to free
up database result objects, and provide a method to
free the contents of a DatabaseResult instance.
* server/Restoration.cpp: Send restored entities a setup op, so the
AI gets initialised as if the entity had just been created.
* Clean up member variable names.
* rulesets/mason/mind/SkelMind.py: Get skeleton to recognise
settlers.
* client/CommClient.cpp, client/CreatorClient.cpp,
client/ObserverClient.cpp, client/Py_CreatorClient.cpp,
common/BaseEntity.cpp, common/BaseEntity.h,
common/types.h, rulesets/Area.cpp, rulesets/BaseMind.cpp,
rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Food.cpp, rulesets/Line.cpp,
rulesets/MemMap.cpp, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Thing.cpp,
rulesets/Python_API.cpp, rulesets/Stackable.cpp,
rulesets/Thing.cpp, rulesets/World.cpp,
server/Account.cpp, server/Admin.cpp, server/CommClient.cpp,
server/CommServer.cpp, server/Connection.cpp,
server/EntityFactory.cpp, server/Lobby.cpp,
server/Persistance.cpp, server/Player.cpp,
server/ServerRouting.cpp, server/WorldRouter.cpp:
Switch to using Element as name for Atlas::Message::Object,
to avoid name clashes on Object, and bring into line with
the way Atlas-C++ will be.
* client/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, rulesets/MemMap.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Thing.cpp, rulesets/Thing.h,
server/Account.cpp, server/Admin.cpp, server/Connection.cpp,
server/Lobby.cpp, server/ServerRouting.cpp:
Use a more efficient technique to set the attributes on
operation arguments without a copy.
* common/BaseEntity.cpp, rulesets/Entity.cpp, rulesets/Thing.h,
rulesets/World.cpp, server/WorldRouter.cpp:
Move handling IG Look ops into the IG code in rulesets.
* Use " instead of < when including application headers.
* Re-work the interface between server and worldrouter objects
so that the are less tied together, and more flexible.
* common/globals.cpp, common/globals.h, server/Connection.cpp,
server/Persistance.cpp, server/Persistance.h, server/ServerRouting.cpp,
server/server.cpp: Move restricted flag out of persistance into
globals.
* server/Account.h, server/Admin.cpp, server/Connection_methods.h,
server/WorldRouter.cpp: Remove unnecessary includes.
* server/ServerRouting.cpp: No longer necessary to load the admin
account at startup. Can be loaded on demand.
* common/Database.cpp: Don't make update requests if no columns
are given to be updated.
* common/Database.cpp, common/Database.h: Add new method to select
all rows in a given class table with a given location.
* rulesets/Entity.cpp, rulesets/Entity.h: Make update_flags
public.
* rulesets/Entity.cpp, rulesets/Thing.cpp, rulesets/attributes.h,
server/Persistor.cpp, server/Persistor_impl.h,
server/WorldRouter.cpp: Add new cont column to entity tables which
is zero if the entity has no contained entities.
* server/Restoration.cpp, server/Restoration.h, server/Restorer.cpp,
server/Restorer.h, server/Restorer_impl.h:
Modify restorers so they now use a database result iterator to
indicate the row they should restore from.
* server/Restoration.cpp: Implement new way of restoring world from
database using new function to fetch multiple complete entities
from database at the same time. Massive speedup.
* common/BaseEntity.cpp, common/BaseEntity.h, rulesets/Character.cpp,
rulesets/Food.cpp, rulesets/Thing.cpp, rulesets/World.cpp:
Add arg to error method specifying where the error should go. Use
this arg to ensure that errors don't get broadcast.
* common/Database.cpp, common/Database.h, common/const.cpp,
server/Persistor.cpp, server/Restoration.cpp,
server/WorldRouter.cpp
Change id and loc column in entity tables to integer for
performance. Add id generator sequence to database
* common/Database.cpp, common/Database.h, server/Persistance.cpp,
server/Persistance.h: Remove old legacy world, mind and server
tables as they are no longer used.
* common/BaseEntity.cpp, common/Load.h, common/Save.h,
common/custom.cpp, common/op_switch.h, common/operations.cpp,
common/operations.h, common/types.h, rulesets/BaseMind.cpp,
rulesets/BaseMind.h, rulesets/Character.cpp, rulesets/Character.h,
server/Admin.cpp, server/Admin.h, server/server.cpp,
tools/cycmd.cpp: Remove Load and Save ops.
* rulesets/Area.cpp, rulesets/Character.cpp, rulesets/Line.cpp,
rulesets/Plant.cpp: Fix != to |= when setting update flags.
* server/CommMetaClient.cpp, server/CommMetaClient.h,
server/CommServer.cpp, server/CommServer.h, server/server.cpp:
Add mechanism for sockets to be called whenever the server
is idle, so that they do period things. Use this mechanis,
to handle sending periodic packets to the metaserver, removing
special case code from CommServer.
* physics/Quaternion.h, physics/Vector3D.h: Add accessors to
allow direct modification of coordinates.
* server/Persistor_impl.h: Remove duplicate attribute handler.
* server/Restoration.cpp: And in the final code for loading
restored entities from database.
* server/Restoration.h, server/Restorer.h,
server/Restorer_impl.h: Implement handler that populate
member variables of entity objects from database
structures.
* server/ServerRouting.h: Make WorldRouter reference public.
* server/WorldRouter.cpp, server/WorldRouter.h: Slight
modification to addObject(Entity *) to allow restored
objects to be added as well as new ones.
* server/WorldRouter.cpp, server/Admin.cpp:
Use consts::rootWorldId correctly.
* server/Persistor.cpp, server/PersistantThingFactory.cpp,
server/PersistantThingFactory.h, server/EntityFactory.h,
server/EntityFactory.cpp: Add World specialisation of Persistor
so that row in entity database is maintained, but not created.
* common/Database.h: Ensure iterator has != as well as ==.
* common/Database.cpp: Check that tuples have been returned
in response to a select.
* server/Restoration.cpp, server/Restoration.h,
server/Restorer.cpp: Restoration code now iterates over the
contents of the database, but does not attempt to actually
restore it yet.
* server/WorldRouter.cpp: Shuffle the way id is generated, so
its available for persistance.
* server/EntityFactory.h, server/EntityFactory.cpp: Pass id
into entityfactory so it can be passed to database.
* server/server.cpp, server/WorldRouter.cpp,
server/EntityFactory.h, server/EntityFactory.cpp:
Change the way the EnitityFactory is created so it has a
reference to the world.
* rulesets/Entity.h, rulesets/Entity.cpp: getLocation returns
whether an error occured setting location data.
* common/Database.h, common/Database.cpp: Add stub functions
for generating queries to new format entity tables.
* server/Persistor_impl.h, server/Persistor.h,
server/Persistor.cpp: Add hooks for syncing update to
database using new database functions.
* server/PersistantThingFactory.h, server/PersistantThingFactory.cpp:
Work in progress on code to handle creating entities to be persisted.
* server/WorldRouter.cpp: Get rid of hard tab.
* rulesets/Thing.cpp: Clean up checks on new entities.
* server/EntityFactory.cpp: Be stricter about entity classes which
aren't installed properlly. Add comments about implementing
persistance. Removed redundant handling of name attribute.
* common/const.cpp, common/const.h, rulesets/Creator.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, server/WorldRouter.cpp:
Re-work omnipresent flag so it can only work in a debug build,
and has no performance impact on the production code.
* common/Database.h, common/Database.cpp, server/Persistance.cpp:
Finish entity table creation code, and test it.
* rulesets/Entity.cpp, rulesets/Entity.h, rulesets/EntityFactory.h,
rulesets/PythonThingScript.cpp, rulesets/PythonThingScript.h,
rulesets/Python_API.cpp, rulesets/Python_API.h,
rulesets/Thing.cpp, rulesets/Thing.h, server/EntityFactory.cpp,
server/EntityFactory.h, server/WorldRouter.cpp: Sort out
some incorrect use of Thing instead of Entity. Move some code
from Thing into Entity.
* common/globals.cpp: Only persist this sessions command line
options if the user is overriding the installation directory.
* cyphesis.vconf, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp:
Add client functionality to allow diferent scripts to be run to
perform different functions on the server.
* client/CharacterClient.cpp: Add debug option.
* rulesets/Character.h: Make mind operation functions virtual,
so they can be overridden.
* common/BaseWorld.h, server/WorldRouter.cpp,
server/WorldRouter.h: Add server functions to search for
entities by name or type.
* rulesets/Creator.h, rulesets/Creator.cpp: Allow creator to
specify a look without an id to search for entities with
a given name or type.
* client/CreatorClient.cpp, client/CreatorClient.h,
client/ObserverClient.cpp, client/ObserverClient.h,
client/Py_CreatorClient.cpp, rulesets/basic/editor.py,
rulesets/mason/define_world.py:
Add support for looking for entities in the world by name or
type from client script, so client scripts can modify existing
world.
* rulesets/Entity.cpp, rulesets/Movement.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Oplist.cpp, rulesets/Python_API.cpp,
rulesets/Stackable.cpp, rulesets/Thing.cpp,
rulesets/World.cpp, server/Account.cpp,
server/CommServer.cpp, server/Connection.cpp,
server/Player.cpp, server/ServerRouting.cpp,
server/server.cpp, tools/cycmd.cpp,
tools/cywatchdog.cpp: Code formatting cleanups.
* rulesets/basic/world/objects/tools/Bow.py: Fix up bow so it now
fires correctly.
* tools/cyloadrules.cpp, server/server.cpp,
aiclient/ClientConnection.cpp, client/ClientConnection.cpp,
common/inheritance.h: Use const iterators and references
whenever possible.
* client/CommClient.cpp, client/CreatorClient.cpp,
client/ObserverClient.cpp, client/Py_CreatorClient.cpp,
common/BaseEntity.cpp, common/BaseEntity.h,
common/types.h, rulesets/Area.cpp, rulesets/BaseMind.cpp,
rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Food.cpp, rulesets/Line.cpp,
rulesets/MemMap.cpp, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Thing.cpp,
rulesets/Python_API.cpp, rulesets/Stackable.cpp,
rulesets/Thing.cpp, rulesets/World.cpp,
server/Account.cpp, server/Admin.cpp, server/CommClient.cpp,
server/CommServer.cpp, server/Connection.cpp,
server/EntityFactory.cpp, server/Lobby.cpp,
server/Persistance.cpp, server/Player.cpp,
server/ServerRouting.cpp, server/WorldRouter.cpp:
Switch to using Fragment as name for Atlas::Message::Object,
to avoid name clashes on Object.
* common/BaseEntity.h: Make BaseEntity inherit from SigC::Object,
so signals and callbacks can be used, and add destroyed
signal.
* common/accountbase.h, physics/BBox.h, physics/Quaternion.h,
physics/Vector3D.h, rulesets/MemMap_methods.h,
rulesets/Movement.cpp, rulesets/Plant.h,
rulesets/Py_Operation.cpp, rulesets/PythonMindScript.cpp,
rulesets/PythonThingScript.cpp, rulesets/Script.cpp,
common/inheritance.cpp: Cleaned up Atlas::Message::Object
use, and excessive use of "using ...".
* rulesets/Movement.h, rulesets/Pedestrian.h:
Use forward declarations rather than including Move.h
* server/Account.cpp, server/Account.h, server/Connection.cpp,
server/Connection.h: Use destroyed signal to ensure references
to in game entities are removed when those entities are
destroyed. Ensure Connection is only destroyed once.
* ALL: Cleaned up headers into correct order.
* common/log.h, common/log.cpp: Write some logging code which
handles message of different types using syslog or standard
error, depending on whether we are running as a daemon.
* ALL: Switched to using log() for all output.
* common/const.h: Increase the sight range.
* server/WorldRouter.cpp: Put in some warnings, as I want to
know when ops are getting broadcast.
* server/server.cpp: Ensure stdout is not used when in daemon mode.
* tools/cydbload.cpp: Rename the daftly named class WorldBase
to WorldAccessor.
* mason.xml, cyphesis.vconf: Stop using the Acorn ruleset in Mason,
as it contains strange stuff, and remove the playable farmer
class from basic. Now games themselves define the only
playable types, and mason contains its own copies of classes
it has in common with acorn.
* client/ObserverClient.cpp, server/Account.cpp, server/Connection.h,
server/Routing.h: Formatting cleanup
* client/Py_CreatorClient.cpp, rulesets/Area.cpp, rulesets/Area.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Line.cpp, rulesets/Line.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Stackable.cpp, rulesets/Stackable.h:
Replace operator[] with get() method for querying attributes.
Make this get() method const, and re-write the internals so
that it more cleanly handles attributes.
* common/BaseWorld.h: Re-write world.getObject() so that it
no longer uses std::map::operator[], as the old method was
inserting NULLs into the world dictionary when non-existant
entities were queried.
* rulesets/Character.cpp: Clean up outstanding issues when movement
position is supplied, and is very close to being correct, and
clarify comments about movement when neither destination nor
source are provided.
* rulesets/Character.cpp: Modify mind2body interface so that setting
the TO of ops is done in the individual handlers, and copying
the operation globally is avoided.
* rulesets/MemMap_methods.h: Remove dodgy debug code.
* rulesets/Pedestrian.cpp: Clarify movement fixme.
* rulesets/Py_Operation.cpp: Clarify operation time handler fixme.
* rulesets/Stackable.cpp: Clarify fixme's in combine and divide
handlers.
* server/CommServer.cpp: Remove redundant fixme.
* server/Connection.cpp, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/server.cpp:
Move inline ServerRouting::getObject into class header.
* server/WorldRouter.cpp, server/WorldRouter.h:
Clean up includes, and move updateTime into the main body of the
file. Clean up code formatting when handling maps and dictionaries.
Clarify error output and comments about NULL objects in the world
dictionary.
* server/WorldRouter.h, server/WorldRouter.cpp, common/BaseWorld.h,
rulesets/Creator.cpp, rulesets/World.cpp: Removed unused and
unnecessary code from BaseWorld class, and move some stuff into
the WorldRouter where it belongs.
* rulesets/Character.cpp: Fixed a bug in the way ops from the
mind are handled which caused a segfault.
* rulesets/Character.h, rulesets/Creator.h: Made some functions
which are never overridden non-virtual for speed.
* rulesets/MemMap.cpp, rulesets/MemMap.h, rulesets/MemMap_methods.h:
Cleaned up the memmap code to get rid of inefficiency, and badly
written code.
* rulesets/Movement.cpp: Code formatting cleanup.
* server/Routing.h: Remove old commented out code.
* server/Account.cpp, server/Connection.cpp: Switched to using
USERNAME of accounts rather that ID for login and account creation.
Toughened up the connection code, so invalid login/create ops
are handled.
* server/Connection.h: Removed unused getObject method.
* rulesets/Character.cpp, rulesets/Character.h: Get rid of
inefficiency handling ops from internal and external mind. Fix
leak of some ops.
* common/BaseWorld.h, server/WorldRouter.cpp, server/WorldRouter.h:
Add method for getting a new serialno.
* rulesets/Thing.cpp, rulesets/Thing.h, server/WorldRouter.cpp:
Set refno on ops as they come back from entities. Set serialnos
on same ops at the same time, but do not set serialnos
on ops that come in from elsewhere, as those are now handled at
source.
* rulesets/Creator.cpp, rulesets/Character.cpp:
Ensure that ops from external client preserve their serialno,
and assign new serialnos to other ops created at the same time.
