Compare commits

..

No commits in common. "0d3b0e4dac9b50543673f810cdca6814dede4213" and "b7ce1fe85edb2f374bb86f8c9d503de4315d81bf" have entirely different histories.

View File

@ -470,7 +470,8 @@ function level:recollide_reanchor()
not self:mcoll(mx1,my0) and not self:mcoll(mx1,my0) and
not self:mcoll(mx1,my1) not self:mcoll(mx1,my1)
) then ) then
anch_new[fmt("GEOM%v,%v,%v,%v",mx0,my0,dx,dy)]= { local key="GEOM"..mx0..","..my0..","..dx..","..dy
anch_new[key]= {
max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy
} }
end end
@ -478,9 +479,10 @@ function level:recollide_reanchor()
end end
for _,cr in pairs(self._crates) do for _,cr in pairs(self._crates) do
local key="CRATE"..cr.id..","..dx..","..dy
local mx0,my0=cr.mx,cr.my local mx0,my0=cr.mx,cr.my
local mx1,my1=mx0+dx,my0+dy local mx1,my1=mx0+dx,my0+dy
anch_new[fmt("CRATE%v,%v,%v",cr.id,dx,dy)]={ anch_new[key]={
max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy
} }
end end
@ -1088,7 +1090,7 @@ function rope:draw(artificial_px,artificial_py)
if (anch.ady>0) y-=1 if (anch.ady>0) y-=1
end end
rectfill(x-1,y-1,x+1,y+1,12) rectfill(x-1,y-1,x+1,y+1,12)
print(fmt("ax=%v,ay=%v",n1.ax,n1.ay),72,sy) print("ax="..n1.ax..",ay="..n1.ay,72,sy)
sy+=7 sy+=7
local n0=n1.prev local n0=n1.prev
@ -1837,7 +1839,7 @@ function debugmouse:draw3()
if (c == " ") spr(50,x,y) if (c == " ") spr(50,x,y)
print(c,x,y,15) print(c,x,y,15)
local px, py = mid(0,x,89), mid(0, y > 111 and y - 12 or y + 6, 117) local px, py = mid(0,x,89), mid(0, y > 111 and y - 12 or y + 6, 117)
print(fmt("(%v, %v)\n[%v, %v]",x,y,x\8,y\8),px,py,15) print("("..x..", "..y..")\n["..(x\8)..", "..(y\8).."]",px,py,15)
pal() pal()
end end