[Scummvm-git-logs] scummvm master -> 2c71bc2fe69f838c60e6cc62811e7ac12d4846b7

[sev-]

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:
a09d6ebe93 DIRECTOR: LINGO: Fix arguments order in DialogS Xlib
2c71bc2fe6 DIRECTOR: LINGO: Rename xlibs/dialogs.cpp to xlibs/dialogsxobj.cpp


Commit: a09d6ebe93d6bf85aae97c1333aa4d716489a0b7
    https://github.com/scummvm/scummvm/commit/a09d6ebe93d6bf85aae97c1333aa4d716489a0b7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-31T00:10:51+02:00

Commit Message:
DIRECTOR: LINGO: Fix arguments order in DialogS Xlib

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


diff --git a/engines/director/lingo/xlibs/dialogs.cpp b/engines/director/lingo/xlibs/dialogs.cpp
index cd61c2bfc9b..ffe9f895a36 100644
--- a/engines/director/lingo/xlibs/dialogs.cpp
+++ b/engines/director/lingo/xlibs/dialogs.cpp
@@ -97,9 +97,9 @@ void DialogsXObj::m_new(int nargs) {
 }
 
 void DialogsXObj::m_putFile(int nargs) {
-	Common::String title = g_lingo->pop().asString();
-	Common::String name = g_lingo->pop().asString();
 	Common::String extn = g_lingo->pop().asString();
+	Common::String name = g_lingo->pop().asString();
+	Common::String title = g_lingo->pop().asString();
 
 	Common::String prefix = g_director->getTargetName() + '-';
 	Common::String mask = prefix + "*." + extn + ".txt";
@@ -121,9 +121,9 @@ void DialogsXObj::m_putFile(int nargs) {
 }
 
 void DialogsXObj::m_getFile(int nargs) {
-	Common::String title = g_lingo->pop().asString();
-	Common::String name = g_lingo->pop().asString();
 	Common::String extn = g_lingo->pop().asString();
+	Common::String name = g_lingo->pop().asString();
+	Common::String title = g_lingo->pop().asString();
 
 	Common::String prefix = g_director->getTargetName() + '-';
 	Common::String mask = prefix + "*." + extn + ".txt";


Commit: 2c71bc2fe69f838c60e6cc62811e7ac12d4846b7
    https://github.com/scummvm/scummvm/commit/2c71bc2fe69f838c60e6cc62811e7ac12d4846b7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-31T00:13:17+02:00

Commit Message:
DIRECTOR: LINGO: Rename xlibs/dialogs.cpp to xlibs/dialogsxobj.cpp

Otherwise, it could be confused with dialogs, plural.

Changed paths:
  A engines/director/lingo/xlibs/dialogsxobj.cpp
  A engines/director/lingo/xlibs/dialogsxobj.h
  R engines/director/lingo/xlibs/dialogs.cpp
  R engines/director/lingo/xlibs/dialogs.h
    engines/director/lingo/lingo-object.cpp
    engines/director/module.mk


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 2759e2c9359..8eb2fb01e05 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -45,7 +45,7 @@
 #include "director/lingo/xlibs/cdromxobj.h"
 #include "director/lingo/xlibs/darkenscreen.h"
 #include "director/lingo/xlibs/developerStack.h"
-#include "director/lingo/xlibs/dialogs.h"
+#include "director/lingo/xlibs/dialogsxobj.h"
 #include "director/lingo/xlibs/dpwavi.h"
 #include "director/lingo/xlibs/dpwqtw.h"
 #include "director/lingo/xlibs/draw.h"
diff --git a/engines/director/lingo/xlibs/dialogs.cpp b/engines/director/lingo/xlibs/dialogsxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/dialogs.cpp
rename to engines/director/lingo/xlibs/dialogsxobj.cpp
index ffe9f895a36..404dbb545a3 100644
--- a/engines/director/lingo/xlibs/dialogs.cpp
+++ b/engines/director/lingo/xlibs/dialogsxobj.cpp
@@ -47,7 +47,7 @@
 #include "director/director.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/dialogs.h"
+#include "director/lingo/xlibs/dialogsxobj.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/xlibs/dialogs.h b/engines/director/lingo/xlibs/dialogsxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/dialogs.h
rename to engines/director/lingo/xlibs/dialogsxobj.h
diff --git a/engines/director/module.mk b/engines/director/module.mk
index 176375ee82b..09c71fed131 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -51,7 +51,7 @@ MODULE_OBJS = \
 	lingo/xlibs/cdromxobj.o \
 	lingo/xlibs/darkenscreen.o \
 	lingo/xlibs/developerStack.o \
-	lingo/xlibs/dialogs.o \
+	lingo/xlibs/dialogsxobj.o \
 	lingo/xlibs/dpwavi.o \
 	lingo/xlibs/dpwqtw.o \
 	lingo/xlibs/draw.o \