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

djsrv dservilla at gmail.com
Mon Jun 15 13:59:47 UTC 2020


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:
f613e9fecb DIRECTOR: LINGO: Use .asString() in FileIO


Commit: f613e9fecbd447b9d23b0f40c5ef472bdfcfe2ce
    https://github.com/scummvm/scummvm/commit/f613e9fecbd447b9d23b0f40c5ef472bdfcfe2ce
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-15T09:57:37-04:00

Commit Message:
DIRECTOR: LINGO: Use .asString() in FileIO

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 6384b59794..26b39de88f 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -143,8 +143,8 @@ void FileIO::m_new(int nargs) {
 	Datum d1 = g_lingo->pop();
 
 	Common::SaveFileManager *saves = g_system->getSavefileManager();
-	Common::String option = *d1.u.s;
-	Common::String filename = *d2.u.s;
+	Common::String option = d1.asString();
+	Common::String filename = d2.asString();
 
 	if (option.hasPrefix("?")) {
 		option = option.substr(1);
@@ -257,8 +257,8 @@ void FileIO::m_readToken(int nargs) {
 	Datum d2 = g_lingo->pop();
 	Datum d1 = g_lingo->pop();
 
-	Common::String skipString = *d1.u.s;
-	Common::String breakString = *d2.u.s;
+	Common::String skipString = d1.asString();
+	Common::String breakString = d2.asString();
 
 	if (!me->inStream || me->inStream->eos() || me->inStream->err()) {
 		g_lingo->push(Datum(""));




More information about the Scummvm-git-logs mailing list