/ld26

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

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-04-28 05:19:04 UTC
  • Revision ID: josh@9ix.org-20130428051904-7j0sucv9tm8rqdkf
inventory (and a flower)

Show diffs side-by-side

added added

removed removed

main.lua
9
9
require 'player'
10
10
require 'transition'
11
11
require 'displacer'
 
12
require 'inventory'
 
13
require 'flower'
 
14
 
12
15
require 'svg_levels'
13
16
 
14
17
levels = {
61
64
                 self:add(obj)
62
65
              end
63
66
 
 
67
              self:add(the.inventory)
 
68
 
64
69
              self:flash({0,0,0})
65
70
 
66
71
              --self.focus = the.player
68
73
           end,
69
74
   draw = function (self, x, y)
70
75
             View.draw(self, x, y)
71
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
76
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
72
77
             love.graphics.print('version:' .. VERSION, 20, 570)
73
78
          end,
74
79
   onUpdate = function (self, dt)