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

[dreammaster]

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:
e70a114929 ULTIMA: Shared std & map comilation fixes


Commit: e70a114929000ae78dde1668da4000576da2743e
    https://github.com/scummvm/scummvm/commit/e70a114929000ae78dde1668da4000576da2743e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-01T20:10:52-08:00

Commit Message:
ULTIMA: Shared std & map comilation fixes

Changed paths:
    engines/ultima/shared/core/map.h
    engines/ultima/shared/std/misc.cpp


diff --git a/engines/ultima/shared/core/map.h b/engines/ultima/shared/core/map.h
index 67baca3..f34b06c 100644
--- a/engines/ultima/shared/core/map.h
+++ b/engines/ultima/shared/core/map.h
@@ -30,7 +30,6 @@
 #include "ultima/shared/gfx/dungeon_surface.h"
 
 namespace Ultima {
-
 namespace Shared {
 
 #define REGISTER_WIDGET(NAME) if (name == #NAME) return new Widgets::NAME(_game, (Ultima1Map::MapBase *)map) 
@@ -144,8 +143,7 @@ class Map {
 	 * Internal class used for storing the data for a row
 	 */
 	struct MapCellsRow {
-		friend class Map;
-	private:
+	public:
 		Common::Array<MapCell> _data;
 	public:
 		byte &operator[](int idx) { return _data[idx]; }
diff --git a/engines/ultima/shared/std/misc.cpp b/engines/ultima/shared/std/misc.cpp
index 748bc74..4e817c4 100644
--- a/engines/ultima/shared/std/misc.cpp
+++ b/engines/ultima/shared/std/misc.cpp
@@ -47,11 +47,11 @@ size_t strlen(const char *str) {
 }
 
 int toUpper(int ch) {
-	return ::toupper(ch);
+	return toupper(ch);
 }
 
 int toLower(int ch) {
-	return ::tolower(ch);
+	return tolower(ch);
 }
 
 int strcmp(const char *leftStr, const char *rightStr) {