[Scummvm-git-logs] scummvm master -> 510f0e684d764046fe94fb685c9e39c9eca0ad92

[sluicebox]

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:
437184e2f0 DIRECTOR: Add newline at EOF
510f0e684d SCI: Fix some function declarations


Commit: 437184e2f01a07e69028f6c038c3075c4a77f2a4
    https://github.com/scummvm/scummvm/commit/437184e2f01a07e69028f6c038c3075c4a77f2a4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-03-27T18:58:24-04:00

Commit Message:
DIRECTOR: Add newline at EOF

Fixes build in old compilers

Changed paths:
    engines/director/debugger.cpp
    engines/director/debugger.h
    engines/director/lingo/xlibs/xplayanim.h


diff --git a/engines/director/debugger.cpp b/engines/director/debugger.cpp
index a2bbacb851f..6726b2f5d77 100644
--- a/engines/director/debugger.cpp
+++ b/engines/director/debugger.cpp
@@ -61,4 +61,4 @@ bool Debugger::lingoCommandProcessor(const char *inputOrig) {
 	return true;
 }
 
-} // End of namespace Director
\ No newline at end of file
+} // End of namespace Director
diff --git a/engines/director/debugger.h b/engines/director/debugger.h
index 629e5534fe9..4cdf1e5bbe0 100644
--- a/engines/director/debugger.h
+++ b/engines/director/debugger.h
@@ -40,4 +40,4 @@ private:
 
 } // End of namespace Director
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/director/lingo/xlibs/xplayanim.h b/engines/director/lingo/xlibs/xplayanim.h
index 864485b12aa..a1a4401f981 100644
--- a/engines/director/lingo/xlibs/xplayanim.h
+++ b/engines/director/lingo/xlibs/xplayanim.h
@@ -47,4 +47,4 @@ void b_xplayanim(int nargs);
 
 } // End of namespace Director
 
-#endif
\ No newline at end of file
+#endif


Commit: 510f0e684d764046fe94fb685c9e39c9eca0ad92
    https://github.com/scummvm/scummvm/commit/510f0e684d764046fe94fb685c9e39c9eca0ad92
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-03-27T18:58:24-04:00

Commit Message:
SCI: Fix some function declarations

Changed paths:
    engines/sci/graphics/controls16.h
    engines/sci/graphics/fontkorean.h


diff --git a/engines/sci/graphics/controls16.h b/engines/sci/graphics/controls16.h
index 24378741072..11a8ff6f783 100644
--- a/engines/sci/graphics/controls16.h
+++ b/engines/sci/graphics/controls16.h
@@ -55,7 +55,7 @@ public:
 	~GfxControls16();
 
 	void kernelDrawButton(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 style, bool hilite);
-	void kernelDrawText(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 alignment, int16 style, bool hilite);
+	void kernelDrawText(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, TextAlignment alignment, int16 style, bool hilite);
 	void kernelDrawTextEdit(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite);
 	void kernelDrawIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 priority, int16 style, bool hilite);
 	void kernelDrawList(Common::Rect rect, reg_t obj, int16 maxChars, int16 count, const Common::String *entries, GuiResourceId fontId, int16 style, int16 upperPos, int16 cursorPos, bool isAlias, bool hilite);
diff --git a/engines/sci/graphics/fontkorean.h b/engines/sci/graphics/fontkorean.h
index 471819be6b2..29704c88ec6 100644
--- a/engines/sci/graphics/fontkorean.h
+++ b/engines/sci/graphics/fontkorean.h
@@ -42,7 +42,6 @@ public:
 	byte getHeight();
 	bool isDoubleByte(uint16 chr);
 	byte getCharWidth(uint16 chr);
-	byte *getCharData(uint16 chr);
 	void draw(uint16 chr, int16 top, int16 left, byte color, bool greyedOutput);
 #ifdef ENABLE_SCI32
 	// SCI2/2.1 equivalent