/ld27

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

« back to all changes in this revision

Viewing changes to sprite.lua

  • Committer: Josh C
  • Date: 2013-08-25 23:25:58 UTC
  • Revision ID: josh@9ix.org-20130825232558-1fkg38q6emagbigx
moved the shinies.  added one more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sprite.lua
81
81
   if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
82
82
 
83
83
   -- ugly hack for falling through floor on really slow frames
84
 
   if math.abs(vel[dir] * elapsed) > 32 then
 
84
   if math.abs(vel[dir] * elapsed) > 16 then
85
85
      print('skip')
86
86
      return
87
87
   end
88
88
 
89
89
   if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
90
90
 
91
 
   if dir == 'x' or dir == 'y' then -- doesn't make sense for rotation
 
91
   if the.activeMaze and (dir == 'x' or dir == 'y') then -- doesn't make sense for rotation
92
92
      if self[dir] < 0 then self[dir] = 0 end
93
93
      local edge = the.activeMaze[util.dim(dir)] - the.player[util.dim(dir)]
94
94
      -- TODO: take map position into account