diff options
| author | Eugene Sandulenko | 2017-03-23 07:17:00 +0000 |
|---|---|---|
| committer | GitHub | 2017-03-23 07:17:00 +0000 |
| commit | db4979fb1c75f80396d666b2217eca9b85a2d353 (patch) | |
| tree | 3e3f47ccbcc27eb2bd72b26ca94f84b46e997652 /engines/fullpipe/gfx.h | |
| parent | 530aa6c9a04e2b14fda0538fc094028dec6a6d6e (diff) | |
| parent | 3e515890e86e924f7fa270acec0de6462a2bc0d1 (diff) | |
| download | scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.tar.gz scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.tar.bz2 scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.zip | |
Merge pull request #925 from bluegr/fullpipe_common_str
Fullpipe Common::String + memory leak fixes
Diffstat (limited to 'engines/fullpipe/gfx.h')
| -rw-r--r-- | engines/fullpipe/gfx.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h index 43c23b49bc..13f4464167 100644 --- a/engines/fullpipe/gfx.h +++ b/engines/fullpipe/gfx.h @@ -39,7 +39,6 @@ struct Bitmap { int _y; int _width; int _height; - byte *_pixels; int _type; int _dataSize; int _flags; @@ -52,10 +51,10 @@ struct Bitmap { ~Bitmap(); void load(Common::ReadStream *s); - void decode(int32 *palette); + void decode(byte *pixels, int32 *palette); void putDib(int x, int y, int32 *palette, byte alpha); - bool putDibRB(int32 *palette); - void putDibCB(int32 *palette); + bool putDibRB(byte *pixels, int32 *palette); + void putDibCB(byte *pixels, int32 *palette); void colorFill(uint32 *dest, int len, int32 color); void paletteFill(uint32 *dest, byte *src, int len, int32 *palette); @@ -133,7 +132,7 @@ class GameObject : public CObject { int _field_8; int16 _flags; int16 _id; - char *_objectName; + Common::String _objectName; int _ox; int _oy; int _priority; @@ -150,7 +149,7 @@ class GameObject : public CObject { void renumPictures(Common::Array<PictureObject *> *lst); void setFlags(int16 flags) { _flags = flags; } void clearFlags() { _flags = 0; } - const char *getName() { return _objectName; } + Common::String getName() { return _objectName; } bool getPicAniInfo(PicAniInfo *info); bool setPicAniInfo(PicAniInfo *info); @@ -186,7 +185,7 @@ class Background : public CObject { public: Common::Array<PictureObject *> _picObjList; - char *_bgname; + Common::String _bgname; int _x; int _y; int16 _messageQueueId; |