[Scummvm-git-logs] scummvm master -> 6bddbbc9c4019325c0911e3c31477a052ad618cf

[mduggan]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
10f4e2fea1 ULTIMA8: Remove duplicate include
3608d0b282 ULTIMA8: Remove friend declaration for non-existant class
6bddbbc9c4 ULTIMA8: Correct typo in comment


Commit: 10f4e2fea180b53a60baa6406de99a62d3b75d30
    https://github.com/scummvm/scummvm/commit/10f4e2fea180b53a60baa6406de99a62d3b75d30
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-03-23T21:55:08+09:00

Commit Message:
ULTIMA8: Remove duplicate include

Changed paths:
    engines/ultima/ultima8/misc/pent_include.h


diff --git a/engines/ultima/ultima8/misc/pent_include.h b/engines/ultima/ultima8/misc/pent_include.h
index 1bea36bfa3..46d49356be 100644
--- a/engines/ultima/ultima8/misc/pent_include.h
+++ b/engines/ultima/ultima8/misc/pent_include.h
@@ -133,7 +133,6 @@ void setAllocationFunctions(allocFunc a, deallocFunc d);
 #include <fstream>
 #include <cstdio>
 #include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/containers.h"
 
 // Useful Pentagram headers
 #include "ultima/ultima8/world/get_object.h"


Commit: 3608d0b2828fb2b262fe0f86ef0877869ccb56a9
    https://github.com/scummvm/scummvm/commit/3608d0b2828fb2b262fe0f86ef0877869ccb56a9
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-03-23T21:55:08+09:00

Commit Message:
ULTIMA8: Remove friend declaration for non-existant class

Changed paths:
    engines/ultima/ultima8/gumps/gump.h


diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index 004d4ea805..6d7983f789 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -44,7 +44,6 @@ class GumpNotifyProcess;
 //
 
 class Gump : public Object {
-	friend class GumpList;
 protected:
 	uint16 _owner;        // Owner item
 	Gump *_parent;        // Parent gump


Commit: 6bddbbc9c4019325c0911e3c31477a052ad618cf
    https://github.com/scummvm/scummvm/commit/6bddbbc9c4019325c0911e3c31477a052ad618cf
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-03-23T21:55:08+09:00

Commit Message:
ULTIMA8: Correct typo in comment

Changed paths:
    engines/ultima/ultima8/usecode/uc_stack.h


diff --git a/engines/ultima/ultima8/usecode/uc_stack.h b/engines/ultima/ultima8/usecode/uc_stack.h
index d1a04b6a84..56236b3426 100644
--- a/engines/ultima/ultima8/usecode/uc_stack.h
+++ b/engines/ultima/ultima8/usecode/uc_stack.h
@@ -122,7 +122,7 @@ public:
 	}
 
 	//
-	// Access a value from a location in the stacck
+	// Access a value from a location in the stack
 	//
 
 	inline uint8 access1(const uint32 offset) const {