chameleonic.p8

@@ -656,13 +656,15 @@ end
 
 -- argument is a rope operation:
 --  array of [mx0,my0,dmx,dmy]
-function level:tug_crate(t)
+-- must be a free function
+--   to use as a foreach target
+function level_tug_crate(t)
  local mx0,my0,dmx,dmy=unpack(t)
  local mxy0=_mix{mx0,my0}
  local existing=self._crates[mxy0]
  if (not existing) return
  
- self._crates[mxy0]=nil
+ level._crates[mxy0]=nil
  local mx1,my1=mx0+dmx,my0+dmy
  local px1,py1=mx1*8,my1*8
  existing.todo={
@@ -673,7 +675,7 @@ function level:tug_crate(t)
   {px=px1,py=py1}
  }
 
- self._crates[_mix{mx1,my1}]=existing
+ level._crates[_mix{mx1,my1}]=existing
 end
 
 -->8
@@ -1557,7 +1559,7 @@ function rope:_tug(hypothetically)
 
   if #ops>0 then
    if (hypothetically) return ancs,i-1,ops,blocks
-   foreach(ops, level:tug_crate)
+   foreach(ops, level_tug_crate)
    return true
   end
  end
@@ -1610,7 +1612,7 @@ function rope:_tug(hypothetically)
    if level:can_move(false,mv,1,0) then
     if (hypothetically) return ancs,0,{mv},blocks
 
-    level:tug_crate(mv) 
+    level_tug_crate(mv) 
     return true
    else
     add(blocks, mv)
@@ -1691,8 +1693,8 @@ function rope:_calc_push(
  local ops2,blocked={},{}
  for o in all(ops) do
   local mx,my=unpack(o)
-  if level:mcoll(mx,my)
+  if level:mcoll(mx,my) then
-   if not (level:get_crate(mx, my)) break
+   if (not level:get_crate(mx, my)) break
    if not level:can_move(false,o,0,0) then
     add(blocked,o)
     break