Finished moving combat code to a module.

Platform/Apple/tools/PLASMA/src/codegen.c

@@ -694,10 +694,18 @@ void emit_brlt(int tag)
 }
 void emit_call(int tag, int type)
 {
-    int fixup = fixup_new(tag, type, FIXUP_WORD);
-    char *taglbl = tag_string(tag, type);
-    printf("\t%s\t$54\t\t\t; CALL\t%s\n", DB, taglbl);
-    printf("_F%03d%c\t%s\t%s\t\t\n", fixup, LBL, DW, type & EXTERN_TYPE ? "0" : taglbl);
+    if (type == CONST_TYPE)
+    {
+        printf("\t%s\t$54\t\t\t; CALL\t%i\n", DB, tag);
+        printf("\t%s\t%i\t\t\n", DW, tag);
+    }
+    else
+    {
+        int fixup = fixup_new(tag, type, FIXUP_WORD);
+        char *taglbl = tag_string(tag, type);
+        printf("\t%s\t$54\t\t\t; CALL\t%s\n", DB, taglbl);
+        printf("_F%03d%c\t%s\t%s\t\t\n", fixup, LBL, DW, type & EXTERN_TYPE ? "0" : taglbl);
+    }
 }
 void emit_ical(void)
 {

Platform/Apple/tools/PackPartitions/src/org/demo/PackPartitions.groovy

@@ -1213,20 +1213,25 @@ class PackPartitions
             stream.write(it.buf.data, 0, it.buf.len)
         }
     }
-    
+
+    def readAllCode()
+    {
+        readCode("render", "src/raycast/build/render.b")
+        readCode("expand", "src/raycast/build/expand.b")
+        readCode("fontEngine", "src/font/build/fontEngine.b")
+        readCode("tileEngine", "src/tile/build/tile.b")
+
+        readModule("gameloop", "src/plasma/build/gameloop.b")
+        readModule("combat", "src/plasma/build/combat.b")
+    }
+        
     def pack(xmlPath, binPath, javascriptPath)
     {
         // Read in code chunks. For now these are hard coded, but I guess they ought to
         // be configured in a config file somewhere...?
         //
         println "Reading code resources."
-        readCode("render", "src/raycast/build/render.b")
-        readCode("expand", "src/raycast/build/expand.b")
-        readCode("fontEngine", "src/font/build/fontEngine.b")
-        readCode("tileEngine", "src/tile/build/tile.b")
-        
-        println "Reading modules."
-        readModule("gameloop", "src/plasma/build/gameloop.b")
+        readAllCode()
         
         // We have only one font, for now at least.
         println "Reading fonts."
@@ -1458,7 +1463,7 @@ class PackPartitions
         out.println("end\n")
     }
     
-    void dataGen(xmlPath)
+    def dataGen(xmlPath)
     {
         // Open the XML data file produced by Outlaw Editor
         def dataIn = new XmlParser().parse(xmlPath)
@@ -1486,6 +1491,17 @@ class PackPartitions
                     columns = line.split("\t")
             }
         }
+        
+        // Produce a list of assembly and PLASMA code segments
+        readAllCode()
+        new File("src/plasma/gen_modules.plh").withWriter { out ->
+            code.each { k, v ->
+                out.println "const CODE_${humanNameToSymbol(k, true)} = ${v.num}"
+            }
+            modules.each { k, v ->
+                out.println "const MODULE_${humanNameToSymbol(k, true)} = ${v.num}"
+            }
+        }
     }
     
     static void main(String[] args) 

Platform/Apple/virtual/src/plasma/gameloop.pla

@@ -20,13 +20,6 @@ const heapStart     = $F000   // main mem
 
 const heapSize      = $800
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Resource numbers
-const RES_NUM_RAYCASTER   = 1
-const RES_NUM_EXPAND_VEC  = 2
-const RES_NUM_FONT_ENGINE = 3
-const RES_NUM_TILE_ENGINE = 4
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Other constants
 const callbacks = $300
@@ -36,7 +29,7 @@ const CHAR_WND_GUN_X = 114
 
 include "playtype.plh"
 include "gen_images.plh"
-//include "heaptest.plh"
+include "gen_modules.plh"
 
 word global  // the global heap object, from which all live objects must be reachable
 
@@ -78,20 +71,20 @@ byte tabBuf[5]
 predef _getGlobals, _rand16
 predef _printf1, _printf2, _printf3, _printf4
 predef _displayf1, _displayf2, _displayf3, _displayf4
-predef _rollDice, _buildString, _addToString, _finishString, _rawDisplayStr, _displayStr
+predef _buildString, _addToString, _finishString, _rawDisplayStr, _displayStr
 predef _puts, _min, _max
 predef _countList, _countListFiltered, _randomFromListFiltered, _addToList, _getUpperKey, _beep
 predef _showParty, _mmgr, _setPortrait, _setWindow1, _setWindow2, _setWindow3, _clearWindow
-predef _getYN, _reboot, _brk
+predef _getYN, _reboot, _brk, _encodeDice, _rollDice
 
-word gameLib_addrs = _getGlobals, _rand16
-word = _printf1, _printf2, _printf3, _printf4
-word = _displayf1, _displayf2, _displayf3, _displayf4
-word = _rollDice, _buildString, _addToString, _finishString, _rawDisplayStr, _displayStr
-word = _puts, _min, _max
-word = _countList, _countListFiltered, _randomFromListFiltered, _addToList, _getUpperKey, _beep
-word = _showParty, _mmgr, _setPortrait, _setWindow1, _setWindow2, _setWindow3, _clearWindow
-word = _getYN, _reboot, _brk
+word gameLib_addrs = @_getGlobals, @_rand16
+word = @_printf1, @_printf2, @_printf3, @_printf4
+word = @_displayf1, @_displayf2, @_displayf3, @_displayf4
+word = @_buildString, @_addToString, @_finishString, @_rawDisplayStr, @_displayStr
+word = @_puts, @_min, @_max
+word = @_countList, @_countListFiltered, @_randomFromListFiltered, @_addToList, @_getUpperKey, @_beep
+word = @_showParty, @_mmgr, @_setPortrait, @_setWindow1, @_setWindow2, @_setWindow3, @_clearWindow
+word = @_getYN, @_reboot, @_brk, @_encodeDice, @_rollDice
 
 word = 0  // end of library functions
 
@@ -622,9 +615,13 @@ end
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// Reboot the machine
+// Clear the screen and reboot the machine
 // Params: None
 asm _reboot
+        bit setROM
+        jsr home
+        bit setText
+        bit page1
         inc $3F4    ; invalidate reset vector
         jmp $FA62   ; and reset
 end
@@ -1077,7 +1074,7 @@ end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Display the party data on the screen
-def showParty()
+def _showParty()
   word p
 
   saveCursor()
@@ -1106,7 +1103,6 @@ end
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Load code and data, set up everything to display a 3D map
 def initMap(x, y, dir)
-  word pFont
   word pMap
 
   // Set up the command table
@@ -1115,22 +1111,15 @@ def initMap(x, y, dir)
   // Reset memory (our module will stay since memory manager locked it upon load)
   mmgr(RESET_MEMORY, 0)
 
-  // Load the font engine and its font
-  mmgr(SET_MEM_TARGET, fontEngine)
-  mmgr(QUEUE_LOAD,     RES_NUM_FONT_ENGINE<<8 | RES_TYPE_CODE)
-
-  mmgr(SET_MEM_TARGET, $9000)
-  pFont = mmgr(QUEUE_LOAD, 1<<8 | RES_TYPE_FONT)
-
   // Queue loading of the raycaster or tile engine and the map data
   mmgr(SET_MEM_TARGET, displayEngine)
   if mapIs3D
-    mmgr(QUEUE_LOAD, RES_NUM_RAYCASTER<<8 | RES_TYPE_CODE)
+    mmgr(QUEUE_LOAD, CODE_RENDER<<8 | RES_TYPE_CODE)
     pMap = mmgr(QUEUE_LOAD, mapNum<<8 | RES_TYPE_3D_MAP)
     auxMmgr(SET_MEM_TARGET, expandVec)
-    auxMmgr(QUEUE_LOAD, RES_NUM_EXPAND_VEC<<8 | RES_TYPE_CODE)
+    auxMmgr(QUEUE_LOAD, CODE_EXPAND<<8 | RES_TYPE_CODE)
   else
-    mmgr(QUEUE_LOAD, RES_NUM_TILE_ENGINE<<8 | RES_TYPE_CODE)
+    mmgr(QUEUE_LOAD, CODE_TILE_ENGINE<<8 | RES_TYPE_CODE)
     pMap = mmgr(QUEUE_LOAD, mapNum<<8 | RES_TYPE_2D_MAP)
   fin
 
@@ -1141,9 +1130,6 @@ def initMap(x, y, dir)
   loadFrameImg()
   mmgr(FINISH_LOAD, 1) // 1 = keep open
 
-  // Tell the font engine where to find its font
-  setFont(pFont)
-
   // Start up the display engine with map data and starting position. This will also load and
   // init the script module, if any, which will end up calling us back at the setScriptInfo
   triggerTbl = NULL
@@ -1661,6 +1647,20 @@ end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 def testCombat()
+  word combatEngine
+  word x, y
+  byte dir
+
+  // Save the map position
+  getPos(@x, @y)
+  dir = getDir()
+
+  // Load the combat engine
+  flipToPage1()
+  mmgr(RESET_MEMORY, 0)
+  combatEngine = mmgr(QUEUE_LOAD, MODULE_COMBAT<<8 | RES_TYPE_MODULE)
+  mmgr(FINISH_LOAD, 1) // 0 = close
+
   // Create the enemy group(s).
   global=>p_enemyGroups = NULL
   when rand16() % 2
@@ -1671,6 +1671,17 @@ def testCombat()
       addToList(global + p_enemyGroups, new_EnemyGroup_Flesh_Feeders())
       break
   wend
+
+  // Run the combat engine
+  combatEngine()
+
+  // Clear out the heap
+  global=>p_enemyGroups = NULL
+  mmgr(HEAP_COLLECT, 0)
+
+  // Resume where we left off
+  setWindow2()
+  initMap(x, y, dir)  
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1730,6 +1741,8 @@ end
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Load and display the title screen.
 def loadTitle()
+  word pFont
+
   puts("Loading Lawless Legends.\n")
 
   // Load the title screen
@@ -1749,6 +1762,19 @@ def loadTitle()
   ^$C07E=0   // disable double-hi-res
   ^$C05F     // disable double-hi-res
 
+  // Load the font engine and its font, and lock them in place forever.
+  mmgr(SET_MEM_TARGET, fontEngine)
+  mmgr(QUEUE_LOAD,     CODE_FONT_ENGINE<<8 | RES_TYPE_CODE)
+  mmgr(LOCK_MEMORY,    fontEngine)
+
+  mmgr(SET_MEM_TARGET, $9000)
+  pFont = mmgr(QUEUE_LOAD, 1<<8 | RES_TYPE_FONT)
+  mmgr(LOCK_MEMORY, pFont)
+  mmgr(FINISH_LOAD, 1) // 1 = keep open
+
+  // Tell the font engine where to find its font
+  setFont(pFont)
+
   // Wait for a key.
   getUpperKey()
 end
@@ -1835,18 +1861,18 @@ def setLibVecs()
   word sp, dp
 
   // We're going to put the vectors at a known location, and lock that space
-  mmgr(SET_MEM_TARGET, gameLibVecs)
-  mmgr(REQUEST_MEMORY, $100)
-  mmgr(LOCK_MEMORY,    gameLibVecs)
+  _mmgr(SET_MEM_TARGET, gameLibVecs)
+  _mmgr(REQUEST_MEMORY, $100)
+  _mmgr(LOCK_MEMORY,    gameLibVecs)
 
   // Now set up the jump vectors
-  sp = gameLib_addrs
+  sp = @gameLib_addrs
   dp = gameLibVecs
   while *sp
-    dp.0 = $4c
-    dp:1 = @setScriptInfo
-    dp = dp + 3
+    dp->0 = $4c
+    dp=>1 = *sp
     sp = sp + 2
+    dp = dp + 3
   loop
 
 end

Platform/Apple/virtual/src/plasma/playtype.pla

@@ -71,25 +71,6 @@ def new_Armor_TahnkuVest()
   return p
 end
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def encodeDice(nDice, dieSize, add)  // ndice=0..15, dieSize=0..15, add=0..255
-  return (nDice << 12) | (dieSize << 8) | add
-end
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def rollDice(encoded)
-  byte i, nDice, dieSize, add, result
-  nDice = encoded >> 12
-  dieSize = (encoded >> 8) & $F
-  add = encoded & $F
-  result = add
-  for i = 1 to nDice
-    add = (rand16() % dieSize) + 1
-    result = result + add
-  next
-  return result
-end
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 def new_Weapon_Handgun
   word p