[Scummvm-git-logs] scummvm master -> 2c110fd12ad287dcb92e8a1004bc04ba7db11fd4
sluicebox
noreply at scummvm.org
Wed Oct 9 15:53:19 UTC 2024
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:
2c110fd12a SCI: Initialize various members
Commit: 2c110fd12ad287dcb92e8a1004bc04ba7db11fd4
https://github.com/scummvm/scummvm/commit/2c110fd12ad287dcb92e8a1004bc04ba7db11fd4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-10-09T09:52:33-06:00
Commit Message:
SCI: Initialize various members
Coverity issues
Changed paths:
engines/sci/engine/segment.h
engines/sci/graphics/cursor32.cpp
engines/sci/graphics/palette.cpp
engines/sci/graphics/picture.cpp
engines/sci/graphics/plane32.cpp
engines/sci/graphics/transitions.cpp
engines/sci/graphics/video32.cpp
engines/sci/sound/drivers/pcjr.cpp
engines/sci/sound/midiparser_sci.cpp
engines/sci/sound/midiparser_sci.h
engines/sci/sound/music.cpp
engines/sci/video/robot_decoder.cpp
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index 8035a9ec872..1ca13f38153 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -214,9 +214,14 @@ struct List {
* The current level of recursion of kListEachElementDo for this list.
*/
int numRecursions;
+#endif
- List() : numRecursions(0), first(NULL_REG), last(NULL_REG) {}
+ List() : first(NULL_REG), last(NULL_REG) {
+#ifdef ENABLE_SCI32
+ memset(nextNodes, 0, sizeof(nextNodes));
+ numRecursions = 0;
#endif
+ }
};
struct Hunk {
diff --git a/engines/sci/graphics/cursor32.cpp b/engines/sci/graphics/cursor32.cpp
index 1fac1c81e07..cb47e5cf0ab 100644
--- a/engines/sci/graphics/cursor32.cpp
+++ b/engines/sci/graphics/cursor32.cpp
@@ -36,7 +36,8 @@ enum {
GfxCursor32::GfxCursor32() :
_hideCount(0),
- _position(0, 0),
+ _width(0),
+ _height(0),
_needsPaint(false) {
}
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index bac7bd79aed..85a9bd12686 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -426,7 +426,7 @@ void GfxPalette::drewPicture(GuiResourceId pictureId) {
_sysPalette.timestamp++;
if (_palVaryResourceId != -1) {
- if (g_sci->getEngineState()->gameIsRestarting == 0) // only if not restored nor restarted
+ if (g_sci->getEngineState()->gameIsRestarting == GAMEISRESTARTING_NONE) // only if not restored nor restarted
palVaryLoadTargetPalette(pictureId);
}
}
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index c69828f9876..ee4bfb4a2c6 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -36,7 +36,18 @@ namespace Sci {
//#define DEBUG_PICTURE_DRAW
GfxPicture::GfxPicture(ResourceManager *resMan, GfxCoordAdjuster16 *coordAdjuster, GfxPorts *ports, GfxScreen *screen, GfxPalette *palette, GuiResourceId resourceId, bool EGAdrawingVisualize)
- : _resMan(resMan), _coordAdjuster(coordAdjuster), _ports(ports), _screen(screen), _palette(palette), _resourceId(resourceId), _EGAdrawingVisualize(EGAdrawingVisualize) {
+ : _resMan(resMan),
+ _coordAdjuster(coordAdjuster),
+ _ports(ports), _screen(screen),
+ _palette(palette),
+ _resourceId(resourceId),
+ _resourceType(SCI_PICTURE_TYPE_REGULAR),
+ _mirroredFlag(false),
+ _addToFlag(false),
+ _EGApaletteNo(0),
+ _priority(0),
+ _EGAdrawingVisualize(EGAdrawingVisualize) {
+
assert(resourceId != -1);
initData(resourceId);
}
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index 9d7912af974..bfff0e98f1a 100644
--- a/engines/sci/graphics/plane32.cpp
+++ b/engines/sci/graphics/plane32.cpp
@@ -50,6 +50,7 @@ Plane::Plane(const Common::Rect &gameRect, PlanePictureCodes pictureId) :
_creationId(_nextCreationId++),
_pictureId(pictureId),
_mirrored(false),
+_pictureChanged(false),
_type(kPlaneTypeColored),
_back(0),
_priorityChanged(false),
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index e2692e47393..bfd144a71d6 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -109,6 +109,8 @@ void GfxTransitions::init() {
// setup default transition
_number = SCI_TRANSITIONS_HORIZONTALROLL_FROMCENTER;
_blackoutFlag = false;
+
+ _transitionStartTime = 0;
}
void GfxTransitions::setup(int16 number, bool blackoutFlag) {
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 952168bad57..300351d155e 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -590,6 +590,7 @@ VMDPlayer::VMDPlayer(EventManager *eventMan, SegManager *segMan) :
_plane(nullptr),
_screenItem(nullptr),
+ _bitmapId(NULL_REG),
_planeIsOwned(true),
_priority(0),
_doublePixels(false),
@@ -598,6 +599,7 @@ VMDPlayer::VMDPlayer(EventManager *eventMan, SegManager *segMan) :
_leaveScreenBlack(false),
_leaveLastFrame(false),
_ignorePalettes(false),
+ _isComposited(false),
_blackoutPlane(nullptr),
@@ -1179,7 +1181,9 @@ DuckPlayer::DuckPlayer(EventManager *eventMan, SegManager *segMan) :
_plane(nullptr),
_status(kDuckClosed),
_volume(Audio::Mixer::kMaxChannelVolume),
- _doFrameOut(false) {
+ _doFrameOut(false),
+ _doublePixels(false),
+ _blackLines(false) {
_decoder->setSoundType(Audio::Mixer::kSFXSoundType);
}
diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp
index b3d642c666a..6c90d8d315e 100644
--- a/engines/sci/sound/drivers/pcjr.cpp
+++ b/engines/sci/sound/drivers/pcjr.cpp
@@ -491,7 +491,7 @@ private:
};
MidiDriver_PCJr::MidiDriver_PCJr(Audio::Mixer *mixer, SciVersion version, bool pcsMode) : _mixer(mixer), _version(version), _pcsMode(pcsMode), _numChannels(pcsMode ? 1 : 3),
- _masterVolume(0), _channels(nullptr), _instrumentOffsets(nullptr), _instrumentData(nullptr), _isOpen(false) {
+ _masterVolume(0), _channels(nullptr), _instrumentOffsets(nullptr), _instrumentData(nullptr), _timerProc(nullptr), _timerProcPara(nullptr), _isOpen(false) {
uint16 *smpVolTable = new uint16[16]();
for (int i = 0; i < 15; ++i) // The last entry is left at zero.
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index eeffe27383d..3be503eb83c 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -51,11 +51,13 @@ MidiParser_SCI::MidiParser_SCI(SciVersion soundVersion, SciMusic *music) :
_ppqn = 1;
setTempo(16667);
+ _track = nullptr;
+ _pSnd = nullptr;
+ _loopTick = 0;
_masterVolume = 15;
_volume = 127;
_resetOnPause = false;
- _pSnd = nullptr;
_mainThreadCalled = false;
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index 15017cb67e5..395c1a015c9 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -127,7 +127,6 @@ protected:
};
ChannelState _channelState[16];
-
};
} // End of namespace Sci
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 6f98ab18a93..6b34183b4fa 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1025,6 +1025,8 @@ MusicEntry::MusicEntry() {
volume = MUSIC_VOLUME_DEFAULT;
hold = -1;
reverb = -1;
+ playBed = false;
+ overridePriority = false;
pauseCounter = 0;
sampleLoopCounter = 0;
@@ -1051,6 +1053,7 @@ MusicEntry::MusicEntry() {
_chan[i]._prio = 127;
_chan[i]._voices = 0;
_chan[i]._dontRemap = false;
+ _chan[i]._dontMap = false;
_chan[i]._mute = false;
}
}
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp
index c82efb483e1..7db361bd8fa 100644
--- a/engines/sci/video/robot_decoder.cpp
+++ b/engines/sci/video/robot_decoder.cpp
@@ -46,6 +46,10 @@ extern void deDPCM16Mono(int16 *out, const byte *in, const uint32 numBytes, int1
RobotAudioStream::RobotAudioStream(const int32 bufferSize) :
_loopBuffer((byte *)malloc(bufferSize)),
_loopBufferSize(bufferSize),
+ _readHead(0),
+ _readHeadAbs(0),
+ _maxWriteAbs(0),
+ _writeHeadAbs(0),
_decompressionBuffer(nullptr),
_decompressionBufferSize(0),
_decompressionBufferPosition(-1),
More information about the Scummvm-git-logs
mailing list