Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-11-18 23:07:53 +00:00
Code Issues Projects Releases Wiki Activity

Use user-defined script names in generated PLASMA code.

Browse Source
This commit is contained in:
Martin Haye 2016-02-10 04:58:14 -08:00
parent 291d529d5a
commit 5aeabcde51
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Platform/Apple/tools/PackPartitions/src/org/demo/PackPartitions.groovy
View File

@ -1901,6 +1901,7 @@ class PackPartitions
def locationsWithTriggers = [] as Set def locationsWithTriggers = [] as Set
def scriptNames = [:] def scriptNames = [:]
def indent = 0 def indent = 0
def variables = [] as Set
def emitString(inStr) def emitString(inStr)
{ {
@ -1952,7 +1953,8 @@ class PackPartitions
out << "include \"../src/plasma/gamelib.plh\"\n" out << "include \"../src/plasma/gamelib.plh\"\n"
out << "include \"../src/plasma/playtype.plh\"\n" out << "include \"../src/plasma/playtype.plh\"\n"
out << "include \"../src/plasma/gen_images.plh\"\n\n" out << "include \"../src/plasma/gen_images.plh\"\n\n"
out << "word global\n\n"
// Determine which scripts are referenced in the specified section of the map. // Determine which scripts are referenced in the specified section of the map.
def initScript def initScript
def scripts = [] def scripts = []
@ -1966,7 +1968,7 @@ class PackPartitions
(!yRange || trig.@y.toInteger() in yRange) }) (!yRange || trig.@y.toInteger() in yRange) })
{ {
scripts << script scripts << script
scriptNames[script] = "trig_$idx" scriptNames[script] = (name == null) ? "trig_$idx" : "sc_${humanNameToSymbol(name, false)}"
} }
} }
@ -1996,7 +1998,7 @@ class PackPartitions
} }
// Record the function's name and start its definition // Record the function's name and start its definition
out << "def script$scriptNum()\n" out << "def ${scriptNames[script]}()\n"
indent = 1 indent = 1
// Process the code inside it // Process the code inside it
@ -2045,7 +2047,7 @@ class PackPartitions
case 'graphics_clr_portrait': case 'graphics_clr_portrait':
packClrPortrait(blk); break packClrPortrait(blk); break
default: default:
printWarning "don't know how to pack block of type '${blk.@type}'" printError "don't know how to pack block of type '${blk.@type}'"
} }
} }
@ -2187,7 +2189,7 @@ class PackPartitions
{ {
// Emit a predefinition for each function // Emit a predefinition for each function
scripts.eachWithIndex { script, idx -> scripts.eachWithIndex { script, idx ->
out << "predef script$idx\n" out << "predef ${scriptNames[script]}\n"
} }
// Collate all the matching location triggers into a sorted map. // Collate all the matching location triggers into a sorted map.
@ -2206,7 +2208,7 @@ class PackPartitions
triggers[y] = [:] as TreeMap triggers[y] = [:] as TreeMap
if (!triggers[y][x]) if (!triggers[y][x])
triggers[y][x] = [] triggers[y][x] = []
triggers[y][x].add("script$idx") triggers[y][x].add(scriptNames[script])
} }
} }
} }
@ -2241,6 +2243,9 @@ class PackPartitions
packBlock(getSingle(getSingle(script.block, null, 'procedures_defreturn').statement, 'STACK')) packBlock(getSingle(getSingle(script.block, null, 'procedures_defreturn').statement, 'STACK'))
} }
// Set up the pointer to global vars
out << "global = getGlobals()\n"
// Code to register the map name, trigger table, and map extent. // Code to register the map name, trigger table, and map extent.
def shortName = mapName.replaceAll(/[\s-]*[23][dD][-0-9]*$/, '').take(16) def shortName = mapName.replaceAll(/[\s-]*[23][dD][-0-9]*$/, '').take(16)
out << "setScriptInfo(\"$shortName\", @triggerTbl, $maxX, $maxY)\n" out << "setScriptInfo(\"$shortName\", @triggerTbl, $maxX, $maxY)\n"