]> git.tdb.fi Git - r2c2.git/log
r2c2.git
9 years agoPenalize running against the preferred direction when planning routes
Mikko Rasa [Sun, 22 Mar 2015 16:03:24 +0000 (18:03 +0200)]
Penalize running against the preferred direction when planning routes

9 years agoCosmetic tweaks
Mikko Rasa [Sun, 22 Mar 2015 16:02:25 +0000 (18:02 +0200)]
Cosmetic tweaks

9 years agoAdd explicit typecast to avoid infinite recursion
Mikko Rasa [Sun, 22 Mar 2015 16:01:58 +0000 (18:01 +0200)]
Add explicit typecast to avoid infinite recursion

9 years agoGive zones a preferred running direction
Mikko Rasa [Sun, 22 Mar 2015 15:58:41 +0000 (17:58 +0200)]
Give zones a preferred running direction

It's also reflected in tracks as a preferred exit endpoint to avoid
having to look up zones while routing.  Weird things may happen if a
track belongs to multiple zones.

9 years agoAdd a using statement for get_end in Zone
Mikko Rasa [Sun, 22 Mar 2015 15:32:16 +0000 (17:32 +0200)]
Add a using statement for get_end in Zone

The virtual function declaration hides the other overload if it's not
explicitly brought in.

9 years agoRetain addresses of previously seen locomotives
Mikko Rasa [Mon, 2 Mar 2015 21:16:20 +0000 (23:16 +0200)]
Retain addresses of previously seen locomotives

It may happen that a locomotive gets re-enumerated, e.g. after visiting
another layout.  Since they are identified by their address, it's useful
to keep the same address.

9 years agoRead MFX locomotive name
Mikko Rasa [Thu, 26 Feb 2015 17:29:37 +0000 (19:29 +0200)]
Read MFX locomotive name

9 years agoRewrite goal initialization for TrainRouteMetric
Mikko Rasa [Mon, 23 Feb 2015 14:42:00 +0000 (16:42 +0200)]
Rewrite goal initialization for TrainRouteMetric

The previous code incorrectly added all tracks as goals when a direction
was specified, instead of only the ends.  This caused cost estimate creep
in the route planner, resulting in suboptimal performance.

9 years agoUse cached path length from occupied_tracks
Mikko Rasa [Mon, 23 Feb 2015 14:41:02 +0000 (16:41 +0200)]
Use cached path length from occupied_tracks

TrackType::get_path_length is not only a function call but also loops
through all parts to calculate the length.

9 years agoFix a problem with estimated remaining distance in route planner
Mikko Rasa [Mon, 23 Feb 2015 14:40:02 +0000 (16:40 +0200)]
Fix a problem with estimated remaining distance in route planner

The front of the occupied tracks list contains the length of the chosen
path on the current track and needs to be updated when the path changes.

9 years agoFollow the same path until another is significantly better
Mikko Rasa [Mon, 23 Feb 2015 10:17:27 +0000 (12:17 +0200)]
Follow the same path until another is significantly better

This replaces the cost penalty for routing steps.  In the penalty approach
it was possible to get two or more steps with the same penalty, which
would then race with each other.  In the new approach, all other steps are
sorted by their unpenalized cost and only the preferred one gets special
treatment.

9 years agoConsider train length when calculating wait time estimate
Mikko Rasa [Mon, 23 Feb 2015 10:14:58 +0000 (12:14 +0200)]
Consider train length when calculating wait time estimate

This allows also estimating wait time when a train is blocked.

9 years agoReset wait time estimate when the train starts moving again
Mikko Rasa [Mon, 23 Feb 2015 10:13:25 +0000 (12:13 +0200)]
Reset wait time estimate when the train starts moving again

Just in case the estimate was too high.

9 years agoAdd an actual heuristic for wait time
Mikko Rasa [Sun, 22 Feb 2015 18:09:51 +0000 (20:09 +0200)]
Add an actual heuristic for wait time

9 years agoDon't go past end of allocation when checking blocks for a signal
Mikko Rasa [Sat, 21 Feb 2015 23:52:44 +0000 (01:52 +0200)]
Don't go past end of allocation when checking blocks for a signal

9 years agoDon't clear current_sequence in set_route
Mikko Rasa [Sat, 21 Feb 2015 23:38:31 +0000 (01:38 +0200)]
Don't clear current_sequence in set_route

It may be still needed by routers of other trains.

9 years agoRobustify sequence handling while applying route plans
Mikko Rasa [Sat, 21 Feb 2015 19:05:28 +0000 (21:05 +0200)]
Robustify sequence handling while applying route plans

Setting current_sequence of all participating routers to zero beforehand
will make sequence points involving them not cleared and avoid the need
to special case everything.

9 years agoOnly schedule a sequence check if we're waiting at a sequence point
Mikko Rasa [Sat, 21 Feb 2015 18:30:15 +0000 (20:30 +0200)]
Only schedule a sequence check if we're waiting at a sequence point

9 years agoCombine the sequence_check_pending flag with state
Mikko Rasa [Sat, 21 Feb 2015 18:29:30 +0000 (20:29 +0200)]
Combine the sequence_check_pending flag with state

9 years agoSprinkle some comments on the routing system
Mikko Rasa [Fri, 20 Feb 2015 22:46:46 +0000 (00:46 +0200)]
Sprinkle some comments on the routing system

9 years agoDon't bother with creating intermediate steps for state updates
Mikko Rasa [Fri, 20 Feb 2015 22:42:40 +0000 (00:42 +0200)]
Don't bother with creating intermediate steps for state updates

They were needed back when the wait system was different, but no longer
have any use.

9 years agoClear the critical flag one track earlier
Mikko Rasa [Fri, 20 Feb 2015 16:40:54 +0000 (18:40 +0200)]
Clear the critical flag one track earlier

Check_arrival is called when the train reaches the end of its current
track.  The flag should be cleared when the track it is entering is no
longer critical.

9 years agoMove duplicated successor step creation code to a function
Mikko Rasa [Fri, 20 Feb 2015 16:11:41 +0000 (18:11 +0200)]
Move duplicated successor step creation code to a function

9 years agoAllow direction to be specified for routing waypoints
Mikko Rasa [Fri, 20 Feb 2015 16:08:20 +0000 (18:08 +0200)]
Allow direction to be specified for routing waypoints

9 years agoSupport directionality for zones
Mikko Rasa [Fri, 20 Feb 2015 15:44:56 +0000 (17:44 +0200)]
Support directionality for zones

9 years agoStore zone blocks in order and use add_tracks to load them
Mikko Rasa [Fri, 20 Feb 2015 15:41:53 +0000 (17:41 +0200)]
Store zone blocks in order and use add_tracks to load them

9 years agoDon't save an allocated but pending block
Mikko Rasa [Fri, 20 Feb 2015 09:58:42 +0000 (11:58 +0200)]
Don't save an allocated but pending block

It could be a failed turnout which is still set the wrong way.

9 years agoCosmetic fixes
Mikko Rasa [Fri, 20 Feb 2015 09:54:15 +0000 (11:54 +0200)]
Cosmetic fixes

9 years agoDon't attempt to use planned route if no waypoints are set
Mikko Rasa [Fri, 20 Feb 2015 09:53:45 +0000 (11:53 +0200)]
Don't attempt to use planned route if no waypoints are set

9 years agoInitialize the halted flag of dummy driver
Mikko Rasa [Fri, 20 Feb 2015 09:50:54 +0000 (11:50 +0200)]
Initialize the halted flag of dummy driver

9 years agoAdd a dialog to display telemetry data from the driver
Mikko Rasa [Thu, 19 Feb 2015 13:44:28 +0000 (15:44 +0200)]
Add a dialog to display telemetry data from the driver

9 years agoAdd a common base class for dialogs that need to update dynamically
Mikko Rasa [Thu, 19 Feb 2015 13:31:56 +0000 (15:31 +0200)]
Add a common base class for dialogs that need to update dynamically

9 years agoUse deque rather than list for queues
Mikko Rasa [Thu, 19 Feb 2015 13:30:03 +0000 (15:30 +0200)]
Use deque rather than list for queues

List makes one allocation for every item, deque only one per a bunch of
items.

9 years agoProvide some telemetry values from ArduControl
Mikko Rasa [Thu, 19 Feb 2015 13:29:34 +0000 (15:29 +0200)]
Provide some telemetry values from ArduControl

9 years agoAdd telemetry framework for drivers
Mikko Rasa [Thu, 19 Feb 2015 12:01:52 +0000 (14:01 +0200)]
Add telemetry framework for drivers

9 years agoImprove ArduControl task scheduling
Mikko Rasa [Thu, 19 Feb 2015 09:18:02 +0000 (11:18 +0200)]
Improve ArduControl task scheduling

The new scheduler can handle multiple tasks with the same priority, so
other things won't get blocked by the priority command queue for too
long.  It also handles sleeping at the scheduler rather than individual
tasks.

9 years agoTurn ArduControl command_queue into a Task
Mikko Rasa [Mon, 16 Feb 2015 00:17:03 +0000 (02:17 +0200)]
Turn ArduControl command_queue into a Task

It seems that I was thinking of this back in d5d8ee8, but left it
unfinished probably because it was simpler to use a Queue directly.  Now
some upcoming task management improvements call for it to be a Task.

9 years agoDon't check sequence points while applying routes
Mikko Rasa [Sun, 15 Feb 2015 15:46:22 +0000 (17:46 +0200)]
Don't check sequence points while applying routes

The preceding train's routes might not be applied yet.  Instead queue a
sequence check to be done when all routes have been applied.

9 years agoCorrect TrackAttachment entry endpoint
Mikko Rasa [Sun, 15 Feb 2015 08:40:37 +0000 (10:40 +0200)]
Correct TrackAttachment entry endpoint

Since endpoint direction points outwards from the endpoint, we want to
find one that's as close to opposite to the TrackAttachment's direction
as possible.

9 years agoAlso check if the clock is stopped
Mikko Rasa [Sun, 15 Feb 2015 07:20:57 +0000 (09:20 +0200)]
Also check if the clock is stopped

9 years agoDon't eat away departure delay while halted
Mikko Rasa [Fri, 13 Feb 2015 00:50:36 +0000 (02:50 +0200)]
Don't eat away departure delay while halted

9 years agoDon't segfault if an emergency doesn't have a block
Mikko Rasa [Fri, 13 Feb 2015 00:48:03 +0000 (02:48 +0200)]
Don't segfault if an emergency doesn't have a block

9 years agoDeclare emergency if route planning fails
Mikko Rasa [Fri, 13 Feb 2015 00:47:25 +0000 (02:47 +0200)]
Declare emergency if route planning fails

9 years agoAbort route planning if it takes too long
Mikko Rasa [Fri, 13 Feb 2015 00:47:01 +0000 (02:47 +0200)]
Abort route planning if it takes too long

9 years agoBe more permissive when checking route continuity
Mikko Rasa [Thu, 12 Feb 2015 16:11:06 +0000 (18:11 +0200)]
Be more permissive when checking route continuity

In some cases more than one consecutive route may end on the same track,
or a route might only go one track past the previous one, with that track
being a turnout with undetermined path.  Allow skipping routes to deal
with these situations, as long as we don't go completely off route.

9 years agoEnsure that remaining estimate is negative if the waypoint is unreachable
Mikko Rasa [Thu, 12 Feb 2015 14:54:27 +0000 (16:54 +0200)]
Ensure that remaining estimate is negative if the waypoint is unreachable

9 years agoFix critical block logic
Mikko Rasa [Thu, 12 Feb 2015 14:46:45 +0000 (16:46 +0200)]
Fix critical block logic

First noncritical block is not reliable, as it could be outside of the
train's allocated blocks and not guaranteed to set to a consistent path.
Worse, the get_first_noncritical_block function could return a block on
the other side of a turnout which is changing path, and is_block_critical
used completely different logic.

9 years agoDon't allow trains to become blocked in critical blocks
Mikko Rasa [Thu, 12 Feb 2015 09:33:47 +0000 (11:33 +0200)]
Don't allow trains to become blocked in critical blocks

9 years agoAvoid arriving too early if there's an unexpected stop on the last route
Mikko Rasa [Wed, 11 Feb 2015 18:14:30 +0000 (20:14 +0200)]
Avoid arriving too early if there's an unexpected stop on the last route

If the final block of the route is allocated while the train is stopped,
arrival could be triggered prematurely.  I'm not entirely certain if this
can happen in absence of certain quirks of the dummy driver, but better
safe than sorry.

9 years agoBetter sequence syncing on route change
Mikko Rasa [Wed, 11 Feb 2015 16:28:49 +0000 (18:28 +0200)]
Better sequence syncing on route change

Immediately go into the wait state if an uncleared sequence point is
encountered during sync.

9 years agoApply all planned routes at once
Mikko Rasa [Wed, 11 Feb 2015 15:35:56 +0000 (17:35 +0200)]
Apply all planned routes at once

Letting each router to do it separately in the tick function causes
certain problems with synchronization.  In particular, sequence points
are difficult to synchronize unless the route update is atomic.

9 years agoAdd turnout failure simulation to the dummy driver
Mikko Rasa [Wed, 11 Feb 2015 12:54:49 +0000 (14:54 +0200)]
Add turnout failure simulation to the dummy driver

9 years agoEliminate an unnecessary variable
Mikko Rasa [Wed, 11 Feb 2015 12:54:42 +0000 (14:54 +0200)]
Eliminate an unnecessary variable

9 years agoUnify destination and waypoints
Mikko Rasa [Wed, 11 Feb 2015 12:43:15 +0000 (14:43 +0200)]
Unify destination and waypoints

Destination is really just a special case of a waypoint, so there's no
point in keeping it separate.  It just adds duplicated logic, which was
about to get worse with some upcoming new features.

9 years agoDo not allocate blocks while halt is in effect
Mikko Rasa [Wed, 11 Feb 2015 12:06:39 +0000 (14:06 +0200)]
Do not allocate blocks while halt is in effect

A turnout state change signal is emitted even if a failure is detected,
to indicate the end of the operation.  Resuming allocation in such a case
would cause the train to stray to an incorrect path.  It's better to wait
until the user has resolved the situation and removed the halt state.

9 years agoUse a shared white material for techniques
Mikko Rasa [Mon, 9 Feb 2015 17:41:17 +0000 (19:41 +0200)]
Use a shared white material for techniques

9 years agoInstantly set turnout paths when loading state
Mikko Rasa [Mon, 9 Feb 2015 17:33:41 +0000 (19:33 +0200)]
Instantly set turnout paths when loading state

Vehicles are placed immediately and will follow turnout paths.  Having
them in the wrong places confuses the route planner.

9 years agoMove block reservation signal serialization to Layout
Mikko Rasa [Mon, 9 Feb 2015 17:27:38 +0000 (19:27 +0200)]
Move block reservation signal serialization to Layout

It needs to be serialized between different blocks as well, since
TrainRouter at least expects to receive the signals in order.

9 years agoInitialize clock rate field with the current rate
Mikko Rasa [Fri, 6 Feb 2015 22:00:58 +0000 (00:00 +0200)]
Initialize clock rate field with the current rate

9 years agoInterpret turnout delay as float, not unsigned
Mikko Rasa [Fri, 6 Feb 2015 22:00:12 +0000 (00:00 +0200)]
Interpret turnout delay as float, not unsigned

9 years agoCosmetic fixes
Mikko Rasa [Fri, 6 Feb 2015 21:58:10 +0000 (23:58 +0200)]
Cosmetic fixes

9 years agoUse max/min for range capping
Mikko Rasa [Fri, 6 Feb 2015 21:55:14 +0000 (23:55 +0200)]
Use max/min for range capping

9 years agoSync timetable to clock on first tick
Mikko Rasa [Fri, 6 Feb 2015 14:45:54 +0000 (16:45 +0200)]
Sync timetable to clock on first tick

This is not perfect, but it allows some flexibility in restarting the
program.

9 years agoMake sure Block::signal_reserved is emitted consistently
Mikko Rasa [Fri, 6 Feb 2015 14:37:46 +0000 (16:37 +0200)]
Make sure Block::signal_reserved is emitted consistently

Sigc++ apparently takes arguments as references, so if someone reached to
a signal with null train by reserving the block again, any remaining slots
of the release emission would also get the new train pointer.  This caused
the routing system to malfunction in certain cases as the router saw two
emissions for the same block reservation.

The simplest solution would be to pass t instead of train to emit(), but
then the ordering of the two emissions would be inconsistent.  Thus the
additional logic to delay further emissions until the outstanding one is
completed.

9 years agoConsider block deallocation when planning routes
Mikko Rasa [Fri, 6 Feb 2015 14:32:18 +0000 (16:32 +0200)]
Consider block deallocation when planning routes

Blocks are not released until a sensor is detriggered.  Not taking that
into account could cause situations where the planner tries to drive
trains through a balloon loop which is actually too small for them.

9 years agoFurther improve lead route generation
Mikko Rasa [Fri, 6 Feb 2015 14:26:10 +0000 (16:26 +0200)]
Further improve lead route generation

The previous version generated nonsense if the first actual route was
completely covered by existing critical blocks.

9 years agoImmediately process sequence points that are already covered
Mikko Rasa [Fri, 6 Feb 2015 14:23:05 +0000 (16:23 +0200)]
Immediately process sequence points that are already covered

The planner starts from the front buffer of the train, so it may generate
sequence points in the existing critical blocks.

9 years agoDon't diverge from critical blocks
Mikko Rasa [Thu, 5 Feb 2015 18:02:20 +0000 (20:02 +0200)]
Don't diverge from critical blocks

Doing so could confuse the router.

9 years agoImprove metrics_stale flag handling
Mikko Rasa [Thu, 5 Feb 2015 16:03:25 +0000 (18:03 +0200)]
Improve metrics_stale flag handling

9 years agoEliminate a possible race condition in thread termination
Mikko Rasa [Thu, 5 Feb 2015 14:19:01 +0000 (16:19 +0200)]
Eliminate a possible race condition in thread termination

In the unlikely event that the thread doesn't terminate fast enough after
setting the goal pointer, deleting it would send it a kill signal.
Remove this possibility by explicitly jouning the thread.

9 years agoAllow an undetermined turnout at the beginning of a route
Mikko Rasa [Thu, 5 Feb 2015 14:01:13 +0000 (16:01 +0200)]
Allow an undetermined turnout at the beginning of a route

If route plans are regenerated when the train's last vehicle is on the
sensor following a turnout in a points-facing movement, the first track
of the lead route is a turnout with undetermined path.  Route_changed
would then try to figure out which route the next allocation will occur
on and fail at the very beginning because advance_to_track refused to
use the undetermined turnout.

9 years agoRestructure lead route generation
Mikko Rasa [Thu, 5 Feb 2015 13:58:45 +0000 (15:58 +0200)]
Restructure lead route generation

All of the relevant logic is now in one place.

9 years agoDon't access waypoint and metric data if the router has no destination
Mikko Rasa [Thu, 5 Feb 2015 13:53:32 +0000 (15:53 +0200)]
Don't access waypoint and metric data if the router has no destination

9 years agoDon't use bool for a counter variable
Mikko Rasa [Thu, 5 Feb 2015 13:06:57 +0000 (15:06 +0200)]
Don't use bool for a counter variable

9 years agoPenalize steps other than the fastest one
Mikko Rasa [Thu, 5 Feb 2015 08:48:48 +0000 (10:48 +0200)]
Penalize steps other than the fastest one

This encourages the planner to follow a single chain of steps and avoids
exploding the state tree too much.  In the future this may be replaced by
different speed limits on diverging paths of turnouts (reducing the
ambiguity of fastest path) and an actual heuristic for potential wait time
(giving wait states an implicit penalty).

9 years agoStore routing information in TrainRoutePlanner to avoid threading problems
Mikko Rasa [Thu, 5 Feb 2015 08:40:19 +0000 (10:40 +0200)]
Store routing information in TrainRoutePlanner to avoid threading problems

TrainRouter removes checkpoints when the train passes them, which will
cause problems if the planner is still running.

9 years agoResume allocation if a train moves out of its own way
Mikko Rasa [Wed, 4 Feb 2015 12:15:11 +0000 (14:15 +0200)]
Resume allocation if a train moves out of its own way

The normal handling in block_reserved() does not work, since by that time
release_block() has already cleared pending_block.

9 years agoUnoccupy destination during planning when the train has departed again
Mikko Rasa [Tue, 3 Feb 2015 23:25:32 +0000 (01:25 +0200)]
Unoccupy destination during planning when the train has departed again

9 years agoEliminate the one step delay in adding tracks to routes
Mikko Rasa [Tue, 3 Feb 2015 22:37:24 +0000 (00:37 +0200)]
Eliminate the one step delay in adding tracks to routes

It is no longer necessary now that we inspect linked tracks to detect
loops.  Removing it makes the logic easier to understand.

9 years agoMake route planning threaded
Mikko Rasa [Tue, 3 Feb 2015 21:47:17 +0000 (23:47 +0200)]
Make route planning threaded

It can take several seconds in some cases, which would cause an
unacceptable pause in simulation and control.

9 years agoAvoid creating needlessly long lead routes
Mikko Rasa [Tue, 3 Feb 2015 15:58:16 +0000 (17:58 +0200)]
Avoid creating needlessly long lead routes

Mostly a cosmetic fix.

9 years agoSkip routes that are completely covered by the lead route
Mikko Rasa [Tue, 3 Feb 2015 15:29:22 +0000 (17:29 +0200)]
Skip routes that are completely covered by the lead route

Advance_to_track throws a fit if no advancement happens from one route to
the next.

9 years agoUpdate routes for all involved trains when planning completes
Mikko Rasa [Tue, 3 Feb 2015 15:21:33 +0000 (17:21 +0200)]
Update routes for all involved trains when planning completes

Sequencing is likely to have changed even if routes haven't.

9 years agoAvoid going past the end of route when a new one is set
Mikko Rasa [Tue, 3 Feb 2015 14:23:01 +0000 (16:23 +0200)]
Avoid going past the end of route when a new one is set

Calling stop_at(0) causes the block allocator to immediately resume
allocating blocks.  In certain circumstances this would cause an
allocation past the end of the route.

9 years agoMake sure the shadow volume does not have zero size
Mikko Rasa [Mon, 2 Feb 2015 17:51:42 +0000 (19:51 +0200)]
Make sure the shadow volume does not have zero size

9 years agoImprove accessory switching logic
Mikko Rasa [Mon, 2 Feb 2015 17:40:43 +0000 (19:40 +0200)]
Improve accessory switching logic

The off command can be sent as soon as the current monitor indicates that
the solenoid is no longer drawing power.  This allows giving multi-bit
accessories more time to accommodate quirks of the 74465 decoder.

9 years agoAdd debug output for accessory switching in ArduControl
Mikko Rasa [Mon, 2 Feb 2015 17:37:16 +0000 (19:37 +0200)]
Add debug output for accessory switching in ArduControl

9 years agoAvoid invalid states when setting multi-bit accessories
Mikko Rasa [Mon, 2 Feb 2015 17:21:53 +0000 (19:21 +0200)]
Avoid invalid states when setting multi-bit accessories

9 years agoAdd a dialog to control the clock
Mikko Rasa [Fri, 30 Jan 2015 09:03:34 +0000 (11:03 +0200)]
Add a dialog to control the clock

9 years agoEnsure that Timetable has necessary helper AIs
Mikko Rasa [Thu, 29 Jan 2015 16:50:52 +0000 (18:50 +0200)]
Ensure that Timetable has necessary helper AIs

Since AIControl and TrainRouter don't emit statements to the state file,
they are not created automatically when loading the state.  If they are
missing, the timetable won't be able to operate.

9 years agoAdapt to changes in vector slicing and composing API
Mikko Rasa [Wed, 28 Jan 2015 18:47:28 +0000 (20:47 +0200)]
Adapt to changes in vector slicing and composing API

10 years agoSet lighting for the sky pass too
Mikko Rasa [Sun, 13 Jul 2014 13:56:11 +0000 (16:56 +0300)]
Set lighting for the sky pass too

Otherwise whatever parameters were there before will get used, resulting
in incorrect rendering with multiple views.

10 years agoImprove lighting color computations
Mikko Rasa [Sun, 13 Jul 2014 13:48:14 +0000 (16:48 +0300)]
Improve lighting color computations

This produces a bit too bluish skylight and a bit too reddish sunlight,
but it's a step in the right direction.

10 years agoImprove graphics quality with some shaders and effects
Mikko Rasa [Thu, 8 May 2014 21:39:11 +0000 (00:39 +0300)]
Improve graphics quality with some shaders and effects

Lighting is now carried out in linear colorspace and sRGB conversion
applied in postprocessing.  All these effects will probably make the
program really slow on lower-end machines, but I'll fix that later.

10 years agoGet rid of some obsolete #includes
Mikko Rasa [Thu, 8 May 2014 15:27:10 +0000 (18:27 +0300)]
Get rid of some obsolete #includes

10 years agoAvoid segfault if an exception is thrown while loading
Mikko Rasa [Wed, 7 May 2014 20:26:13 +0000 (23:26 +0300)]
Avoid segfault if an exception is thrown while loading

The Layout::add functions are called from object constructors.  If an
exception is thrown inside them, the constructor will abort and the
object will be deleted.  If that happens, it must be removed from the
Layout as well, or an invalid memory access will occur later.

10 years agoReorganize data files into a directory structure
Mikko Rasa [Wed, 7 May 2014 20:14:49 +0000 (23:14 +0300)]
Reorganize data files into a directory structure

All object types have been split out of the *.dat files into individual
files.  As a side effect, their names have acquired a type-specific
suffix.

10 years agoBe more consistent with the use of name and description
Mikko Rasa [Sun, 4 May 2014 21:08:46 +0000 (00:08 +0300)]
Be more consistent with the use of name and description

10 years agoRemove some unnecessary things
Mikko Rasa [Sun, 4 May 2014 20:23:59 +0000 (23:23 +0300)]
Remove some unnecessary things

10 years agoRework article numbers
Mikko Rasa [Sun, 4 May 2014 19:10:34 +0000 (22:10 +0300)]
Rework article numbers