aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichiesams2013-07-17 12:11:36 -0500
committerrichiesams2013-08-04 13:32:22 -0500
commitd771b615e050ecd13e9da73111230ec16158beb2 (patch)
treeccc69c7ae18c751905f52035377ef82039712af3
parentc7ce580bbde99c1634a1160a18350ccd51badb39 (diff)
downloadscummvm-rg350-d771b615e050ecd13e9da73111230ec16158beb2.tar.gz
scummvm-rg350-d771b615e050ecd13e9da73111230ec16158beb2.tar.bz2
scummvm-rg350-d771b615e050ecd13e9da73111230ec16158beb2.zip
ZVISION: Use individual initialization instead of inline.
-rw-r--r--engines/zvision/zork_raw.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index 78913a7262..140e6a532b 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -57,8 +57,10 @@ RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag dis
_stereo(stereo),
_stream(stream, disposeStream),
_endOfData(false) {
- _lastSample[0] = {0, 0};
- _lastSample[1] = {0, 0};
+ _lastSample[0].index = 0;
+ _lastSample[0].sample = 0;
+ _lastSample[1].index = 0;
+ _lastSample[1].sample = 0;
// Calculate the total playtime of the stream
_playtime = Audio::Timestamp(0, _stream->size() / 2, rate);
@@ -122,8 +124,10 @@ bool RawZorkStream::rewind() {
_stream->seek(0, 0);
_stream->clearErr();
_endOfData = false;
- _lastSample[0] = {0, 0};
- _lastSample[1] = {0, 0};
+ _lastSample[0].index = 0;
+ _lastSample[0].sample = 0;
+ _lastSample[1].index = 0;
+ _lastSample[1].sample = 0;
return true;
}