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

[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:
428bca6654 DIRECTOR: Fix PopUp Menu XObj
bba368d55a JANITORIAL: Fix indentation


Commit: 428bca6654932a82f1e2dc6e26fabb64b18774c1
    https://github.com/scummvm/scummvm/commit/428bca6654932a82f1e2dc6e26fabb64b18774c1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-02T23:24:52+02:00

Commit Message:
DIRECTOR: Fix PopUp Menu XObj

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


diff --git a/engines/director/lingo/xlibs/popupmenuxobj.cpp b/engines/director/lingo/xlibs/popupmenuxobj.cpp
index 38060daa74..f67e3da8fb 100644
--- a/engines/director/lingo/xlibs/popupmenuxobj.cpp
+++ b/engines/director/lingo/xlibs/popupmenuxobj.cpp
@@ -48,10 +48,10 @@
 
 namespace Director {
 
-static const char *xlibName = "PopUp Menu XObj";
+static const char *xlibName = "PopMenu";
 
 static MethodProto xlibMethods[] = {
-	{ "new",				PopUpMenuXObj::m_new,			 0, 0,	200 },	// D2
+	{ "new",				PopUpMenuXObj::m_new,			 2, 2,	200 },	// D2
 	{ "AppendMenu",			PopUpMenuXObj::m_appendMenu,	 1, 1,	200 },	// D2
 	{ "DisableItem",		PopUpMenuXObj::m_disableItem,	 1, 1,	200 },	// D2
 	{ "EnableItem",			PopUpMenuXObj::m_enableItem,	 1, 1,	200 },	// D2
@@ -82,11 +82,13 @@ void PopUpMenuXObj::close(int type) {
 }
 
 
-PopUpMenuXObject::PopUpMenuXObject(ObjectType ObjectType) :Object<PopUpMenuXObject>("PopUp Menu XObj") {
+PopUpMenuXObject::PopUpMenuXObject(ObjectType ObjectType) :Object<PopUpMenuXObject>("PopMenu") {
 	_objType = ObjectType;
 }
 
 void PopUpMenuXObj::m_new(int nargs) {
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_new", nargs);
+	g_lingo->dropStack(nargs);
 	g_lingo->push(g_lingo->_currentMe);
 }
 


Commit: bba368d55aaaf24321b5d9a7f71b724901edb7d9
    https://github.com/scummvm/scummvm/commit/bba368d55aaaf24321b5d9a7f71b724901edb7d9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-02T23:25:39+02:00

Commit Message:
JANITORIAL: Fix indentation

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


diff --git a/engines/director/lingo/xlibs/popupmenuxobj.cpp b/engines/director/lingo/xlibs/popupmenuxobj.cpp
index f67e3da8fb..8d5bbf26f3 100644
--- a/engines/director/lingo/xlibs/popupmenuxobj.cpp
+++ b/engines/director/lingo/xlibs/popupmenuxobj.cpp
@@ -93,62 +93,62 @@ void PopUpMenuXObj::m_new(int nargs) {
 }
 
 void PopUpMenuXObj::m_appendMenu(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_appendMenu", nargs);
-	 g_lingo->dropStack(nargs);
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_appendMenu", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void PopUpMenuXObj::m_disableItem(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_disableItem", nargs);
-	 g_lingo->dropStack(nargs);
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_disableItem", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void PopUpMenuXObj::m_enableItem(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_enableItem", nargs);
-	 g_lingo->dropStack(nargs);
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_enableItem", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void PopUpMenuXObj::m_getItem(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_getItem", nargs);
-	 g_lingo->dropStack(nargs);
-	 g_lingo->push(Datum());
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_getItem", nargs);
+	g_lingo->dropStack(nargs);
+	g_lingo->push(Datum());
 }
 
 void PopUpMenuXObj::m_getMenuID(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_getMenuID", nargs);
-	 g_lingo->dropStack(nargs);
-	 g_lingo->push(Datum());
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_getMenuID", nargs);
+	g_lingo->dropStack(nargs);
+	g_lingo->push(Datum());
 }
 
 void PopUpMenuXObj::m_popNum(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_popNum", nargs);
-	 g_lingo->dropStack(nargs);
-	 g_lingo->push(Datum());
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_popNum", nargs);
+	g_lingo->dropStack(nargs);
+	g_lingo->push(Datum());
 }
 
 void PopUpMenuXObj::m_popText(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_popText", nargs);
-	 g_lingo->dropStack(nargs);
-	 g_lingo->push(Datum());
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_popText", nargs);
+	g_lingo->dropStack(nargs);
+	g_lingo->push(Datum());
 }
 
 void PopUpMenuXObj::m_setItem(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_setItem", nargs);
-	 g_lingo->dropStack(nargs);
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_setItem", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void PopUpMenuXObj::m_setItemMark(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_setItemMark", nargs);
-	 g_lingo->dropStack(nargs);
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_setItemMark", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void PopUpMenuXObj::m_smart(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_smart", nargs);
-	 g_lingo->dropStack(nargs);
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_smart", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void PopUpMenuXObj::m_setItemIcon(int nargs) {
-	 g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_setItemIcon", nargs);
-	 g_lingo->dropStack(nargs);
+	g_lingo->printSTUBWithArglist("PopUpMenuXObj::m_setItemIcon", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 } // End of namespace Director