[game] Make save and runtime lifetimes explicit

include/reone/game/action.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "savedruntime.h"
+#include "runtimeref.h"
 #include "types.h"
 
 namespace reone {
@@ -88,6 +89,12 @@ class Action : boost::noncopyable {
         return _savedAction;
     }
 
+    /**
+     * True while every non-owning gameplay object used by this action still
+     * denotes the exact live incarnation captured by the action.
+     */
+    bool runtimeDependenciesLive() const;
+
 protected:
     const float kDefaultMaxObjectDistance = 2.0f;
     const float kDistanceWalk = 4.0f;
@@ -101,6 +108,9 @@ class Action : boost::noncopyable {
     bool _cancelled {false};
     bool _locked {false};
     std::optional<SavedActionRecord> _savedAction;
+    std::vector<RuntimeObjectRef<Object>> _runtimeDependencies;
+
+    void requireRuntimeObject(const std::shared_ptr<Object> &object);
 
     Action(
         Game &game,

include/reone/game/action/attackobject.h

@@ -39,7 +39,9 @@ class AttackObjectAction : public Action {
                        bool passive = false) :
         Action(game, services, ActionType::AttackObject),
         _target(target),
-        _passive(passive), _services(services) {}
+        _passive(passive), _services(services) {
+        requireRuntimeObject(target);
+    }
 
     static bool classof(Action *from) {
         return from->type() == ActionType::AttackObject;

include/reone/game/action/castfakespellatobject.h

@@ -35,6 +35,7 @@ class CastFakeSpellAtObjectAction : public Action {
         _spell(spell),
         _target(std::move(target)),
         _projectilePathType(projectilePathType) {
+        requireRuntimeObject(_target);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/closedoor.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../action.h"
+#include "../object/door.h"
 
 namespace reone {
 
@@ -32,6 +33,7 @@ class CloseDoorAction : public Action {
                     std::shared_ptr<Door> door) :
         Action(game, services, ActionType::CloseDoor),
         _door(std::move(door)) {
+        requireRuntimeObject(_door);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/cutsceneattack.h

@@ -30,7 +30,9 @@ class CutsceneAttackAction : public Action {
                          const std::shared_ptr<Object> &target,
                          int animation, AttackResultType result, int damage) :
         Action(game, services, ActionType::CutsceneAttack),
-        _target(target), _animation(animation), _result(result), _damage(damage) {}
+        _target(target), _animation(animation), _result(result), _damage(damage) {
+        requireRuntimeObject(target);
+    }
 
     static bool classof(Action *from) {
         return from->type() == ActionType::CutsceneAttack;

include/reone/game/action/equipitem.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../action.h"
+#include "../object/item.h"
 
 namespace reone {
 
@@ -32,6 +33,7 @@ class EquipItemAction : public Action {
         _item(std::move(item)),
         _inventorySlot(inventorySlot),
         _instant(instant) {
+        requireRuntimeObject(_item);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/equipmostdamagingmelee.h

@@ -29,6 +29,7 @@ class EquipMostDamagingMeleeAction : public Action {
         Action(game, services, ActionType::EquipMostDamagingMelee),
         _versus(std::move(versus)),
         _offHand(offHand) {
+        requireRuntimeObject(_versus);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/equipmostdamagingranged.h

@@ -28,6 +28,7 @@ class EquipMostDamagingRangedAction : public Action {
     EquipMostDamagingRangedAction(Game &game, ServicesView &services, std::shared_ptr<Object> versus) :
         Action(game, services, ActionType::EquipMostDamagingRanged),
         _versus(std::move(versus)) {
+        requireRuntimeObject(_versus);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/follow.h

@@ -32,6 +32,7 @@ class FollowAction : public Action {
         Action(game, services, ActionType::Follow),
         _follow(std::move(follow)),
         _followDistance(followDistance) {
+        requireRuntimeObject(_follow);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/giveitem.h

@@ -31,6 +31,8 @@ class GiveItemAction : public Action {
         Action(game, services, ActionType::GiveItem),
         _item(std::move(item)),
         _giveTo(std::move(giveTo)) {
+        requireRuntimeObject(_item);
+        requireRuntimeObject(_giveTo);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/interactobject.h

@@ -29,6 +29,7 @@ class InteractObjectAction : public Action {
     InteractObjectAction(Game &game, ServicesView &services, std::shared_ptr<Placeable> placeable) :
         Action(game, services, ActionType::InteractObject),
         _placeable(std::move(placeable)) {
+        requireRuntimeObject(_placeable);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/jumptoobject.h

@@ -32,6 +32,7 @@ class JumpToObjectAction : public Action {
         Action(game, services, ActionType::JumpToObject),
         _toJumpTo(std::move(toJumpTo)),
         _walkStraightLine(walkStraightLine) {
+        requireRuntimeObject(_toJumpTo);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/lockobject.h

@@ -28,6 +28,7 @@ class LockObjectAction : public Action {
     LockObjectAction(Game &game, ServicesView &services, std::shared_ptr<Object> target) :
         Action(game, services, ActionType::Lock),
         _target(std::move(target)) {
+        requireRuntimeObject(_target);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/moveawayfromobject.h

@@ -34,6 +34,7 @@ class MoveAwayFromObject : public Action {
         _fleeFrom(std::move(fleeFrom)),
         _run(run),
         _moveAwayRange(moveAwayRange) {
+        requireRuntimeObject(_fleeFrom);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/opencontainer.h

@@ -30,6 +30,7 @@ class OpenContainerAction : public Action {
                         std::shared_ptr<Object> object) :
         Action(game, services, ActionType::OpenContainer),
         _object(std::move(object)) {
+        requireRuntimeObject(_object);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/opendoor.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../action.h"
+#include "../object/door.h"
 
 namespace reone {
 
@@ -32,6 +33,7 @@ class OpenDoorAction : public Action {
                    std::shared_ptr<Door> door) :
         Action(game, services, ActionType::OpenDoor),
         _door(std::move(door)) {
+        requireRuntimeObject(_door);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/openlock.h

@@ -30,6 +30,7 @@ class OpenLockAction : public Action {
                    std::shared_ptr<Object> target) :
         Action(game, services, ActionType::OpenLock),
         _target(std::move(target)) {
+        requireRuntimeObject(_target);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/pickupitem.h

@@ -31,6 +31,7 @@ class PickUpItemAction : public Action {
                      std::shared_ptr<Item> item) :
         Action(game, services, ActionType::PickUpItem),
         _item(std::move(item)) {
+        requireRuntimeObject(_item);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/putdownitem.h

@@ -31,6 +31,7 @@ class PutDownItemAction : public Action {
                       std::shared_ptr<Item> item) :
         Action(game, services, ActionType::PutDownItem),
         _item(std::move(item)) {
+        requireRuntimeObject(_item);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/startconversation.h

@@ -50,6 +50,7 @@ class StartConversationAction : public Action {
         _barkX(barkX),
         _barkY(barkY),
         _dontClearAllActions(dontClearAllActions) {
+        requireRuntimeObject(_objectToConverse);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/takeitem.h

@@ -31,6 +31,8 @@ class TakeItemAction : public Action {
         Action(game, services, ActionType::TakeItem),
         _item(std::move(item)),
         _takeFrom(std::move(takeFrom)) {
+        requireRuntimeObject(_item);
+        requireRuntimeObject(_takeFrom);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/unequipitem.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../action.h"
+#include "../object/item.h"
 
 namespace reone {
 
@@ -31,6 +32,7 @@ class UnequipItemAction : public Action {
         Action(game, services, ActionType::UnequipItem),
         _item(std::move(item)),
         _instant(instant) {
+        requireRuntimeObject(_item);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/unlockobject.h

@@ -28,6 +28,7 @@ class UnlockObjectAction : public Action {
     UnlockObjectAction(Game &game, ServicesView &services, std::shared_ptr<Object> target) :
         Action(game, services, ActionType::OpenLock),
         _target(std::move(target)) {
+        requireRuntimeObject(_target);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/usefeat.h

@@ -33,6 +33,7 @@ class UseFeatAction : public Action {
         Action(game, services, ActionType::UseFeat),
         _feat(feat),
         _target(std::move(target)) {
+        requireRuntimeObject(_target);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/useskill.h

@@ -37,6 +37,8 @@ class UseSkillAction : public Action {
         _target(std::move(target)),
         _subSkill(subSkill),
         _itemUsed(std::move(itemUsed)) {
+        requireRuntimeObject(_target);
+        requireRuntimeObject(_itemUsed);
     }
 
     static bool classof(Action *from) {

include/reone/game/action/usetalentonobject.h

@@ -31,6 +31,8 @@ class UseTalentOnObjectAction : public Action {
         _chosenTalent(std::move(chosenTalent)),
         _target(std::move(target)) {
 
+        requireRuntimeObject(_target);
+
         dispatchToAction();
     }
 

include/reone/game/d20/attributes.h

@@ -59,6 +59,9 @@ class CreatureAttributes {
      */
     int getAggregateHitDie() const;
 
+    /** Derive permanent runtime vitality from a serialized base maximum. */
+    int getPermanentMaxHitPoints(int baseHitPoints) const;
+
     ClassType getEffectiveClass() const;
     int getClassLevel(ClassType clazz) const;
     int getAggregateAttackBonus() const;