Merge remote-tracking branch 'origin/master' into soccer

Conflicts:
	engines/scumm/he/logic_he.cpp
	engines/scumm/he/logic_he.h

1 files changed, 8 insertions, 4 deletions

diff --git a/graphics/maccursor.h b/graphics/maccursor.h
index cca7f3456b..f5efc20655 100644
--- a/graphics/maccursor.h
+++ b/graphics/maccursor.h
@@ -28,18 +28,19 @@
  * - scumm
  */
 
-#include "common/stream.h"
-
 #ifndef GRAPHICS_MACCURSOR_H
 #define GRAPHICS_MACCURSOR_H
 
+#include "common/stream.h"
+
+#include "graphics/cursor.h"
+
 namespace Graphics {
 
 /**
  * A Mac crsr or CURS cursor
- * TODO: Think about making a base class with WinCursor
  */
-class MacCursor {
+class MacCursor : public Cursor {
 public:
 	MacCursor();
 	~MacCursor();
@@ -56,7 +57,10 @@ public:
 	byte getKeyColor() const { return 0xFF; }
 
 	const byte *getSurface() const { return _surface; }
+
 	const byte *getPalette() const { return _palette; }
+	byte getPaletteStartIndex() const { return 0; }
+	uint16 getPaletteCount() const { return 256; }
 
 	/** Read the cursor's data out of a stream. */
 	bool readFromStream(Common::SeekableReadStream &stream, bool forceMonochrome = false);