aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he/intern_he.h
diff options
context:
space:
mode:
authorColin Snover2017-11-29 00:06:12 -0600
committerEugene Sandulenko2018-01-31 17:58:01 +0100
commit9916b263831f20e5841275051a8ed014de1f24eb (patch)
treebcd69585fa26cfa3c93ab60c7c480433fe9746f9 /engines/scumm/he/intern_he.h
parent157ee95f64380215c3e6b1fed53be99607479582 (diff)
downloadscummvm-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/he/intern_he.h')
-rw-r--r--engines/scumm/he/intern_he.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index bd3cdb2c57..25dd31f007 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -73,7 +73,7 @@ public:
protected:
virtual void setupOpcodes();
- virtual void saveOrLoad(Serializer *s);
+ virtual void saveLoadWithSerializer(Common::Serializer &s);
void localizeArray(int slot, byte scriptSlot);
void redimArray(int arrayId, int newX, int newY, int d);
@@ -163,7 +163,7 @@ protected:
virtual void setupScummVars();
virtual void resetScummVars();
- virtual void saveOrLoad(Serializer *s);
+ virtual void saveLoadWithSerializer(Common::Serializer &s);
virtual void readRoomsOffsets();
virtual void readGlobalObjects();
@@ -222,7 +222,7 @@ public:
protected:
virtual void setupOpcodes();
- virtual void saveOrLoad(Serializer *s);
+ virtual void saveLoadWithSerializer(Common::Serializer &s);
virtual void redrawBGAreas();
@@ -490,7 +490,7 @@ protected:
virtual void processInput();
virtual void clearClickedStatus();
- virtual void saveOrLoad(Serializer *s);
+ virtual void saveLoadWithSerializer(Common::Serializer &s);
virtual void readMAXS(int blockSize);
void setResourceOffHeap(int typeId, int resId, int val);
@@ -581,7 +581,7 @@ protected:
virtual void readMAXS(int blockSize);
- virtual void saveOrLoad(Serializer *s);
+ virtual void saveLoadWithSerializer(Common::Serializer &s);
virtual void copyPalColor(int dst, int src);
virtual void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor);
@@ -613,7 +613,7 @@ public:
protected:
virtual void setupOpcodes();
- virtual void saveOrLoad(Serializer *s);
+ virtual void saveLoadWithSerializer(Common::Serializer &s);
virtual void decodeParseString(int a, int b);