/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 16:04:57 UTC
  • Revision ID: josh@9ix.org-20130825160457-m0le8k88t0i2ooun
win screen activate!

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
--require 'pepperprof'
6
 
--inspect = require 'inspect'
7
 
 
8
 
require 'sprite'
9
 
require 'util'
10
6
 
11
7
require 'version'
12
8
require 'player'
62
58
                 end
63
59
 
64
60
                 if not (DEBUG and the.console.visible) then
65
 
                    --the.player.collider:collide(the.activeMaze)
 
61
                    the.activeMaze:collide(the.player.collider)
66
62
                    the.player.collider:collide(the.activeGoal)
67
63
                 end
68
64
 
136
132
 
137
133
              if DEBUG then
138
134
                 self.console:watch('VERSION', 'VERSION')
139
 
                 self.console:watch('player.x', 'the.player.x')
140
 
                 self.console:watch('player.y', 'the.player.y')
141
135
 
142
136
                 -- back off that dark overlay a bit
143
137
                 self.console.fill.fill[4] = 75