[Scummvm-git-logs] scummvm master -> 06e1445fd1b304e97c419b2782f14f48f5e10387

sev- sev at scummvm.org
Tue Jul 18 00:03:06 CEST 2017


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

Summary:
49c72c884a MACGUI: Fix compilation
06e1445fd1 MACGUI: Fix warning


Commit: 49c72c884a724db67125480c9e2c7fc6a04f477c
    https://github.com/scummvm/scummvm/commit/49c72c884a724db67125480c9e2c7fc6a04f477c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-07-18T00:01:46+02:00

Commit Message:
MACGUI: Fix compilation

Changed paths:
    graphics/macgui/mactextwindow.h


diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h
index f302f37..11b845f 100644
--- a/graphics/macgui/mactextwindow.h
+++ b/graphics/macgui/mactextwindow.h
@@ -29,8 +29,13 @@
 namespace Graphics {
 
 struct SelectedText {
-	int startX = 0, startY = 0;
-	int endX = 0, endY = 0;
+	int startX, startY;
+	int endX, endY;
+
+	SelectedText() {
+		startX = startY = 0;
+		endX = endY = 0;
+	}
 
 	bool needsRender() {
 		return startX != endX || startY != endY;


Commit: 06e1445fd1b304e97c419b2782f14f48f5e10387
    https://github.com/scummvm/scummvm/commit/06e1445fd1b304e97c419b2782f14f48f5e10387
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-07-18T00:02:45+02:00

Commit Message:
MACGUI: Fix warning

Changed paths:
    graphics/macgui/macfontmanager.h


diff --git a/graphics/macgui/macfontmanager.h b/graphics/macgui/macfontmanager.h
index 20c645a..0fb92ac 100644
--- a/graphics/macgui/macfontmanager.h
+++ b/graphics/macgui/macfontmanager.h
@@ -77,9 +77,9 @@ public:
 		_font = NULL;
 	}
 
-	const int getId() const { return _id; };
-	const int getSize() const { return _size; }
-	const int getSlant() const { return _slant; }
+	int getId() const { return _id; };
+	int getSize() const { return _size; }
+	int getSlant() const { return _slant; }
 	Common::String getName() { return _name; }
 	void setName(Common::String &name) { _name = name; }
 	void setName(const char *name) { _name = name; }





More information about the Scummvm-git-logs mailing list