/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 00:32:21 UTC
  • Revision ID: josh@9ix.org-20130825003221-632jbug07yhqabuo
pick up goals

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--require 'pepperprof'
6
5
 
7
6
--require 'group'
8
7
 
44
43
 
45
44
              self:switchMaze()
46
45
 
47
 
              -- profiling...
48
 
              --the.profiler = newProfiler()
49
 
              --the.profiler:start()
50
 
 
51
46
              self.gameStart = love.timer.getMicroTime()
52
47
              self.lastChange = love.timer.getMicroTime()
53
48
           end,
58
53
                 end
59
54
 
60
55
                 if not (DEBUG and the.console.visible) then
61
 
                    the.activeMaze:collide(the.player.collider)
62
 
                    the.player.collider:collide(the.activeGoal)
 
56
                    the.activeMaze:collide(the.player)
 
57
                    the.player:collide(the.activeGoal)
63
58
                 end
64
59
 
65
60
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
97
92
                      the.activeGoal.visible = true
98
93
                   end
99
94
                   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
95
 
103
96
                   self._fx = {0,0,0,0}
104
97
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
140
133
           end,
141
134
   onUpdate = function (self, dt)
142
135
                 if the.keys:justPressed('escape') then
143
 
                    if the.profiler then
144
 
                       the.profiler:stop()
145
 
                       local outfile = io.open( "profile.txt", "w+" )
146
 
                       the.profiler:report( outfile )
147
 
                       outfile:close()
148
 
                    end
149
 
 
150
136
                    self.quit()
151
137
                 end
152
138
              end