/ld26

To get this branch, use:
bzr branch /bzr/ld26

« back to all changes in this revision

Viewing changes to transition.lua

  • Committer: Josh C
  • Date: 2013-04-28 01:21:46 UTC
  • Revision ID: josh@9ix.org-20130428012146-42c1hx6r1g7y1kgu
fade in

Show diffs side-by-side

added added

removed removed

transition.lua
12
12
                        if other == the.player then
13
13
                           --print("Sending to "..t.target)
14
14
 
15
 
                           the.player.active = false
16
 
                           the.app.view:fade({0,0,0}):andThen(function()
17
 
                              the.app.view = GameView:new{level = t.target}
 
15
                           the.app.view = GameView:new{level = t.target}
18
16
 
19
 
                              if t.targetX or t.targetY then
20
 
                                 the.player.x = t.targetX
21
 
                                 the.player.y = t.targetY
22
 
                              end
23
 
                           end)
 
17
                           if t.targetX or t.targetY then
 
18
                              the.player.x = t.targetX
 
19
                              the.player.y = t.targetY
 
20
                           end
24
21
                        else
25
22
                           print("Colliding with: "..other)
26
23
                        end