Merge remote-tracking branch 'own/prince' into prince-malik

Conflicts:
	engines/prince/debugger.cpp
	engines/prince/debugger.h
	engines/prince/detection.cpp
	engines/prince/font.cpp
	engines/prince/graphics.cpp
	engines/prince/prince.cpp
	engines/prince/prince.h
	engines/prince/script.cpp
	engines/prince/script.h

1 files changed, 16 insertions, 12 deletions

diff --git a/engines/prince/font.h b/engines/prince/font.h
index 54e6b6b0a5..1afafa3be3 100644
--- a/engines/prince/font.h
+++ b/engines/prince/font.h
@@ -25,21 +25,21 @@
 #include "graphics/font.h"
 
 namespace Graphics {
-    struct Surface;
+	struct Surface;
 }
 
 namespace Common {
-    class String;
+	class String;
 }
 
 namespace Prince {
 
 class Font : public Graphics::Font {
 public:
-    Font();
-    virtual ~Font();
+	Font();
+	virtual ~Font();
 
-    bool load(Common::SeekableReadStream &stream);
+	bool load(Common::SeekableReadStream &stream);
 
     virtual int getFontHeight() const override;
 
@@ -49,18 +49,22 @@ public:
 
     virtual void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) const override;
 
+	virtual int getKerningOffset(byte left, byte right) const { return -2; }
+
 private:
-    struct ChrData {
-        byte * _pixels;
-        byte _width;
-        byte _height;
-    };
+	struct ChrData {
+		byte *_pixels;
+		byte _width;
+		byte _height;
+	};
 
-    ChrData getChrData(byte chr) const;
+	ChrData getChrData(byte chr) const;
 
-    byte * _fontData;
+	byte *_fontData;
 };
 
 }
 
 #endif
+
+/* vim: set tabstop=4 expandtab!: */