diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2012-05-07 12:08:32 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2012-05-07 12:08:32 +0200 |
| commit | 9d44cb5ddc88a867668a3ff04917fab5e50b1974 (patch) | |
| tree | 796d67c25cb0a2031288c7a6ca0a64e70bd9dd98 /lib | |
| parent | 2c4c391d054ddaf6c2f5caa6912d50c120285c42 (diff) | |
| download | edoors-ruby-9d44cb5ddc88a867668a3ff04917fab5e50b1974.zip edoors-ruby-9d44cb5ddc88a867668a3ff04917fab5e50b1974.tar.gz | |
Room: route_p call error! when door_name is empty?
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/evendoors.rb | 11 | ||||
| -rw-r--r-- | lib/evendoors/room.rb | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/evendoors.rb b/lib/evendoors.rb index 408549e..29b6d66 100644 --- a/lib/evendoors.rb +++ b/lib/evendoors.rb @@ -20,10 +20,13 @@ module EvenDoors LNK_CONDV = 'edoors_lnk_condv'.freeze # ERROR_FIELD = 'edoors_error'.freeze - ERROR_ROUTE_RRWD = 'routing error: right room, wrong door'.freeze - ERROR_ROUTE_TRWR = 'routing error: top room, wrong room'.freeze - ERROR_ROUTE_NDNL = 'routing error: no destination, no link'.freeze - ERROR_ROUTE_SND = 'routing error: system no destination'.freeze + ERROR_ROUTE_ND = 'routing error: no door name'.freeze + ERROR_ROUTE_NMD = 'routing error: no more destination'.freeze + ERROR_ROUTE_RRWD = 'routing error: right room, wrong door'.freeze + ERROR_ROUTE_TRWR = 'routing error: top room, wrong room'.freeze + ERROR_ROUTE_NDNL = 'routing error: no destination, no link'.freeze + ERROR_ROUTE_SND = 'routing error: system no destination'.freeze + ERROR_ROUTE_SNDNA = 'routing error: system no door, no action'.freeze # class Exception < ::Exception; end # diff --git a/lib/evendoors/room.rb b/lib/evendoors/room.rb index 2a38ac9..4214965 100644 --- a/lib/evendoors/room.rb +++ b/lib/evendoors/room.rb @@ -75,7 +75,9 @@ module EvenDoors end # def route_p p, door_name - if p.room.nil? or p.room==path + if door_name.empty? + p.error! EvenDoors::ERROR_ROUTE_NDN + elsif p.room.nil? or p.room==path if door = @spots[door_name] p.dst_done! door else |