/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 23:55:40 UTC
  • Revision ID: josh@9ix.org-20130428235540-wamoh325zjypaf06
dragon flag special case

Show diffs side-by-side

added added

removed removed

32
32
                 if not the.inventory.items[obj.name] then
33
33
                    self:add(obj)
34
34
                 end
 
35
                 if obj.name == 'flag' then
 
36
                    self:add(obj)
 
37
                 end
35
38
              end
36
39
 
37
40
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
69
72
              end
70
73
 
71
74
              --the.inventory:add(Flag:new())
 
75
              --the.inventory:add(Flower:new())
72
76
           end,
73
77
   onUpdate = function (self, dt)
74
78
                 if the.keys:justPressed('escape') then