mirror of
https://github.com/badvision/lawless-legends.git
synced 2025-03-01 03:30:04 +00:00
Fixed problem with no 2d maps working. Reordered rendering to give a faster feel.
This commit is contained in:
parent
5ab08d6683
commit
eaf266f828
@ -2050,18 +2050,20 @@ class A2PackPartitions
|
|||||||
dataIn.map.each { map ->
|
dataIn.map.each { map ->
|
||||||
def name = map?.@name
|
def name = map?.@name
|
||||||
def shortName = name.replaceAll(/[\s-]*[23]D$/, '')
|
def shortName = name.replaceAll(/[\s-]*[23]D$/, '')
|
||||||
|
if (map?.@name =~ /\s*2D$/) {
|
||||||
mapNames[name] = ['2D', num2D+1]
|
mapNames[name] = ['2D', num2D+1]
|
||||||
mapNames[shortName] = ['2D', num2D+1]
|
mapNames[shortName] = ['2D', num2D+1]
|
||||||
def rows = parseMap(map, dataIn.tile, true) // quick mode
|
def rows = parseMap(map, dataIn.tile, true) // quick mode
|
||||||
def (width, height, nHorzSections, nVertSections) = calcMapExtent(rows)
|
def (width, height, nHorzSections, nVertSections) = calcMapExtent(rows)
|
||||||
num2D += (nHorzSections * nVertSections)
|
num2D += (nHorzSections * nVertSections)
|
||||||
|
}
|
||||||
if (map?.@name =~ /\s*3D$/) {
|
else if (map?.@name =~ /\s*3D$/) {
|
||||||
mapNames[name] = ['3D', num3D+1]
|
mapNames[name] = ['3D', num3D+1]
|
||||||
mapNames[shortName] = ['3D', num3D+1]
|
mapNames[shortName] = ['3D', num3D+1]
|
||||||
++num3D
|
++num3D
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
printWarning "map name '${map?.@name}' should contain '2D' or '3D'. Skipping."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2387,8 +2387,11 @@ export def _scriptDisplayStr(str)#0
|
|||||||
if pIntimate
|
if pIntimate
|
||||||
pIntimate=>intimate_displayStr(str)
|
pIntimate=>intimate_displayStr(str)
|
||||||
else
|
else
|
||||||
|
if renderLoaded and !curPortrait and !curFullscreenImg
|
||||||
|
doRender()
|
||||||
|
flipToPage1()
|
||||||
|
fin
|
||||||
if textClearCountdown; clearTextWindow(); fin
|
if textClearCountdown; clearTextWindow(); fin
|
||||||
if renderLoaded; flipToPage1(); fin
|
|
||||||
displayStr(str)
|
displayStr(str)
|
||||||
textDrawn = TRUE
|
textDrawn = TRUE
|
||||||
fin
|
fin
|
||||||
|
Loading…
x
Reference in New Issue
Block a user