Ticket #9237: save_actorstate.patch

actor.cpp

@@ -2717 +2717 @@
                 MKARRAY(Actor, _cost.heJumpOffsetTable[0], sleUint16, 16, VER(65)),
                 MKARRAY(Actor, _cost.heJumpCountTable[0], sleUint16, 16, VER(65)),
                 MKARRAY(Actor, _cost.heCondMaskTable[0], sleUint32, 16, VER(65)),
+
+                MKLINE(Actor, _miscflags, sleByte, VER(84)),
+                MKLINE(Actor, _speaking, sleByte, VER(84)),
+                MKLINE(Actor, _speakingPrev, sleByte, VER(84)),
+                MKLINE(Actor, _costCommand, sleByte, VER(84)),
+                MKLINE(Actor, _costFrame, sleByte, VER(84)),
+
                 MKEND()
         };
 

actor.h

@@ -141 +141 @@
         uint32 _hePaletteNum;
         uint32 _heXmapNum;
 
+public:
+        /* v0 specific */
+        byte _miscflags; // 0x1: strong, 0x8: Ed's enemy, 0x40: stop moving, 0x80: hide(dead/radiation suit)
+        byte _speaking, _speakingPrev;
+        byte _costCommand, _costFrame;
+
 protected:
         struct ActorWalkData {
                 Common::Point dest;           // Final destination point
@@ -381 +387 @@
 
 class ActorC64 : public Actor_v2 {
 public:
-        // FIXME: These vars are never saved, which might lead to broken save states.
-        byte _miscflags;
-        byte _speaking, _speakingPrev;
-        byte _costCommand, _costFrame;
-
-public:
-        ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {
-                 _speaking = _speakingPrev = _costCommand = _costFrame = 0;
-        }
+        ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {}
         virtual void initActor(int mode) {
                 Actor_v2::initActor(mode);
+                _speaking = 0;
+                _speakingPrev = 0;
+                _costCommand = 0;
+                _costFrame = 0;
                 if (mode == -1) {
                         _miscflags = 0;
                 }

saveload.h

@@ -50 +50 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 83
+#define CURRENT_VER 84
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead

verbs.cpp

@@ -836 +836 @@
                 
                 // Ignore verbs?
                 Actor *a = derefActor(VAR(VAR_EGO), "verbObtain");
-                if (((ActorC64 *)a)->_miscflags & 0x40) {
+                if (a->_miscflags & 0x40) {
                         resetSentence(false);
                         return false;
                 }
@@ -928 +928 @@
                 if (verbMoveToActor(_activeActor)) {
                         // Ignore verbs?
                         Actor *a = derefActor(VAR(VAR_EGO), "verbExec");
-                        if (((ActorC64 *)a)->_miscflags & 0x40) {
+                        if (a->_miscflags & 0x40) {
                                 resetSentence(false);
                                 return false;
                         }