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