Manually Tick() upgrades because we can't inherit them from Thinker s…

…afely

CHANGELOG.md

@@ -6,6 +6,7 @@
   - Putrefaction upgrade is now significantly more powerful
   - new Hallucinogens upgrade makes severely poisoned enemies fight on your side
 - Change: internal cleanup to UpgradeBag and Dot APIs
+- Fix: crash when carrying upgraded weapons across level transitions
 
 # 0.4
 

ca.ancilla.laevis/PerPlayerStats.zs

@@ -355,6 +355,9 @@ class ::PerPlayerStats : ::Force {
       AddXP(owner.score - prevScore);
       prevScore = owner.score;
     }
+
+    upgrades.Tick();
+    info.upgrades.Tick();
   }
 
   States {

ca.ancilla.laevis/upgrades/BaseUpgrade.zs

@@ -19,11 +19,15 @@
 // registration after the first.
 #namespace TFLV::Upgrade;
 
-class ::BaseUpgrade : Thinker {
+class ::BaseUpgrade : Object play {
   uint level;
 
   // VIRTUAL FUNCTIONS //
 
+  // Tick function. Equivalent to Thinker.Tick() but we define it here because
+  // we can't inherit from Thinker and have the upgrades survive level changes.
+  virtual void Tick() {}
+
   // Upgrade selection functions.
   // These will be called when generating an upgrade to see if the upgrade should
   // be added to the pool.

ca.ancilla.laevis/upgrades/UpgradeBag.zs

@@ -4,6 +4,12 @@
 class ::UpgradeBag : Object play {
   array<::BaseUpgrade> upgrades;
 
+  void Tick() {
+    for (uint i = 0; i < upgrades.Size(); ++i) {
+      upgrades[i].Tick();
+    }
+  }
+
   ::BaseUpgrade Add(string classname, uint level=1) {
     return AddUpgrade(::BaseUpgrade(new(classname)), level);
   }
@@ -54,6 +60,7 @@ class ::UpgradeBag : Object play {
 
   double ModifyDamageDealt(Actor pawn, Actor shot, Actor target, double damage) {
     for (uint i = 0; i < upgrades.Size(); ++i) {
+      DEBUG("UpgradeBag.ModifyDamageDealt: %d %s", i, TFLV::Util.SafeCls(upgrades[i]));
       damage = upgrades[i].ModifyDamageDealt(pawn, shot, target, damage);
     }
     return damage;