ifmapper 0.9.6 → 0.9.7

data/lib/IFMapper/Section.rb

@@ -35,7 +35,7 @@ class Section
   # Return the min and max coordinates of all rooms in page
   #
   def min_max_rooms
-    return [0, 0] if @rooms.empty?
+    return [[0, 0],[0, 0]] if @rooms.empty?
     
     minXY = [ @rooms[0].x, @rooms[0].y ]
     maxXY = minXY.dup
@@ -122,10 +122,10 @@ class Section
     # Verify rooms exist in section (ie. don't allow links across
     # sections)
     if not @rooms.include?(roomA)
-      raise ConnectionError, "Room #{roomA} not in section #{self}"
+      raise ConnectionError, "Room '#{roomA}' not in section #{self}"
     end
     if roomB and not @rooms.include?(roomB)
-      raise ConnectionError, "Room #{roomB} not in section #{self}"
+      raise ConnectionError, "Room '#{roomB}' not in section #{self}"
     end
 
     c = Connection.new( roomA, roomB )
@@ -167,6 +167,7 @@ class Section
   def initialize()
     @rooms       = []
     @connections = []
+    @name        = ''
   end
 
   protected
@@ -189,9 +190,9 @@ EOF
 
     if roomA[exitA]
       if not @connections.include?(roomA[exitA])
-	raise ConnectionError, "roomA exit #{exitA} for #{roomA} filled but not in section"
+	raise ConnectionError, "roomA exit #{exitA} for '#{roomA}' filled but not in section"
       end
-      raise ConnectionError, "roomA exit #{exitA} for #{roomA} is filled" 
+      raise ConnectionError, "roomA exit #{exitA} for '#{roomA}' is filled" 
     end
 
     roomA[exitA] = c
@@ -211,7 +212,7 @@ EOF
 
     if roomB and roomB[exitB] and roomB[exitB] != c
       roomA[exitA] = nil
-      raise ConnectionError, "roomB exit #{exitB} for #{roomB} is filled" 
+      raise ConnectionError, "roomB exit #{exitB} for #{roomB} is filled with #{roomB[exitB]}" 
     end
     roomB[exitB] = c if roomB
 

data/lib/IFMapper/TADSReader.rb

@@ -1,16 +1,25 @@
 
-require "IFMapper/Map"
+require 'IFMapper/MapReader'
+
+
+# Take a quoted TADS string and return a valid ASCII one, replacing
+# TADS's special characters.
+module TADSUnquote
+  def unquote(text)
+    return '' unless text
+    text.gsub!(/\\'/, "'")  # restore quotes
+    text.gsub!(/\\"/, '"')  # restore quotes
+    text.gsub!(/<<.*>>/, '')  # remove embedded functions
+    text.gsub!(/<\/?q>/, '"') # Change quotes
+    return text
+  end
+end
 
-class FXMap; end
 
 #
 # Class that allows creating a map from an TADS source file.
 #
-class TADSReader
-
-  class ParseError < StandardError; end
-  class MapError < StandardError; end
-
+class TADSReader < MapReader
 
   # TADS 3 directional properties need to be spelled fully
   DIRECTIONS = { 
@@ -41,8 +50,6 @@ class TADSReader
   # Equal sign (TADS supports C or Pascal-like =)
   EQ = '\s*(?:=|\:=)\s*'
 
-  # Direction list in order of positioning preference.
-  DIRLIST = [ 0, 4, 2, 6, 1, 3, 5, 7 ]
 
   DIR_EQ     = "(#{DIRECTIONS.keys.join('|')})#{EQ}"
   DIR_TO     = /(?:^|\s+)#{DIR_EQ}/
@@ -51,7 +58,7 @@ class TADSReader
   DIR_INSELF = /(?:^|\s+)#{DIR_EQ}\(\s*[\d\w]+\.isIn\(\s*self\s*\)\s*\?\s*([\d\w]+)/
   DIR_MSG    = /(?:^|\s+)(#{DIRECTIONS.keys.join('|')})\s*\:\s*TravelMessage\s*\{\s*\->\s*(\w+)/
 
-  ENTER_DIR = //i # needed?
+  ENTER_DIR = /(?:^|\s+)(#{DIRECTIONS.keys.join('|')})\s*:\s*.*<<replaceAction\(Enter\s*,\s*(\w+)/i 
 
   OBJLOCATION = /(?:^|\s+)(?:(?:destination|location)#{EQ}(\w+)|@(\w+)|locationList#{EQ}\[([\w\s,]+)\])/
   OBJNAME     = /(?:^|\s+)name#{EQ}(?:'#{SQ}'|\(\s*described\s*\?\s*'#{SQ}')/
@@ -76,84 +83,47 @@ class TADSReader
   STD_LIB = [
     'adv3.h',
     'en_us.h',
+    'bignum.h',
+    'array.h',
+    'tok.h',
+    'bytearr.h',
+    'charset.h',
+    'dict.h',
+    'reflect.h',
+    'gramprod.h',
+    'systype.h',
+    'tads.h',
+    'tadsgen.h',
+    'tadsio.h',
+    't3.h',
+    'vector.h',
+    'file.h',
+    't3test.h',
+    'strcomp.h',
   ]
 
 
-  # Take a quoted TADS string and return a valid ASCII one, replacing
-  # TADS's special characters.
-  def self.unquote(text)
-    return '' unless text
-    text.gsub!(/\\'/, "'")  # restore quotes
-    text.gsub!(/\\"/, '"')  # restore quotes
-    text.gsub!(/<<.*>>/, '')  # remove embedded functions
-    text.gsub!(/<\/?q>/, '"') # Change quotes
-    return text
-  end
-
-  # Temporary classes used to store inform room information
-  class TADSObject
-    attr_reader   :name
-    attr_accessor :tag, :location, :enterable
-
-    def name=(x)
-      @name = TADSReader::unquote(x)
-    end
+  attr_reader :map
 
-    def to_s
-      "#@name tag:#@tag"
-    end
 
-    def method_missing(*a)
-    end
 
-    def initialize(location)
-      if location
-	@location = Array[*location]
-      else
-	@location = []
-      end
-      @enterable = []
-    end
-  end
+  include TADSUnquote
 
-  class TADSDoor
-    attr_accessor :location, :locked, :connector, :tag
-    def method_missing(*x)
-    end
-    def initialize
-      @location = []
-    end
+  class TADSRoom < MapRoom
+    include TADSUnquote
   end
 
-  class TADSRoom
-    attr_reader   :name
-    attr_accessor :exits, :tag, :light, :desc
-    def to_s
-      "#@name tag:#@tag"
-    end
-    def num_exits
-      return @exits.nitems
-    end
-    def name=(x)
-      @name = TADSReader::unquote(x)
-    end
-    def method_missing(*x)
-    end
-    def initialize
-      @desc     = ''
-      @light    = true
-      @exits    = Array.new(12, nil)
-    end
+  class TADSObject < MapObject
+    include TADSUnquote
   end
 
 
-  attr_reader :map
+  def new_room
+    super(TADSRoom)
+  end
 
-  @@debug = nil
-  def debug(*x)
-    return unless @@debug
-    $stdout.puts x
-    $stdout.flush
+  def new_obj(loc = nil)
+    super(loc, TADSObject)
   end
 
   #
@@ -198,10 +168,11 @@ class TADSReader
       begin
 	parse_line
       rescue ParseError, MapError => e
-	$stderr.puts
-	$stderr.puts "#{e} at #{file.path}, line #{line_number}:"
-	$stderr.puts ">>>> #{full_line};"
-	$stderr.puts
+	message = "#{e}.\nat #{file.path}, line #{line_number}:\n>>>> #{full_line};\n"
+	raise message
+      rescue => e
+	message = "#{e}\n#{e.backtrace}" 
+	raise message
       end
     end
     debug "...End Parse..."
@@ -209,26 +180,6 @@ class TADSReader
 
 
 
-  def new_room
-    # We assume we are a room (albeit we could be an obj)
-    @room = TADSRoom.new
-    @room.tag   = @tag
-    @room.name  = @name
-    @room.desc  = @desc
-    @tags[@tag] = @room
-    @rooms << @room
-  end
-
-  def new_obj(loc = nil)
-    debug "+++ OBJECT #@name"
-    @obj = TADSObject.new(loc)
-    @obj.tag  = @tag
-    @obj.name = @name
-    @tags[@tag] = @obj
-    @objects << @obj
-  end
-
-
   def find_file(file)
     return file if File.exists?(file)
     @include_dirs.each { |d|
@@ -265,7 +216,7 @@ class TADSReader
 	if file
 	  File.open(file, 'r') { |f| parse(f) }
 	else
-	  raise ParseError, "Include file #{name} not found"
+	  raise ParseError, "Include file '#{name}' not found"
 	end
       end
     end
@@ -307,18 +258,29 @@ class TADSReader
       return
     end
 
+    if @gameid and @line =~ /name\s*=\s*'(#{SQ})'/
+      @map.name = $1
+    end
 
     # TADS3 definition is like:
     #  [+] [TAG:] Classes ['adjective nouns'] 'Name' @location
     re = /^#{PLUS}#{TAG}#{CLS}#{NOMS}#{NAME}#{LOC}/
     if @line =~ re
 
+
       prev  = $1
       @name = [$5, $4]
       @tag  = $2
       @clas = $3  # can be several classes
       @in_desc = false
 
+      if @tag 
+	if @clas == "GameID"
+	  @gameid = true
+	else
+	  @gameid = false
+	end
+      end
 
       loc  = $6
       if prev and @room
@@ -344,36 +306,28 @@ class TADSReader
       elsif @clas =~ /\bRoomConnector\b/
 	debug "+++ CONNECTOR TAG: #@tag"
 	@desc = ''
-	@obj = TADSDoor.new
+	new_door(loc)
 	@obj.connector = true
-	@obj.tag = @tag
-	@tags[@tag] = @obj
-	@doors << @obj
       elsif @clas =~ /\b(?:(?:Hidden|Secret)?Door|ThroughPassage|PathPassage|TravelWithMessage|Stairway(?:Up|Down))\b/
 	@desc = ''
 	@name = @name[0] || @name[1]
 	@tag  = @name if not @tag
 	debug "+++ DOOR #@tag"
 	if @clas =~ /\s+->\s*(\w+)/
-	  debug "\tmatching side: #{@tag} -> #$1"
 	  # this is the other side of the door... find matching side
 	  @obj = @tags[$1]
 	  if not @obj
-	    @obj = TADSDoor.new
-	    @obj.tag  = @tag
+	    new_door(loc)
 	    @tags[$1] = @obj
+	  else
+	    @tags[@tag] = @obj
+	    @obj.location << loc if loc
 	  end
-	  @tags[@tag] = @obj
-	  @obj.location << loc if loc
 	else
-	  @obj = @tags[@tag] || TADSDoor.new
+	  new_door(loc) if @tag
 	  @obj.locked = true if @clas =~ /\bLockable(WithKey)?\b/
-	  @obj.tag = @tag
-	  @obj.location = [loc] if loc
-	  @tags[@tag] = @obj
-	  @doors << @obj
 	end
-	@obj.connector = true if @clas =~ /Passage|Stairway/
+	@obj.connector = true if @clas !~ /\b(?:Hidden|Secret)?Door\b/
       elsif @clas =~ /\b(?:Thing|Food|Person)\b/
 	@obj = nil
 	@desc = ''
@@ -381,7 +335,19 @@ class TADSReader
 	@name = '' if @name =~ /\//
 	@tag  = @name if not @tag
 	new_obj(loc) if @tag
+      elsif @clas =~ /\bEnterable\b/ and @tag
+	@desc = ''
+	@name = @name[0] || @name[1]
+	@name = '' if @name =~ /\//
+	@tag  = @name if not @tag
+	new_obj(loc)
+	if @clas =~ /\s+->\s*(\w+)/
+	  @obj.enterable << $1
+	end
       else
+	if @tag
+	  @obj = nil
+	end
 	@name = (@name[0] || @name[1] || @tag)
       end
 
@@ -396,19 +362,20 @@ class TADSReader
     end
 
     if @obj
-
       if @obj.name == '' and @line =~ /^\s*#{NOMS}#{NAME}\s*$/
 	name = $2 || $1
 	@obj.name = name
       end
       @obj.name = $1 || $2 if @line =~ OBJNAME
       if @line =~ OBJLOCATION
-	if $1
-	  locs = $1.split(/\s*,\s*/)
+	loc = $1 || $2 || $3
+	if loc
+	  locs = loc.split(/\s*,\s*/)
 	  @obj.location += locs
+	  @obj.location.uniq!
 	end
       end
-      @obj.location << $1 if @obj.connector and @line =~ CONNECTOR
+      @obj.location << loc if @obj.connector and @line =~ CONNECTOR
     end
 
     if @room and @line =~ ROOMNAME
@@ -422,385 +389,23 @@ class TADSReader
     end
 
     # dirs = @line.scan(DIR_TO) + @line.scan(DIR) + @line.scan(DIR_MSG)
-    dirs = @line.scan(DIR) + @line.scan(DIR_MSG) + @line.scan(DIR_OPEN) + @line.scan(DIR_INSELF)
-    if dirs.size > 0
-      dirs.each { |d, room|
-	next if not room or room == 'nil' or room == 'noTravel'
-	dir = DIRECTIONS[d]
-	@room.exits[dir] = room
-      }
-    end
-
-  end
-
-
-  def shift_link(room, dir)
-    idx = dir + 1
-    idx = 0 if idx > 7
-    while idx != dir
-      break if not room[idx]
-      idx += 1
-      idx = 0 if idx > 7
-    end
-    if idx != dir
-      room[idx] = room[dir]
-      room[dir] = nil
-      # get position of other room
-      ox, oy = Room::DIR_TO_VECTOR[dir]
-      c = room[idx]
-      if c.roomA == room
-	b = c.roomB
-      else
-	b = c.roomA
-      end
-      x, y = [b.x, b.y]
-      x -= ox
-      y -= oy
-      dx, dy = Room::DIR_TO_VECTOR[idx]
-      @map.shift(x, y, -dx, -dy)
-    else
-      # raise "Warning.  Cannot shift connection for #{room}."
-    end
-  end
-
-
-  def oneway_link?(a, b)
-    # First, check if room already has exit moving towards other room
-    a.exits.each_with_index { |e, idx|
-      next if not e or e.dir != Connection::AtoB
-      roomA = e.roomA
-      roomB = e.roomB
-      if roomA == a and roomB == b
-	return e
-      end
-    }
-    return nil
-  end
-
-
-  # Choose a direction to represent up/down/in/out.
-  def choose_dir(a, b, go = nil, exitB = nil)
-    if go
-      rgo = go % 2 == 0? go - 1 : go + 1
-      # First, check if room already has exit moving towards other room
-      a.exits.each_with_index { |e, idx|
-	next if not e
-	roomA = e.roomA
-	roomB = e.roomB
-	if roomA == a and roomB == b
-	  e.exitAtext = go
-	  return idx
-	elsif roomB == a and roomA == b
-	  e.exitBtext = go
-	  return idx
-	end
-      }
-    end
-
-    # We prefer directions that travel less... so we need to figure
-    # out where we start from...
-    if b
-      x = b.x
-      y = b.y
-    else
-      x = a.x
-      y = a.y
-    end
-    if exitB
-      dx, dy = Room::DIR_TO_VECTOR[exitB]
-      x += dx
-      y += dy
-    end
-
-    # No such luck... Pick a direction.
-    best = nil
-    bestscore = nil
-
-    DIRLIST.each { |dir|
-      # We prefer straight directions to diagonal ones
-      inc   = dir % 2 == 1 ? 100 : 140
-      score = 1000
-      # We prefer directions where both that dir and the opposite side
-      # are empty.
-      if (not a[dir]) or a[dir].stub?
-	score += inc
-	score += 4 if a[dir] #attaching to stubs is better
-      end
-#       rdir  = (dir + 4) % 8
-#       score += 1   unless a[rdir]
-
-      # Measure distance for that exit, we prefer shorter
-      # paths
-      dx, dy = Room::DIR_TO_VECTOR[dir]
-      dx = (a.x + dx) - x
-      dy = (a.y + dy) - y
-      d = dx * dx + dy * dy
-      score -= d
-      next if bestscore and score <= bestscore
-      bestscore = score
-      best = dir
-    }
-
-    if not bestscore
-      raise "No free exit for choose_dir"
-    end
-
-    return best
-  end
-
-  def make_room(to, x, y, dx = 1, dy = 0)
-    if not @map.free?(x, y)
-      @map.shift(x, y, dx, dy)
-    end
-    room = @map.new_room(x, y)
-    room.name = to.name
-    desc = to.desc
-    desc.gsub!(/[\t\n]/, ' ')
-    desc.squeeze!(' ')
-    room.desc     = TADSReader::unquote(desc)
-    room.darkness = !to.light
-    @tags[to.tag] = room
-    return room
-  end
-
-  def get_exit(from, to, x, y, dx = 1, dy = 0 )
-    elem = @tags[to.tag]
-    if elem.kind_of?(TADSRoom)
-      room = create_room(to, x, y, dx, dy)
-      return [room, Connection::FREE]
-    elsif elem.kind_of?(TADSDoor)
-      if elem.connector
-	type = Connection::FREE
-      elsif elem.locked
-	type = Connection::LOCKED_DOOR
-      else
-	type = Connection::CLOSED_DOOR
-      end
-
-      @rooms.each { |o|
-	next if @tags[o.tag] == from
-	o.exits.each { |e|
-	  next unless e
-	  if @tags[e] == elem
-	    res = create_room( o, x, y, dx, dy )
-	    return [ res, type ]
-	  end
+    if @room
+      dirs = ( @line.scan(DIR) + @line.scan(DIR_MSG) + 
+	       @line.scan(DIR_OPEN) + @line.scan(DIR_INSELF) +
+	      @line.scan(ENTER_DIR) )
+      if dirs.size > 0
+	dirs.each { |d, room|
+	  next if not room or room == 'nil' or room =~ /^noTravel/
+	  dir = DIRECTIONS[d]
+	  @room.exits[dir] = room
 	}
-      }
-
-      # Okay, connecting room is missing.  Check door's locations property
-      elem.location.each { |tag|
-	next if @tags[tag] == from
-	@rooms.each { |o|
-	  next if o.tag != tag
-	  res = create_room( o, x, y, dx, dy )
-	  return [ res, type ]
-	}
-      }
-      
-      #raise MapError, "error: no room with door #{to.name} #{elem.name}"
-      return [nil, nil]
-    else
-      return [elem, Connection::FREE]
-    end
-  end
-
-  def create_room(r, x, y, dx = 2, dy = 0)
-    return @tags[r.tag] if @tags[r.tag].kind_of?(Room)
-    from, = make_room(r, x, y, dx, dy)
-    debug "CREATE ROOM #{r.name} TAG:#{r.tag}"
-
-    r.exits.each_with_index { |e, exit|
-      next unless e
-      next if e == 'nothing' or e == '0'
-      debug "#{r.name} EXIT:#{exit} points to #{e}"
-
-      to = @tags[e]
-      if not to
-	next if @functions.include?(e)
-	if not to
-	  $stderr.puts "Exit to #{e} (#{e.class}) not found, ignored." 
-	  next
-	end
-      end
-
-      go = c = nil
-
-      dir  = exit
-      type = 0
-
-#       # If exit leads to an enterable object, find out where does that
-#       # enterable object lead to.
-#       if to.kind_of?(TADSObject)
-# 	rooms = to.enterable
-# 	rooms.each { |room|
-# 	  next if room == r
-# 	  to = @tags[room]
-# 	  break
-# 	}
-# 	# Skip it if we are still an object.  This means we are just
-# 	# a container, like the phone booth in the Fate game demo.
-# 	next if to.kind_of?(TADSObject)
-#       end
-
-      if to.kind_of?(TADSRoom) or to.kind_of?(TADSDoor)
-	if dir > 7
-	  # choose a dir for up/down/in/out
-	  go = dir - 7
-	  dir = choose_dir(from, nil, go)
-	end
-
-	dx, dy = Room::DIR_TO_VECTOR[dir]
-	x = from.x + dx
-	y = from.y + dy
-	debug "#{exit} CREATE TO #{from} -> #{to.tag}"
-	to, type = get_exit(from, to, x, y, dx, dy)
-	next if not to
-      end
-
-      if exit > 7
-	# choose a dir for up/down/in/out
-	go = exit - 7
-	dir = choose_dir(from, to, go)
-      end
-
-      b = @rooms.find { |r2| r2.tag == e }
-      odir = nil
-      odir = b.exits.rindex(r.tag) if b
-      odir = (dir + 4) % 8 if not odir or odir > 7
-
-      if from[dir]
-	c = from[dir]
-	if to.exits.rindex(c) and c.roomB == from
-	  debug "LINK TRAVELLED BOTH"
-	  c.dir = Connection::BOTH
-	  c.exitBtext = go if go
-	  next
-	else
-	  debug "#{exit} FROM #{from}->#{to} BLOCKED DIR: #{dir}"
-	  shift_link(from, dir)
-	end
-      end
-
-      # Check we don't have a connection already
-      if to[odir]
-	c = to[odir]
-	debug "#{from} #{dir} -> #{to} dir:#{odir} filled.  Swap..."
-
-	# We need to change odir to something else
-	rgo = 0
-	if go
-	  rgo = go % 2 == 0? go - 1 : go + 1
-	end
-
-	# First, check if we have a dangling one-way link going to->from
-	# If we do, we use it.
-	c = oneway_link?(from, to)
-	if not c
-	  odir = choose_dir(to, from, rgo, dir)
-	  debug "Swapped to #{odir}"
-	else
-	  debug "FOUND LINK #{c} -- filling it."
-	  idx = from.exits.index(c)
-	  from[idx] = nil
-	  from[dir] = c
-	  c.dir = Connection::BOTH
-	  c.exitBtext = go if go
-	end
-      else
-	debug "to[odir] empty."
-	# First, check if we have a dangling one-way link going to->from
-	# If we do, we use it.
-	c = oneway_link?(to, from)
-	if c
-	  debug "FOUND LINK #{c} -- filling it."
-	  idx = from.exits.index(c)
-	  from[idx] = nil
-	  from[dir] = c
-	  c.dir = Connection::BOTH
-	  c.exitBtext = go if go
-	end
-      end
-
-      if not c
-	debug "NEW LINK #{from} #{dir} to #{to} #{odir}"
-	begin
-	  c     = @map.new_connection(from, dir, to, odir)
-	  c.exitAtext = go if go
-	  c.dir = Connection::AtoB
-	  c.type = type
-	rescue Section::ConnectionError
-	end
       end
-    }
-
-    return from
-  end
-
-  #
-  # Create all the stuff we found
-  #
-  def create
-    @rooms = @rooms.sort_by { |r| r.num_exits }
-    @rooms.reverse!
+    end
 
-    @rooms.each { |r| 
-      min, max = @map.sections[@map.section].min_max_rooms
-      create_room(r, max[0] + 2, 0)
-    }
-    @rooms = []
-    
-    # Add objects to rooms
-    @objects.each { |obj|
-      obj.location.each { |loc|
-	r = @tags[loc]
-	next unless r and r.kind_of?(Room)
-	r.objects << obj.name + "\n"
-      }
-    }
   end
 
 
-  if RUBY_PLATFORM =~ /win/
-    SEP = ';'
-  else
-    SEP = ':'
-  end
 
-  #
-  # Bring up the TADS properties window, to allow user to change
-  # settings
-  #
-  def properties
-    decor = DECOR_TITLE|DECOR_BORDER
-
-    dlg = FXDialogBox.new( @map.window.parent, "TADS Settings", decor )
-    mainFrame = FXVerticalFrame.new(dlg,
-				    FRAME_SUNKEN|FRAME_THICK|
-				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
-
-    frame = FXHorizontalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-
-    FXLabel.new(frame, "Include Dirs: ", nil, 0, LAYOUT_FILL_X)
-    inc = FXTextField.new(frame, 80, nil, 0, LAYOUT_FILL_ROW)
-    inc.text = @include_dirs.join(SEP)
-
-    buttons = FXHorizontalFrame.new(mainFrame, 
-				    LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|
-				    PACK_UNIFORM_WIDTH)
-    # Accept
-    FXButton.new(buttons, "&Accept", nil, dlg, FXDialogBox::ID_ACCEPT,
-		 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-    
-    # Cancel
-    FXButton.new(buttons, "&Cancel", nil, dlg, FXDialogBox::ID_CANCEL,
-		 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-    if dlg.execute != 0
-      @include_dirs = inc.text.split(SEP)
-      return true
-    end
-    return false
-  end
 
   def parse_makefile(file)
     dir = File.dirname(file)
@@ -835,26 +440,7 @@ class TADSReader
     }
   end
 
-  def initialize(file, map = Map.new('TADS Map'))
-    debug "Initialize"
-    @classes = { 'Object' => {} }
-    @tags    = {}
-    @map     = map
-    @objects = []
-    @doors   = []
-    @functions = []
-    @rooms   = []
-
-    @include_dirs = [File.dirname(file)]
-    set_include_dirs
-
-
-    debug "Get properties"
-    if @map.kind_of?(FXMap)
-      return unless properties
-    end
-
-
+  def read_file(file)
     if file =~ /.t3m/
       files = parse_makefile(file)
     else
@@ -862,28 +448,14 @@ class TADSReader
     end
 
     files.each_with_index { |file, idx|
-      debug "Start parsing #{file}"
-      File.open(file) { |f|
-	parse(f)
-      }
-      debug "Done parsing #{file}"
+      super(file)
     }
+  end
 
-    puts "Rooms: #{@rooms.size}"
-    puts "Doors/Connectors: #{@doors.size}"
-    puts "Objects: #{@objects.size}"
-
-    create
-    debug "Done creating #{file}"
-
-    if @map.kind_of?(FXMap)
-      @map.filename   = file.sub(/\.t$/i, '.map')
-      @map.options['Location Description'] = true
-      @map.window.show
-    end
-    @objects   = nil
-    @tags      = nil   # save some memory by clearing the tag list
-    @rooms     = nil   # and room list
+  def initialize(file, map = Map.new('TADS Map'))
+    debug "Initialize"
+    @classes = { 'Object' => {} }
+    super
   end
 end