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

[djsrv]

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:
da14ca952c DIRECTOR: LINGO: Fix xlib types
caccde1350 DIRECTOR: LINGO: Fix xlib alphabetization


Commit: da14ca952cbb9a2d4f1b3814b2155fed89d6371e
    https://github.com/scummvm/scummvm/commit/da14ca952cbb9a2d4f1b3814b2155fed89d6371e
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-04T17:33:49-04:00

Commit Message:
DIRECTOR: LINGO: Fix xlib types

Changed paths:
    engines/director/lingo/lingo-object.cpp


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index b69233e1a5..854a198852 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -117,17 +117,17 @@ static struct XLibProto {
 	int type;
 	int version;
 } xlibs[] = {
-	{ "CD-ROM XObj",			CDROMXObj::open,		CDROMXObj::close,			kXObj | kXtraObj,		200 },	// D2
+	{ "CD-ROM XObj",			CDROMXObj::open,		CDROMXObj::close,			kXObj,					200 },	// D2
 	{ "FileIO",					FileIO::open,			FileIO::close,				kXObj | kXtraObj,		200 },	// D2
 	{ "FlushXObj",				FlushXObj::open,		FlushXObj::close,			kXObj,					400 },	// D4
 	{ "FPlayXObj",				FPlayXObj::open,		FPlayXObj::close,			kXObj,					200 },	// D2
 	{ "OrthoPlay XObj",			OrthoPlayXObj::open,	OrthoPlayXObj::close,		kXObj,					400 }, 	// D4
 	{ "PalXObj",				PalXObj::open,			PalXObj::close,				kXObj,					400 }, 	// D4
-	{ "PopUp Menu XObj",		PopUpMenuXObj::open,	PopUpMenuXObj::close,		kXObj | kXtraObj,		200 }, 	// D2
+	{ "PopUp Menu XObj",		PopUpMenuXObj::open,	PopUpMenuXObj::close,		kXObj,					200 }, 	// D2
 	{ "LabelDrv",				LabelDrvXObj::open,		LabelDrvXObj::close,		kXObj,					400 }, 	// D4
-	{ "SerialPort",				SerialPortXObj::open,	SerialPortXObj::close,		kXObj | kXtraObj,		200 },	// D2
+	{ "SerialPort",				SerialPortXObj::open,	SerialPortXObj::close,		kXObj,					200 },	// D2
 	{ "SoundJam",				SoundJam::open,			SoundJam::close,			kXObj,					400 },	// D4
-	{ "Videodisc XObj",			VideodiscXObj::open,	VideodiscXObj::close,		kXObj | kXtraObj,		200 }, 	// D2
+	{ "Videodisc XObj",			VideodiscXObj::open,	VideodiscXObj::close,		kXObj,					200 }, 	// D2
 	{ "winXObj",				RearWindowXObj::open,	RearWindowXObj::close,		kXObj,					400 },	// D4
 	{ 0, 0, 0, 0, 0 }
 


Commit: caccde135005c1d3f172ea03a64094fa5cffb9ba
    https://github.com/scummvm/scummvm/commit/caccde135005c1d3f172ea03a64094fa5cffb9ba
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-04T17:34:39-04:00

Commit Message:
DIRECTOR: LINGO: Fix xlib alphabetization

Changed paths:
    engines/director/lingo/lingo-object.cpp


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 854a198852..e007da9751 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -121,10 +121,10 @@ static struct XLibProto {
 	{ "FileIO",					FileIO::open,			FileIO::close,				kXObj | kXtraObj,		200 },	// D2
 	{ "FlushXObj",				FlushXObj::open,		FlushXObj::close,			kXObj,					400 },	// D4
 	{ "FPlayXObj",				FPlayXObj::open,		FPlayXObj::close,			kXObj,					200 },	// D2
+	{ "LabelDrv",				LabelDrvXObj::open,		LabelDrvXObj::close,		kXObj,					400 }, 	// D4
 	{ "OrthoPlay XObj",			OrthoPlayXObj::open,	OrthoPlayXObj::close,		kXObj,					400 }, 	// D4
 	{ "PalXObj",				PalXObj::open,			PalXObj::close,				kXObj,					400 }, 	// D4
 	{ "PopUp Menu XObj",		PopUpMenuXObj::open,	PopUpMenuXObj::close,		kXObj,					200 }, 	// D2
-	{ "LabelDrv",				LabelDrvXObj::open,		LabelDrvXObj::close,		kXObj,					400 }, 	// D4
 	{ "SerialPort",				SerialPortXObj::open,	SerialPortXObj::close,		kXObj,					200 },	// D2
 	{ "SoundJam",				SoundJam::open,			SoundJam::close,			kXObj,					400 },	// D4
 	{ "Videodisc XObj",			VideodiscXObj::open,	VideodiscXObj::close,		kXObj,					200 }, 	// D2