/ld26

To get this branch, use:
bzr branch http://9ix.org/bzr/ld26

« back to all changes in this revision

Viewing changes to transition.lua

  • Committer: Josh C
  • Date: 2013-04-29 00:35:28 UTC
  • Revision ID: josh@9ix.org-20130429003528-6o7b23zq3c4m8nxe
be moved

Show diffs side-by-side

added added

removed removed

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