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

[sev-]

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:
baa2549cf3 DIRECTOR: LINGO: FileIO uses CR endings cross-platform


Commit: baa2549cf32f9aec26f28c61b68d0e21d924a3d2
    https://github.com/scummvm/scummvm/commit/baa2549cf32f9aec26f28c61b68d0e21d924a3d2
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-03-19T23:39:19+01:00

Commit Message:
DIRECTOR: LINGO: FileIO uses CR endings cross-platform

Verified by looking at FILEIO.C. Redo of 4a2aeb1d2194b0730434cb7cfbba8b7465a66b61

Changed paths:
    engines/director/lingo/xlibs/fileio.cpp


diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/fileio.cpp
index 3260f48a484..1f9f28ca7dd 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -309,11 +309,7 @@ void FileIO::m_readLine(int nargs) {
 	// See D4 Using Lingo p. 323
 
 	g_lingo->push(Datum(""));
-	if (g_director->getPlatform() == Common::kPlatformWindows) {
-		g_lingo->push(Datum("\r"));
-	} else {
-		g_lingo->push(Datum("\n"));
-	}
+	g_lingo->push(Datum("\r"));
 	FileIO::m_readToken(2);
 }
 
@@ -322,11 +318,7 @@ void FileIO::m_readWord(int nargs) {
 	// See D4 Using Lingo p. 323
 
 	g_lingo->push(Datum(" "));
-	if (g_director->getPlatform() == Common::kPlatformWindows) {
-		g_lingo->push(Datum(" \r"));
-	} else {
-		g_lingo->push(Datum(" \n"));
-	}
+	g_lingo->push(Datum(" \r"));
 	FileIO::m_readToken(2);
 }
 
@@ -336,8 +328,6 @@ void FileIO::m_readPict(int nargs) {
 }
 
 bool FileIO::charInMatchString(char ch, const Common::String &matchString) {
-	if (ch == '\r' && g_director->getPlatform() == Common::kPlatformWindows)
-		ch = '\n';
 	return matchString.contains(ch);
 }