diff options
| author | D G Turner | 2011-06-01 03:42:06 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-12-27 15:39:52 +0100 |
| commit | 6d90f6c0896cc270efa98d2714c523b09b308c55 (patch) | |
| tree | f71b4c6bd87a8f9dcf6b3edee32c15dc72462e74 /engines/wage/entities.h | |
| parent | 624c4018736f93b499597f78b6dabed7e08d1016 (diff) | |
| download | scummvm-rg350-6d90f6c0896cc270efa98d2714c523b09b308c55.tar.gz scummvm-rg350-6d90f6c0896cc270efa98d2714c523b09b308c55.tar.bz2 scummvm-rg350-6d90f6c0896cc270efa98d2714c523b09b308c55.zip | |
WAGE: Fixed Remaining Issues Preventing Compilation.
Signed-off-by: Eugene Sandulenko <sev@scummvm.org>
Diffstat (limited to 'engines/wage/entities.h')
| -rw-r--r-- | engines/wage/entities.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wage/entities.h b/engines/wage/entities.h index f99d6d189a..3acde80988 100644 --- a/engines/wage/entities.h +++ b/engines/wage/entities.h @@ -143,7 +143,7 @@ public: SHIELD_ARMOR = 2 }; - Chr(String name, byte *data, int dataSize); + Chr(String name, Common::SeekableReadStream *data); int _index; String _initialScene; @@ -296,7 +296,7 @@ public: class Obj : public Weapon, public Designed { public: Obj() : _currentOwner(NULL), _currentScene(NULL) {} - Obj(String name, byte *data, int dataSize); + Obj(String name, Common::SeekableReadStream *data); enum ObjectTypes { REGULAR_WEAPON = 1, @@ -381,7 +381,7 @@ public: Common::List<Chr> _chrs; Scene() {} - Scene(String name, byte *data, int dataSize); + Scene(String name, Common::SeekableReadStream *data); Common::Rect *getTextBounds() { return _textBounds == NULL ? NULL : new Common::Rect(*_textBounds); @@ -443,11 +443,11 @@ taliesin(24):Wingdings(Decorative) class Sound { public: - Sound(String name, byte *data, int dataSize) : _name(name), _data(data) {} - ~Sound() { free(_data); } + Sound(String name, Common::SeekableReadStream *data) : _name(name), _data(data) {} + ~Sound() { } String _name; - byte *_data; + Common::SeekableReadStream *_data; }; } // End of namespace Wage |