From c9300a20c9f906c3213eababbe5abd5ca9fa122b Mon Sep 17 00:00:00 2001
From: Martin Haye <m1@snyder-haye.com>
Date: Thu, 16 Jun 2016 07:13:39 -0700
Subject: [PATCH] Fix crash bug in old global scripts.

---
 .../Apple/virtual/src/plasma/gameloop.pla     |  2 +-
 .../virtual/src/plasma/globalScripts.plh      | 21 +++++++++----------
 .../Apple/virtual/src/plasma/playtype.pla     |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Platform/Apple/virtual/src/plasma/gameloop.pla b/Platform/Apple/virtual/src/plasma/gameloop.pla
index 0fbf8b84..fad03013 100644
--- a/Platform/Apple/virtual/src/plasma/gameloop.pla
+++ b/Platform/Apple/virtual/src/plasma/gameloop.pla
@@ -2060,7 +2060,7 @@ end
 def loadTitle()
   word pFont
 
-  puts("Loading Lawless Legends.\n")
+  puts("Loading game.\n")
 
   // Load the title screen
   mmgr(UNLOCK_MEMORY,  $2000)
diff --git a/Platform/Apple/virtual/src/plasma/globalScripts.plh b/Platform/Apple/virtual/src/plasma/globalScripts.plh
index 53a5e5e8..8aee6f41 100644
--- a/Platform/Apple/virtual/src/plasma/globalScripts.plh
+++ b/Platform/Apple/virtual/src/plasma/globalScripts.plh
@@ -8,14 +8,13 @@
 // governing permissions and limitations under the License.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-const script_new_Modifier = 0
-const script_new_Armor_Chaps = 2
-const script_new_Armor_ShamanHeaddress = 4
-const script_new_Armor_TahnkuPants = 6
-const script_new_Armor_TahnkuVest = 8
-const script_new_Weapon_Handgun = 10
-const script_new_Weapon_SpiritBow = 12
-const script_new_Weapon_SpiritBlade = 14
-const script_calcPlayerArmor = 16
-const script_new_Player_Hue_Hauser = 18
-const script_new_Player_Mokahnu = 20
+const script_new_Armor_Chaps = 0
+const script_new_Armor_ShamanHeaddress = 2
+const script_new_Armor_TahnkuPants = 4
+const script_new_Armor_TahnkuVest = 6
+const script_new_Weapon_Handgun = 8
+const script_new_Weapon_SpiritBow = 10
+const script_new_Weapon_SpiritBlade = 12
+const script_calcPlayerArmor = 14
+const script_new_Player_Hue_Hauser = 16
+const script_new_Player_Mokahnu = 18
diff --git a/Platform/Apple/virtual/src/plasma/playtype.pla b/Platform/Apple/virtual/src/plasma/playtype.pla
index 24842f18..7a13e42e 100644
--- a/Platform/Apple/virtual/src/plasma/playtype.pla
+++ b/Platform/Apple/virtual/src/plasma/playtype.pla
@@ -14,7 +14,7 @@ byte typeTbl_Player[] = Player, p_nextObj, s_name, p_combatNext, p_skills, p_ite
 byte typeTbl_Modifier[] = Modifier, p_nextObj, s_name, 0
 byte typeTbl_Effect[] = Effect, p_nextObj, s_name, 0
 byte typeTbl_Item[] = Item, p_nextObj, s_name, s_itemKind, p_modifiers, 0
-byte typeTbl_Weapon[] = Weapon, p_nextObj, s_name, s_itemKind, p_modifiers, s_combatText, 0
+byte typeTbl_Weapon[] = Weapon, p_nextObj, s_name, s_itemKind, p_modifiers, s_ammoKind, s_combatText, 0
 byte typeTbl_Armor[] = Armor, p_nextObj, s_name, s_itemKind, p_modifiers, 0
 byte typeTbl_Stuff[] = Stuff, p_nextObj, s_name, s_itemKind, 0
 byte typeTbl_Enemy[] = Enemy, p_nextObj, s_name, p_combatNext, s_attackText, 0