1.1 --- a/src/net/kryshen/charamega/field.mirah	Tue Jul 17 08:16:34 2012 +0400
     1.2 +++ b/src/net/kryshen/charamega/field.mirah	Tue Mar 05 18:18:06 2013 +0400
     1.3 @@ -171,7 +171,7 @@
     1.4  
     1.5            g.rotate card.angle * v
     1.6  
     1.7 -          card_bounds.setRect(-card_size / 2, -card_size / 2,
     1.8 +          card_bounds.setRect(0 - card_size / 2, 0 - card_size / 2,
     1.9                                card_size, card_size)
    1.10            
    1.11            if f > 0
    1.12 @@ -196,8 +196,8 @@
    1.13              g.scale scale, scale  if scale < 1.0
    1.14  
    1.15              g.drawGlyphVector(gv, 
    1.16 -                              -float(gb.getX + gb.getWidth / 2),
    1.17 -                              -float(gb.getY + gb.getHeight / 2))
    1.18 +                              0 - float(gb.getX + gb.getWidth / 2),
    1.19 +                              0 - float(gb.getY + gb.getHeight / 2))
    1.20  
    1.21              g.setTransform save_t_2
    1.22            end
    1.23 @@ -215,13 +215,13 @@
    1.24  
    1.25          x += cw
    1.26        end
    1.27 -      
    1.28 +
    1.29        y += rh
    1.30      end
    1.31    end
    1.32  
    1.33 -  private
    1.34 -  
    1.35 +  #private
    1.36 +
    1.37    def hit(x:int, y:int)
    1.38      insets = getInsets
    1.39      size = getSize

     2.1 --- a/src/net/kryshen/charamega/game.mirah	Tue Jul 17 08:16:34 2012 +0400
     2.2 +++ b/src/net/kryshen/charamega/game.mirah	Tue Mar 05 18:18:06 2013 +0400
     2.3 @@ -52,7 +52,7 @@
     2.4      self.players = 1
     2.5    end
     2.6  
     2.7 -  def shuffle
     2.8 +  def ensure_shuffled
     2.9      return false  if @shuffled
    2.10      shuffle @cards.size / 2
    2.11  
    2.12 @@ -91,7 +91,7 @@
    2.13    end
    2.14  
    2.15    def start:void
    2.16 -    shuffle
    2.17 +    ensure_shuffled
    2.18      @shuffled = false
    2.19  
    2.20      @matches.length.times { |i| @matches[i] = 0 }
    2.21 @@ -290,7 +290,7 @@
    2.22      true
    2.23    end
    2.24  
    2.25 -  def hit(x:int, y:int, w:int, h:int)
    2.26 +  def hit(x:int, y:int, w:int, h:int):Card
    2.27      return nil  if x < 0 or y < 0
    2.28  
    2.29      layout = layout(w, h)
    2.30 @@ -319,7 +319,7 @@
    2.31      @version = properties.getProperty("version")
    2.32    end
    2.33  
    2.34 -  private
    2.35 +  #private
    2.36  
    2.37    def compute_limits
    2.38      pairs = @cards.size / 2

     3.1 --- a/src/net/kryshen/charamega/ui.mirah	Tue Jul 17 08:16:34 2012 +0400
     3.2 +++ b/src/net/kryshen/charamega/ui.mirah	Tue Mar 05 18:18:06 2013 +0400
     3.3 @@ -32,7 +32,7 @@
     3.4    end
     3.5  
     3.6    def initialize(root_pane:JRootPane)
     3.7 -    super LayoutManager(BorderLayout.new)
     3.8 +    setLayout BorderLayout.new
     3.9  
    3.10      @game = Game.new.shuffle(30)
    3.11      @field = Field.new(@game)
    3.12 @@ -103,7 +103,7 @@
    3.13      end
    3.14    end
    3.15  
    3.16 -  private
    3.17 +  #private
    3.18  
    3.19    def create_status
    3.20      ui = self
    3.21 @@ -175,7 +175,7 @@
    3.22      
    3.23      players.addChangeListener do |e|
    3.24        game.players = players.getNumber.intValue
    3.25 -      field.repaint  if game.shuffle
    3.26 +      field.repaint  if game.ensure_shuffled
    3.27        ui.update_status
    3.28      end
    3.29