/ld26

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

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-04-28 23:19:25 UTC
  • Revision ID: josh@9ix.org-20130428231925-m2rgt3n1dg9gryz2
cat

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
15
15
require 'items'
16
16
require 'troll'
17
17
require 'gatetrigger'
18
 
require 'fairyactivator'
19
 
require 'realfairy'
20
 
require 'boat'
21
18
 
22
19
require 'svg_levels'
23
20
 
35
32
                 if not the.inventory.items[obj.name] then
36
33
                    self:add(obj)
37
34
                 end
38
 
                 if obj.name == 'flag' then
39
 
                    self:add(obj)
40
 
                 end
41
35
              end
42
36
 
43
37
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
75
69
              end
76
70
 
77
71
              --the.inventory:add(Flag:new())
78
 
              --the.inventory:add(Fairy:new())
79
72
           end,
80
73
   onUpdate = function (self, dt)
81
74
                 if the.keys:justPressed('escape') then