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

[a-yyg]

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:
e42615a844 SAGA2: Fix for unaligned pointer warnings


Commit: e42615a844403bcbf98880312806a186a837b2b8
    https://github.com/scummvm/scummvm/commit/e42615a844403bcbf98880312806a186a837b2b8
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-02T06:55:54+09:00

Commit Message:
SAGA2: Fix for unaligned pointer warnings

Changed paths:
    engines/saga2/objects.cpp
    engines/saga2/objects.h


diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp
index 47af989525..b45cab41b7 100644
--- a/engines/saga2/objects.cpp
+++ b/engines/saga2/objects.cpp
@@ -3990,17 +3990,17 @@ ObjectID ActiveRegionObjectIterator::next(GameObject **obj) {
 
 ContainerIterator::ContainerIterator(GameObject *container) {
 	//  Get the ID of the 1st object in the sector list
-	nextID = &container->_data.childID;
+	nextID = container->_data.childID;
 	object = nullptr;
 }
 
 ObjectID ContainerIterator::next(GameObject **obj) {
-	ObjectID        id = *nextID;
+	ObjectID        id = nextID;
 
 	if (id == Nothing) return Nothing;
 
 	object = GameObject::objectAddress(id);
-	nextID = &object->_data.siblingID;
+	nextID = object->_data.siblingID;
 
 	if (obj) *obj = object;
 	return id;
diff --git a/engines/saga2/objects.h b/engines/saga2/objects.h
index b62a73a251..f19d9b7315 100644
--- a/engines/saga2/objects.h
+++ b/engines/saga2/objects.h
@@ -1232,7 +1232,7 @@ public:
 //  This class iterates through every object within a container
 
 class ContainerIterator {
-	ObjectID        *nextID;
+	ObjectID         nextID;
 
 public:
 	GameObject      *object;