[Scummvm-git-logs] scummvm master -> 015820f0bd1fc77adbe5412b480dfffe5e0c8a01

[athrxx]

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:
015820f0bd KYRA: init non-initialized member vars


Commit: 015820f0bd1fc77adbe5412b480dfffe5e0c8a01
    https://github.com/scummvm/scummvm/commit/015820f0bd1fc77adbe5412b480dfffe5e0c8a01
Author: athrxx (athrxx at scummvm.org)
Date: 2022-09-20T22:14:53+02:00

Commit Message:
KYRA: init non-initialized member vars

Changed paths:
    engines/kyra/graphics/animator_lok.cpp
    engines/kyra/gui/gui.h
    engines/kyra/gui/gui_eob.h
    engines/kyra/gui/gui_lok.cpp
    engines/kyra/gui/gui_lol.cpp
    engines/kyra/gui/gui_v1.cpp
    engines/kyra/gui/gui_v2.cpp


diff --git a/engines/kyra/graphics/animator_lok.cpp b/engines/kyra/graphics/animator_lok.cpp
index 2da098da175..09753e01457 100644
--- a/engines/kyra/graphics/animator_lok.cpp
+++ b/engines/kyra/graphics/animator_lok.cpp
@@ -33,7 +33,9 @@ Animator_LoK::Animator_LoK(KyraEngine_LoK *vm, OSystem *system) {
 	_system = system;
 	_screenObjects = _actors = _items = _sprites = _objectQueue = nullptr;
 	_noDrawShapesFlag = 0;
-
+	_brandonDrawFrame = 0;
+	_brandonScaleX = _brandonScaleY = _brandonAnimSeqSizeWidth = _brandonAnimSeqSizeHeight = 0;
+	
 	_actorBkgBackUp[0] = new uint8[_screen->getRectSize(8, 69)]();
 	_actorBkgBackUp[1] = new uint8[_screen->getRectSize(8, 69)]();
 }
diff --git a/engines/kyra/gui/gui.h b/engines/kyra/gui/gui.h
index 5ad3892d601..5b10837529f 100644
--- a/engines/kyra/gui/gui.h
+++ b/engines/kyra/gui/gui.h
@@ -123,7 +123,6 @@ protected:
 
 	virtual void sortSaveSlots();
 
-	uint32 _lastScreenUpdate;
 	char **_savegameList;
 	int _savegameListSize;
 	bool _saveSlotsListUpdateNeeded;
diff --git a/engines/kyra/gui/gui_eob.h b/engines/kyra/gui/gui_eob.h
index 6533113d404..44f3290fe2b 100644
--- a/engines/kyra/gui/gui_eob.h
+++ b/engines/kyra/gui/gui_eob.h
@@ -135,8 +135,6 @@ private:
 
 	EoBCoreEngine *_vm;
 
-	bool _pressFlag;
-
 	Button *_specialProcessButton;
 	Button *_backupButtonList;
 	uint16 _flagsMouseLeft;
diff --git a/engines/kyra/gui/gui_lok.cpp b/engines/kyra/gui/gui_lok.cpp
index 0c686595805..51e4eafd867 100644
--- a/engines/kyra/gui/gui_lok.cpp
+++ b/engines/kyra/gui/gui_lok.cpp
@@ -179,7 +179,6 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 #pragma mark -
 
 GUI_LoK::GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen) : GUI_v1(vm), _vm(vm), _screen(screen) {
-	_lastScreenUpdate = 0;
 	_menu = nullptr;
 	_pressFlag = false;
 	initStaticResource();
diff --git a/engines/kyra/gui/gui_lol.cpp b/engines/kyra/gui/gui_lol.cpp
index 307aeb116d2..ab7694140bc 100644
--- a/engines/kyra/gui/gui_lol.cpp
+++ b/engines/kyra/gui/gui_lol.cpp
@@ -1854,6 +1854,11 @@ GUI_LoL::GUI_LoL(LoLEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen) {
 	_specialProcessButton = _backUpButtonList = 0;
 	_flagsModifier = 0;
 	_sliderSfx = 11;
+
+	_currentMenu = _lastMenu = _newMenu = nullptr;
+	_saveDescription = nullptr;
+	_menuResult = _savegameOffset = 0;
+	_pressFlag = false;
 }
 
 void GUI_LoL::processButton(Button *button) {
diff --git a/engines/kyra/gui/gui_v1.cpp b/engines/kyra/gui/gui_v1.cpp
index 0c3309661c9..ddec7e36359 100644
--- a/engines/kyra/gui/gui_v1.cpp
+++ b/engines/kyra/gui/gui_v1.cpp
@@ -35,6 +35,9 @@ GUI_v1::GUI_v1(KyraEngine_v1 *kyra) : GUI(kyra), _text(kyra->text()) {
 
 	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawButtonCallback);
 	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawShadedButtonCallback);
+
+	_displayMenu = _displaySubMenu = _cancelSubMenu = false;
+	_lastScreenUpdate = 0;
 }
 
 Button *GUI_v1::addButtonToList(Button *list, Button *newButton) {
@@ -414,6 +417,8 @@ MainMenu::MainMenu(KyraEngine_v1 *vm) : _vm(vm), _screen(nullptr) {
 	_screen = _vm->screen();
 	_nextUpdate = 0;
 	_system = g_system;
+	memset(&_static, 0, sizeof(_static));
+	memset(&_animIntern, 0, sizeof(_animIntern));
 }
 
 void MainMenu::init(StaticData data, Animation anim) {
diff --git a/engines/kyra/gui/gui_v2.cpp b/engines/kyra/gui/gui_v2.cpp
index 08512ba72c9..a04931c34d2 100644
--- a/engines/kyra/gui/gui_v2.cpp
+++ b/engines/kyra/gui/gui_v2.cpp
@@ -32,7 +32,6 @@ namespace Kyra {
 GUI_v2::GUI_v2(KyraEngine_v2 *vm) : GUI_v1(vm), _vm(vm), _screen(vm->screen_v2()) {
 	_backUpButtonList = _specialProcessButton = nullptr;
 	_buttonListChanged = false;
-	_lastScreenUpdate = 0;
 	_flagsModifier = 0;
 
 	_currentMenu = nullptr;
@@ -47,6 +46,9 @@ GUI_v2::GUI_v2(KyraEngine_v2 *vm) : GUI_v1(vm), _vm(vm), _screen(vm->screen_v2()
 	_saveMenuFont = Screen::FID_8_FNT;
 	_saveMenuCursor = Common::Rect(1, 1, 7, 8);
 	_saveLoadNumSlots = 5;
+	_isChoiceMenu = _isOptionsMenu = _madeSave = _loadedSave = _restartGame = _reloadTemporarySave = false;
+	_noLoadProcess = _noSaveProcess = _choice = _finishNameInput = _cancelNameInput = false;
+	_saveSlot = _slotToDelete = 0;
 
 	if (vm->game() == GI_KYRA2 && vm->gameFlags().lang == Common::ZH_TWN) {
 		_saveMenuFont = Screen::FID_CHINESE_FNT;