Compare commits
No commits in common. "399d6329a0d2783ec112119e0c2d721169dcc6e3" and "92aa7f33b3875db4bf68ce46a9ff432e7a94fdd1" have entirely different histories.
399d6329a0
...
92aa7f33b3
5
main.xml
5
main.xml
|
@ -311,11 +311,13 @@
|
|||
local newFrame, idx = findFirstActorFrame(currentPath)
|
||||
local newActor = findFirstActor(currentPath)
|
||||
if newFrame and not (newActor and forceActor) then
|
||||
print('creating frame')
|
||||
table.insert(pastPaths, currentPath)
|
||||
currentPath = currentPath[idx]
|
||||
table.remove(pastPaths[#pastPaths], idx)
|
||||
return true
|
||||
elseif newActor then
|
||||
print('creating actor')
|
||||
table.insert(pastPaths, currentPath)
|
||||
return true
|
||||
else
|
||||
|
@ -324,6 +326,7 @@
|
|||
end
|
||||
|
||||
function oat._actor.recurseLast()
|
||||
print('recurselast: hi!')
|
||||
return oat._actor.recurse(true)
|
||||
end
|
||||
|
||||
|
@ -590,7 +593,7 @@
|
|||
local actor = createProxyActor('BitmapText')
|
||||
table.insert(actorQueue, {
|
||||
type = 'BitmapText',
|
||||
font = font or 'common',
|
||||
font = font and (oat.dir .. font) or 'common',
|
||||
init = function(a)
|
||||
if text then a:settext(text) end
|
||||
actor.__lock(a)
|
||||
|
|
Loading…
Reference in New Issue