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

fracturehill noreply at scummvm.org
Sat Oct 28 13:39:24 UTC 2023


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:
a75be8de57 Revert "SCI: Fix uninitialized variable warnings"


Commit: a75be8de5715ab95ac81a0fa7e35b78940996ab5
    https://github.com/scummvm/scummvm/commit/a75be8de5715ab95ac81a0fa7e35b78940996ab5
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-10-28T16:38:50+03:00

Commit Message:
Revert "SCI: Fix uninitialized variable warnings"

This reverts commit b9fb4e22ec6f25be693341f9d3f5e0a3213aadaf.

Changed paths:
    engines/sci/engine/savegame.cpp
    engines/sci/engine/vm_types.h


diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 553d8691ec0..8dd3a859093 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -778,7 +778,7 @@ void ArrayTable::saveLoadWithSerializer(Common::Serializer &ser) {
 }
 
 void SciArray::saveLoadWithSerializer(Common::Serializer &s) {
-	uint16 savedSize = 0;
+	uint16 savedSize;
 
 	if (s.isSaving()) {
 		savedSize = _size;
@@ -1078,7 +1078,7 @@ void Video32::saveLoadWithSerializer(Common::Serializer &s) {
 	bool robotExists = _robotPlayer.getStatus() != RobotDecoder::kRobotStatusUninitialized;
 	s.syncAsByte(robotExists);
 	if (robotExists) {
-		GuiResourceId robotId = 0;
+		GuiResourceId robotId;
 		reg_t planeId;
 		Common::Point position;
 		int16 priority, scale;
diff --git a/engines/sci/engine/vm_types.h b/engines/sci/engine/vm_types.h
index 51457b17c57..6c222f77dc1 100644
--- a/engines/sci/engine/vm_types.h
+++ b/engines/sci/engine/vm_types.h
@@ -38,8 +38,8 @@ enum {
 
 struct reg_t {
 	// Segment and offset. These should never be accessed directly
-	SegmentId _segment = 0;
-	uint16 _offset = 0;
+	SegmentId _segment;
+	uint16 _offset;
 
 	SegmentId getSegment() const;
 	void setSegment(SegmentId segment);




More information about the Scummvm-git-logs mailing list