[Scummvm-git-logs] scummvm master -> 6378e505b5472ec22ed39af6a81455510a1598b3
athrxx
noreply at scummvm.org
Mon Sep 19 22:27:23 UTC 2022
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:
6378e505b5 KYRA: init non-initialized member vars
Commit: 6378e505b5472ec22ed39af6a81455510a1598b3
https://github.com/scummvm/scummvm/commit/6378e505b5472ec22ed39af6a81455510a1598b3
Author: athrxx (athrxx at scummvm.org)
Date: 2022-09-20T00:27:09+02:00
Commit Message:
KYRA: init non-initialized member vars
Changed paths:
engines/kyra/engine/kyra_lok.h
engines/kyra/graphics/screen_eob.cpp
engines/kyra/graphics/screen_lok.cpp
engines/kyra/graphics/wsamovie.cpp
engines/kyra/script/script.cpp
engines/kyra/script/script_tim.cpp
engines/kyra/sequence/seqplayer_lok.cpp
engines/kyra/sequence/sequences_hof.cpp
engines/kyra/sound/drivers/adlib.cpp
engines/kyra/sound/sound_pc_midi.cpp
engines/kyra/text/text_rpg.cpp
diff --git a/engines/kyra/engine/kyra_lok.h b/engines/kyra/engine/kyra_lok.h
index a34f9522089..06642b217ab 100644
--- a/engines/kyra/engine/kyra_lok.h
+++ b/engines/kyra/engine/kyra_lok.h
@@ -66,8 +66,8 @@ struct Room {
};
struct SeqLoop {
- const uint8 *ptr;
- uint16 count;
+ const uint8 *ptr = nullptr;
+ uint16 count = 0;
};
struct SceneExits {
diff --git a/engines/kyra/graphics/screen_eob.cpp b/engines/kyra/graphics/screen_eob.cpp
index 13666ff71cd..692581cd136 100644
--- a/engines/kyra/graphics/screen_eob.cpp
+++ b/engines/kyra/graphics/screen_eob.cpp
@@ -71,6 +71,7 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system,
_segaCustomPalettes = 0;
_palFaders = 0;
_defaultRenderBuffer = 0;
+ _defaultRenderBufferSize = 0;
_specialColorReplace = false;
memset(_segaCurPalette, 0, sizeof(_segaCurPalette));
}
diff --git a/engines/kyra/graphics/screen_lok.cpp b/engines/kyra/graphics/screen_lok.cpp
index 33e2aa468eb..50588a05f51 100644
--- a/engines/kyra/graphics/screen_lok.cpp
+++ b/engines/kyra/graphics/screen_lok.cpp
@@ -33,6 +33,8 @@ Screen_LoK::Screen_LoK(KyraEngine_LoK *vm, OSystem *system)
_vm = vm;
_unkPtr1 = _unkPtr2 = nullptr;
_bitBlitNum = 0;
+ memset(_saveLoadPage, 0, sizeof(_saveLoadPage));
+ memset(_saveLoadPageOvl, 0, sizeof(_saveLoadPageOvl));
}
Screen_LoK::~Screen_LoK() {
diff --git a/engines/kyra/graphics/wsamovie.cpp b/engines/kyra/graphics/wsamovie.cpp
index 7d95c9723ab..f049893af75 100644
--- a/engines/kyra/graphics/wsamovie.cpp
+++ b/engines/kyra/graphics/wsamovie.cpp
@@ -26,8 +26,8 @@
namespace Kyra {
-WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm)
- : Movie(vm), _frameData(nullptr), _frameOffsTable(nullptr), _offscreenBuffer(nullptr), _deltaBuffer(nullptr) {
+WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm) : Movie(vm), _frameData(nullptr), _frameOffsTable(nullptr),
+ _offscreenBuffer(nullptr), _deltaBuffer(nullptr), _currentFrame(0), _numFrames(0), _width(0), _height(0), _flags(0), _deltaBufferSize(0) {
}
WSAMovie_v1::~WSAMovie_v1() {
diff --git a/engines/kyra/script/script.cpp b/engines/kyra/script/script.cpp
index 53e86394e74..63dbc824fa7 100644
--- a/engines/kyra/script/script.cpp
+++ b/engines/kyra/script/script.cpp
@@ -26,7 +26,7 @@
#include "common/endian.h"
namespace Kyra {
-EMCInterpreter::EMCInterpreter(KyraEngine_v1 *vm) : _vm(vm), _scriptData(nullptr), _filename(nullptr) {
+EMCInterpreter::EMCInterpreter(KyraEngine_v1 *vm) : _vm(vm), _scriptData(nullptr), _filename(nullptr), _parameter(0) {
#define OPCODE(x) { &EMCInterpreter::x, #x }
static const OpcodeEntry opcodes[] = {
// 0x00
diff --git a/engines/kyra/script/script_tim.cpp b/engines/kyra/script/script_tim.cpp
index 2d1569662e1..913c45ea1df 100644
--- a/engines/kyra/script/script_tim.cpp
+++ b/engines/kyra/script/script_tim.cpp
@@ -99,6 +99,11 @@ TIMInterpreter::TIMInterpreter(KyraEngine_v1 *engine, Screen_v2 *screen_v2, OSys
_palDelayInc = _palDiff = _palDelayAcc = 0;
_abortFlag = 0;
_tim = nullptr;
+
+ _currentFunc = 0;
+ _finished = false;
+ _avtlChunkSize = 0;
+ _filename = nullptr;
}
TIMInterpreter::~TIMInterpreter() {
diff --git a/engines/kyra/sequence/seqplayer_lok.cpp b/engines/kyra/sequence/seqplayer_lok.cpp
index 07b5f0453c6..56337b556ce 100644
--- a/engines/kyra/sequence/seqplayer_lok.cpp
+++ b/engines/kyra/sequence/seqplayer_lok.cpp
@@ -42,6 +42,17 @@ SeqPlayer::SeqPlayer(KyraEngine_LoK *vm, OSystem *system) {
_seqSkipCommand = false;
_seqLoopPos = 0;
+ _seqData = nullptr;
+ _seqWsaCurDecodePage = 0;
+ _seqDisplayedTextTimer = 0;
+ _seqDisplayTextFlag = false;
+ _seqDisplayedText = 0;;
+ _seqDisplayedChar = 0;
+ _seqDisplayedTextX = 0;
+ _seqTalkTextPrinted = false;
+ _seqTalkTextRestored = false;
+ _seqQuitFlag = false;
+
for (int i = 0; i < ARRAYSIZE(_handShapes); ++i)
_handShapes[i] = nullptr;
for (int i = 0; i < ARRAYSIZE(_seqMovies); ++i)
diff --git a/engines/kyra/sequence/sequences_hof.cpp b/engines/kyra/sequence/sequences_hof.cpp
index de28dc95704..6859dfe913b 100644
--- a/engines/kyra/sequence/sequences_hof.cpp
+++ b/engines/kyra/sequence/sequences_hof.cpp
@@ -384,6 +384,11 @@ SeqPlayer_HOF::SeqPlayer_HOF(KyraEngine_v1 *vm, Screen_v2 *screen, OSystem *syst
_target = kHoF;
_firstScene = _loopStartScene = 0;
+ _specialAnimTimeOutTotal = 0;
+ _specialAnimFrameTimeOut = 0;
+
+ memset(_hofDemoItemShapes, 0, sizeof(_hofDemoItemShapes));
+
_defaultFont = (_vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : ((_vm->gameFlags().lang == Common::JA_JPN) ? Screen::FID_SJIS_FNT : Screen::FID_GOLDFONT_FNT);
_creditsFont = (_vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : Screen::FID_8_FNT;
_creditsFont2 = (_vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_GOLDFONT_FNT : Screen::FID_8_FNT;
diff --git a/engines/kyra/sound/drivers/adlib.cpp b/engines/kyra/sound/drivers/adlib.cpp
index d612c2e0bfe..9d2ff801b15 100644
--- a/engines/kyra/sound/drivers/adlib.cpp
+++ b/engines/kyra/sound/drivers/adlib.cpp
@@ -353,6 +353,7 @@ AdLibDriver::AdLibDriver(Audio::Mixer *mixer, int version) : PCSoundDriver() {
_musicVolume = 0;
_sfxVolume = 0;
+ _sfxPriority = _sfxVelocity = 0;
_sfxPointer = nullptr;
diff --git a/engines/kyra/sound/sound_pc_midi.cpp b/engines/kyra/sound/sound_pc_midi.cpp
index 30dd04b8cf4..a34ecf6763a 100644
--- a/engines/kyra/sound/sound_pc_midi.cpp
+++ b/engines/kyra/sound/sound_pc_midi.cpp
@@ -52,6 +52,7 @@ SoundMidiPC::SoundMidiPC(KyraEngine_v1 *vm, Audio::Mixer *mixer, MidiDriver *dri
_musicVolume = _sfxVolume = 0;
_fadeMusicOut = false;
+ _fadeStartTime = 0;
_type = type;
assert(_type == kMidiMT32 || _type == kMidiGM || _type == kPCSpkr);
diff --git a/engines/kyra/text/text_rpg.cpp b/engines/kyra/text/text_rpg.cpp
index 85e7c457995..940a959d0d8 100644
--- a/engines/kyra/text/text_rpg.cpp
+++ b/engines/kyra/text/text_rpg.cpp
@@ -74,6 +74,8 @@ TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr) : _vm(e
_table1 = new char[128]();
_table2 = new char[16]();
+ _tempString1 = _tempString2 = 0;
+
_waitButtonSpace = 0;
}
More information about the Scummvm-git-logs
mailing list