diff options
| author | Colin Snover | 2017-11-29 00:06:12 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-01-31 17:58:01 +0100 |
| commit | 9916b263831f20e5841275051a8ed014de1f24eb (patch) | |
| tree | bcd69585fa26cfa3c93ab60c7c480433fe9746f9 /engines/scumm/actor.h | |
| parent | 157ee95f64380215c3e6b1fed53be99607479582 (diff) | |
| download | scummvm-rg350-9916b263831f20e5841275051a8ed014de1f24eb.tar.gz scummvm-rg350-9916b263831f20e5841275051a8ed014de1f24eb.tar.bz2 scummvm-rg350-9916b263831f20e5841275051a8ed014de1f24eb.zip | |
SCUMM: Replace UB-triggering serialization code with Common::Serializer
Fixes Trac#10342.
Diffstat (limited to 'engines/scumm/actor.h')
| -rw-r--r-- | engines/scumm/actor.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h index 62ba161f4e..c059d08397 100644 --- a/engines/scumm/actor.h +++ b/engines/scumm/actor.h @@ -25,6 +25,7 @@ #define SCUMM_ACTOR_H #include "common/scummsys.h" +#include "common/serializer.h" #include "scumm/saveload.h" #include "scumm/scumm.h" @@ -82,7 +83,7 @@ enum { kNewInavlidBox = 0 }; -class Actor : public Serializable { +class Actor : public Common::Serializable { public: static byte kInvalidBox; @@ -300,8 +301,7 @@ public: void classChanged(int cls, bool value); - // Used by the save/load system: - virtual void saveLoadWithSerializer(Serializer *ser); + virtual void saveLoadWithSerializer(Common::Serializer &ser); protected: bool isInClass(int cls); @@ -421,8 +421,7 @@ public: void setTmpFromActor(); void setActorFromTmp(); - // Used by the save/load system: - virtual void saveLoadWithSerializer(Serializer *ser); + virtual void saveLoadWithSerializer(Common::Serializer &ser); }; |