[Scummvm-git-logs] scummvm master -> f157ec8dcb46b5755bccf011c62bfdab8b1b9769

[Strangerke]

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:
f157ec8dcb ACCESS: Janitorial - Initialize some variables


Commit: f157ec8dcb46b5755bccf011c62bfdab8b1b9769
    https://github.com/scummvm/scummvm/commit/f157ec8dcb46b5755bccf011c62bfdab8b1b9769
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-05-01T09:38:33+01:00

Commit Message:
ACCESS: Janitorial - Initialize some variables

Changed paths:
    engines/access/access.cpp
    engines/access/inventory.cpp
    engines/access/inventory.h
    engines/access/martian/martian_game.cpp
    engines/access/martian/martian_room.cpp
    engines/access/screen.cpp
    engines/access/screen.h
    engines/access/sound.cpp


diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index b61334b88fb..12572adbce6 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -79,7 +79,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_establish = nullptr;
 
 	_conversation = 0;
-	_currentMan = 0;
 	_newTime = 0;
 	_newDate = 0;
 	Common::fill(&_objectsTable[0], &_objectsTable[100], (SpriteResource *)nullptr);
@@ -120,6 +119,9 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_pictureTaken = 0;
 
 	_vidEnd = false;
+
+	for (int i = 0; i < 6; ++i)
+		_countTbl[i] = 0;
 }
 
 AccessEngine::~AccessEngine() {
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index b10dbb5e3b6..8a647171c2a 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -54,6 +54,18 @@ int InventoryEntry::checkItem(int itemId) {
 
 /*------------------------------------------------------------------------*/
 
+InventoryManager::SavedFields::SavedFields() {
+	_vWindowHeight = _vWindowLinesTall = _vWindowWidth = _vWindowBytesWide = 0;
+	_playFieldHeight = _playFieldWidth = 0;
+	_windowXAdd = _windowYAdd = 0;
+	_screenYOff = 0;
+	_scrollX = _scrollY = 0;
+	_clipWidth = _clipHeight = 0;
+	_scrollCol = _scrollRow = 0;
+}
+
+/*------------------------------------------------------------------------*/
+
 InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_startInvItem = 0;
 	_startInvBox = 0;
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 1282f1490a7..2e7fd834f87 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -68,6 +68,8 @@ class InventoryManager : public Manager {
 		Common::Point _bufferStart;
 		int _scrollCol;
 		int _scrollRow;
+
+		SavedFields();
 	};
 private:
 	Common::Array<int> _items;
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 15e4255fc09..741141d4662 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -31,6 +31,10 @@ namespace Access {
 namespace Martian {
 
 MartianEngine::MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc) : AccessEngine(syst, gameDesc) {
+	_skipStart = false;
+	_introObjects = nullptr;
+	_creditsStream = nullptr;
+	_spec7Objects = nullptr;
 }
 
 MartianEngine::~MartianEngine() {
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 63dc1b07b77..ef2814266e9 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -32,6 +32,12 @@ namespace Martian {
 
 MartianRoom::MartianRoom(AccessEngine *vm) : Room(vm) {
 	_game = (MartianEngine *)vm;
+
+	for (int i = 0; i < 30; i++)
+		_byte26CD2[i] = 0;
+
+	for (int i = 0; i < 10; i++)
+		_byte26CBC[i] = 0;
 }
 
 MartianRoom::~MartianRoom() {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index ab226536ba5..da4e958f5f8 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -34,6 +34,13 @@ namespace Access {
 
 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
 
+ScreenSave::ScreenSave(){
+	_clipWidth = _clipHeight = 0;
+	_windowXAdd = _windowYAdd = 0;
+	_scrollCol = _scrollRow = 0;
+	_screenYOff = 0;
+}
+
 Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	create(320, 200);
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
@@ -63,6 +70,13 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_cycleStart = 0;
 	_endCycle = 0;
 	_fadeIn = false;
+
+	for (int i = 0; i < 768; ++i) {
+		_rawPalette[i] = 0;
+		_savedPalettes[0][i] = 0;
+		_savedPalettes[1][i] = 0;
+		_tempPalette[i] = 0;
+	}
 }
 
 void Screen::clearScreen() {
diff --git a/engines/access/screen.h b/engines/access/screen.h
index c57268ed529..d315f3cfe4b 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -42,6 +42,8 @@ struct ScreenSave {
 	int _scrollRow;
 	Common::Point _bufferStart;
 	int _screenYOff;
+
+	ScreenSave();
 };
 
 class Screen : public BaseSurface {
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 96470bfab0e..8beb49ebabf 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -35,6 +35,7 @@ namespace Access {
 
 SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_effectsHandle = new Audio::SoundHandle();
+	_playingSound = false;
 }
 
 SoundManager::~SoundManager() {