/ld27

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

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-08-25 02:26:02 UTC
  • Revision ID: josh@9ix.org-20130825022602-dryn6uo3ju9pemqg
profiler stubs

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
58
58
                 end
59
59
 
60
60
                 if not (DEBUG and the.console.visible) then
61
 
                    the.activeMaze:collide(the.player.collider)
62
 
                    the.player.collider:collide(the.activeGoal)
 
61
                    the.activeMaze:collide(the.player)
 
62
                    the.player:collide(the.activeGoal)
63
63
                 end
64
64
 
65
65
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
97
97
                      the.activeGoal.visible = true
98
98
                   end
99
99
                   the.player.scale = the.activeMaze.playerScale
100
 
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
101
 
                   the.player.collider.height = the.player.height * the.activeMaze.playerScale
102
100
 
103
101
                   self._fx = {0,0,0,0}
104
102
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')