[Scummvm-git-logs] scummvm master -> d12f11ad0a060ae103b22ad4a25fd2d460d5bfc2
mduggan
mgithub at guarana.org
Wed Mar 25 14:18:08 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d12f11ad0a ULTIMA8: Prefer initializer lists to assignment in constructors
Commit: d12f11ad0a060ae103b22ad4a25fd2d460d5bfc2
https://github.com/scummvm/scummvm/commit/d12f11ad0a060ae103b22ad4a25fd2d460d5bfc2
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-03-25T23:16:50+09:00
Commit Message:
ULTIMA8: Prefer initializer lists to assignment in constructors
Changed paths:
engines/ultima/ultima8/audio/audio_sample.cpp
engines/ultima/ultima8/audio/audio_sample.h
engines/ultima/ultima8/audio/music_flex.cpp
engines/ultima/ultima8/audio/raw_audio_sample.cpp
engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
engines/ultima/ultima8/filesys/archive.cpp
engines/ultima/ultima8/filesys/flex_file.cpp
engines/ultima/ultima8/filesys/idata_source.h
engines/ultima/ultima8/filesys/odata_source.h
engines/ultima/ultima8/filesys/u8_save_file.cpp
engines/ultima/ultima8/graphics/inverter_process.cpp
engines/ultima/ultima8/graphics/shape.cpp
engines/ultima/ultima8/kernel/segmented_pool.cpp
diff --git a/engines/ultima/ultima8/audio/audio_sample.cpp b/engines/ultima/ultima8/audio/audio_sample.cpp
index 071f5187af..5aca2bfd91 100644
--- a/engines/ultima/ultima8/audio/audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/audio_sample.cpp
@@ -26,8 +26,8 @@
namespace Ultima {
namespace Ultima8 {
-AudioSample::AudioSample(const uint8 *buffer, uint32 size) :
- _sampleRate(0), _bits(0), _stereo(false),
+AudioSample::AudioSample(const uint8 *buffer, uint32 size, uint32 bits, bool stereo) :
+ _sampleRate(0), _bits(bits), _stereo(stereo),
_frameSize(0), _decompressorSize(0), _length(0),
_bufferSize(size), _buffer(buffer) {
}
diff --git a/engines/ultima/ultima8/audio/audio_sample.h b/engines/ultima/ultima8/audio/audio_sample.h
index f5b97418bd..63574955ab 100644
--- a/engines/ultima/ultima8/audio/audio_sample.h
+++ b/engines/ultima/ultima8/audio/audio_sample.h
@@ -41,7 +41,7 @@ protected:
uint8 const *_buffer;
public:
- AudioSample(const uint8 *buffer, uint32 size);
+ AudioSample(const uint8 *buffer, uint32 size, uint32 bits, bool stereo);
virtual ~AudioSample(void);
inline uint32 getRate() const {
diff --git a/engines/ultima/ultima8/audio/music_flex.cpp b/engines/ultima/ultima8/audio/music_flex.cpp
index f06bcb29cf..25d3d96b56 100644
--- a/engines/ultima/ultima8/audio/music_flex.cpp
+++ b/engines/ultima/ultima8/audio/music_flex.cpp
@@ -31,8 +31,7 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(MusicFlex, Archive)
-MusicFlex::MusicFlex(IDataSource *ds) : Archive(ds) {
- _songs = nullptr;
+MusicFlex::MusicFlex(IDataSource *ds) : Archive(ds), _songs(nullptr) {
Std::memset(_info, 0, sizeof(SongInfo *) * 128);
loadSongInfo();
}
diff --git a/engines/ultima/ultima8/audio/raw_audio_sample.cpp b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
index fb6140497e..72e8cd02e4 100644
--- a/engines/ultima/ultima8/audio/raw_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
@@ -29,10 +29,8 @@ namespace Ultima8 {
RawAudioSample::RawAudioSample(const uint8 *buffer_, uint32 size, uint32 rate,
bool signedData, bool stereo)
- : AudioSample(buffer_, size), _signedData(signedData) {
+ : AudioSample(buffer_, size, 8, stereo), _signedData(signedData) {
_sampleRate = rate;
- _bits = 8;
- _stereo = stereo;
_frameSize = 512;
_decompressorSize = sizeof(RawDecompData);
_length = size;
diff --git a/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp b/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
index 941c89bb18..ec0ae111b5 100644
--- a/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
@@ -31,7 +31,7 @@ bool SonarcAudioSample::_generatedOneTable = false;
int SonarcAudioSample::_oneTable[256];
SonarcAudioSample::SonarcAudioSample(uint8 const *buffer, uint32 size) :
- AudioSample(buffer, size), _srcOffset(0x20) {
+ AudioSample(buffer, size, 8, false), _srcOffset(0x20) {
if (!_generatedOneTable) GenerateOneTable();
_length = *_buffer;
@@ -41,8 +41,6 @@ SonarcAudioSample::SonarcAudioSample(uint8 const *buffer, uint32 size) :
_sampleRate = *(_buffer + 4);
_sampleRate |= *(_buffer + 5) << 8;
- _bits = 8;
- _stereo = false;
// Get frame bytes... we need to compensate for 'large' files
uint32 frame_bytes = *(_buffer + _srcOffset);
diff --git a/engines/ultima/ultima8/filesys/archive.cpp b/engines/ultima/ultima8/filesys/archive.cpp
index 567ee5fe4a..360e1cbef8 100644
--- a/engines/ultima/ultima8/filesys/archive.cpp
+++ b/engines/ultima/ultima8/filesys/archive.cpp
@@ -45,13 +45,11 @@ Archive::~Archive() {
}
-Archive::Archive(ArchiveFile *af) {
- _count = 0;
+Archive::Archive(ArchiveFile *af) : _count(0) {
addSource(af);
}
-Archive::Archive(IDataSource *ids) {
- _count = 0;
+Archive::Archive(IDataSource *ids) : _count(0) {
addSource(ids);
}
diff --git a/engines/ultima/ultima8/filesys/flex_file.cpp b/engines/ultima/ultima8/filesys/flex_file.cpp
index e4e63c91dd..44bd997fd7 100644
--- a/engines/ultima/ultima8/filesys/flex_file.cpp
+++ b/engines/ultima/ultima8/filesys/flex_file.cpp
@@ -31,9 +31,7 @@ DEFINE_RUNTIME_CLASSTYPE_CODE(FlexFile, ArchiveFile)
-FlexFile::FlexFile(IDataSource *ds_) {
- _ds = ds_;
- _count = 0;
+FlexFile::FlexFile(IDataSource *ds_) : _ds(ds_), _count(0) {
_valid = isFlexFile(_ds);
if (_valid) {
diff --git a/engines/ultima/ultima8/filesys/idata_source.h b/engines/ultima/ultima8/filesys/idata_source.h
index 8dda57a8dc..695e555bb6 100644
--- a/engines/ultima/ultima8/filesys/idata_source.h
+++ b/engines/ultima/ultima8/filesys/idata_source.h
@@ -120,8 +120,7 @@ private:
Common::SeekableReadStream *_in;
public:
- IFileDataSource(Common::SeekableReadStream *data_stream) {
- _in = data_stream;
+ IFileDataSource(Common::SeekableReadStream *data_stream) : _in(data_stream) {
}
~IFileDataSource() override {
@@ -204,12 +203,10 @@ protected:
public:
IBufferDataSource(const void *data, unsigned int len, bool is_text = false,
- bool delete_data = false) {
+ bool delete_data = false) : _size(len), _freeBuffer(delete_data) {
assert(!is_text);
assert(data != nullptr || len == 0);
_buf = _bufPtr = static_cast<const uint8 *>(data);
- _size = len;
- _freeBuffer = delete_data;
}
virtual void load(const void *data, unsigned int len, bool is_text = false,
diff --git a/engines/ultima/ultima8/filesys/odata_source.h b/engines/ultima/ultima8/filesys/odata_source.h
index af7b33ebad..11400579e9 100644
--- a/engines/ultima/ultima8/filesys/odata_source.h
+++ b/engines/ultima/ultima8/filesys/odata_source.h
@@ -69,8 +69,7 @@ private:
Common::WriteStream *_out;
public:
- OFileDataSource(Common::WriteStream *data_stream) {
- _out = data_stream;
+ OFileDataSource(Common::WriteStream *data_stream) : _out(data_stream) {
}
~OFileDataSource() override {
@@ -146,10 +145,9 @@ protected:
uint8 *_bufPtr;
uint32 _size;
public:
- OBufferDataSource(void *data, uint32 len) {
+ OBufferDataSource(void *data, uint32 len) : _size(len) {
assert(data == 0 || len == 0);
_buf = _bufPtr = reinterpret_cast<uint8 *>(data);
- _size = len;
};
void load(char *data, uint32 len) {
@@ -331,15 +329,11 @@ protected:
}
public:
- OAutoBufferDataSource(uint32 initial_len) {
- _allocated = initial_len;
- _size = 0;
-
+ OAutoBufferDataSource(uint32 initial_len) : _size(0), _loc(0), _allocated(initial_len) {
// Make the min allocated size 16 bytes
if (_allocated < 16)
_allocated = 16;
_buf = _bufPtr = new uint8[_allocated];
- _loc = 0;
};
//! Get a pointer to the data buffer.
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.cpp b/engines/ultima/ultima8/filesys/u8_save_file.cpp
index 9abc78b184..799bb43f63 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.cpp
+++ b/engines/ultima/ultima8/filesys/u8_save_file.cpp
@@ -31,9 +31,7 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(U8SaveFile, NamedArchiveFile)
-U8SaveFile::U8SaveFile(IDataSource *ds_) {
- _ds = ds_;
- _count = 0;
+U8SaveFile::U8SaveFile(IDataSource *ds_) : _ds(ds_), _count(0) {
_valid = isU8SaveFile(_ds);
if (_valid)
diff --git a/engines/ultima/ultima8/graphics/inverter_process.cpp b/engines/ultima/ultima8/graphics/inverter_process.cpp
index 527bf43454..1f916a8c79 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.cpp
+++ b/engines/ultima/ultima8/graphics/inverter_process.cpp
@@ -55,8 +55,7 @@ InverterProcess::InverterProcess()
}
InverterProcess::InverterProcess(unsigned int target)
- : Process() {
- _targetState = target;
+ : Process(), _targetState(target) {
}
InverterProcess::~InverterProcess(void) {
diff --git a/engines/ultima/ultima8/graphics/shape.cpp b/engines/ultima/ultima8/graphics/shape.cpp
index feb95f3317..dba08732a3 100644
--- a/engines/ultima/ultima8/graphics/shape.cpp
+++ b/engines/ultima/ultima8/graphics/shape.cpp
@@ -62,14 +62,13 @@ Shape::Shape(const uint8 *data_, uint32 size_, const ConvertShapeFormat *format,
}
Shape::Shape(IDataSource *src, const ConvertShapeFormat *format)
- : _flexId(0), _shapeNum(0) {
+ : _flexId(0), _shapeNum(0), _palette(nullptr) {
// NB: U8 style!
this->_size = src->getSize();
uint8 *d = new uint8[this->_size];
this->_data = d;
src->read(d, this->_size);
- this->_palette = nullptr;
if (!format)
format = DetectShapeFormat(_data, _size);
diff --git a/engines/ultima/ultima8/kernel/segmented_pool.cpp b/engines/ultima/ultima8/kernel/segmented_pool.cpp
index 4e2475e86d..443707cf4e 100644
--- a/engines/ultima/ultima8/kernel/segmented_pool.cpp
+++ b/engines/ultima/ultima8/kernel/segmented_pool.cpp
@@ -62,7 +62,6 @@ SegmentedPool::SegmentedPool(size_t nodeCapacity_, uint32 nodes)
// Give it its real capacity.
// One redzone is added after the memory block.
_nodeCapacity = OFFSET_ALIGN(nodeCapacity_ + redzoneSize);
- _nodes = nodes;
// Node offsets are aligned to the next uintptr offset after the real size.
// Another redzone is added between the node and the memory block.
More information about the Scummvm-git-logs
mailing list