[Scummvm-git-logs] scummvm master -> c1b63ed731a18063ae602552873c6c1261cf9389
sev-
noreply at scummvm.org
Sun Jun 16 22:16:21 UTC 2024
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:
c1b63ed731 DIRECTOR: Simplify code for object definition
Commit: c1b63ed731a18063ae602552873c6c1261cf9389
https://github.com/scummvm/scummvm/commit/c1b63ed731a18063ae602552873c6c1261cf9389
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-06-17T00:16:06+02:00
Commit Message:
DIRECTOR: Simplify code for object definition
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 962dd53ca4d..412fb2b707f 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -191,6 +191,9 @@ void Lingo::cleanupMethods() {
Window::cleanupMethods();
}
+#define XLIBDEF(class, flags, version) \
+ { class::fileNames, class::open, class::close, flags, version }
+
static struct XLibProto {
const char **names;
XLibOpenerFunc opener;
@@ -198,105 +201,105 @@ static struct XLibProto {
int type;
int version;
} xlibs[] = {
- { AiffXObj::fileNames, AiffXObj::open, AiffXObj::close, kXObj, 400 }, // D4
- { AppleCDXObj::fileNames, AppleCDXObj::open, AppleCDXObj::close, kXObj, 300 }, // D3
- { AskUser::fileNames, AskUser::open, AskUser::close, kXObj, 400 }, // D4
- { BackdropXObj::fileNames, BackdropXObj::open, BackdropXObj::close, kXObj, 400 }, // D4
- { BarakeObj::fileNames, BarakeObj::open, BarakeObj::close, kXObj, 400 }, // D4
- { BatQT::fileNames, BatQT::open, BatQT::close, kXObj, 400 }, // D4
- { BIMXObj::fileNames, BIMXObj::open, BIMXObj::close, kXObj, 400 }, // D4
- { BlitPictXObj::fileNames, BlitPictXObj::open, BlitPictXObj::close, kXObj, 400 }, // D4
- { CDROMXObj::fileNames, CDROMXObj::open, CDROMXObj::close, kXObj, 200 }, // D2
- { CloseBleedWindowXCMD::fileNames, CloseBleedWindowXCMD::open, CloseBleedWindowXCMD::close,kXObj, 300 }, // D3
- { ColorXObj::fileNames, ColorXObj::open, ColorXObj::close, kXObj, 400 }, // D4
- { ColorCursorXObj::fileNames, ColorCursorXObj::open, ColorCursorXObj::close, kXObj, 400 }, // D4
- { ConsumerXObj::fileNames, ConsumerXObj::open, ConsumerXObj::close, kXObj, 400 }, // D4
- { CursorXObj::fileNames, CursorXObj::open, CursorXObj::close, kXObj, 400 }, // D4
- { DLLGlueXObj::fileNames, DLLGlueXObj::open, DLLGlueXObj::close, kXObj, 400 }, // D4
- { DPWAVIXObj::fileNames, DPWAVIXObj::open, DPWAVIXObj::close, kXObj, 300 }, // D3
- { DPWQTWXObj::fileNames, DPWQTWXObj::open, DPWQTWXObj::close, kXObj, 300 }, // D3
- { DarkenScreen::fileNames, DarkenScreen::open, DarkenScreen::close, kXObj, 300 }, // D3
- { DeveloperStack::fileNames, DeveloperStack::open, DeveloperStack::close, kXObj, 300 }, // D3
- { DialogsXObj::fileNames, DialogsXObj::open, DialogsXObj::close, kXObj, 400 }, // D4
- { DirUtilXObj::fileNames, DirUtilXObj::open, DirUtilXObj::close, kXObj, 400 }, // D4
- { DrawXObj::fileNames, DrawXObj::open, DrawXObj::close, kXObj, 400 }, // D4
- { Ednox::fileNames, Ednox::open, Ednox::close, kXObj, 300 }, // D3
- { EventQXObj::fileNames, EventQXObj::open, EventQXObj::close, kXObj, 400 }, // D4
- { FEDraculXObj::fileNames, FEDraculXObj::open, FEDraculXObj::close, kXObj, 400 }, // D4
- { FEIMasksXObj::fileNames, FEIMasksXObj::open, FEIMasksXObj::close, kXObj, 400 }, // D4
- { FEIPrefsXObj::fileNames, FEIPrefsXObj::open, FEIPrefsXObj::close, kXObj, 400 }, // D4
- { FadeGammaDownXCMD::fileNames, FadeGammaDownXCMD::open, FadeGammaDownXCMD::close, kXObj, 400 }, // D4
- { FadeGammaUpXCMD::fileNames, FadeGammaUpXCMD::open, FadeGammaUpXCMD::close, kXObj, 400 }, // D4
- { FadeGammaXCMD::fileNames, FadeGammaXCMD::open, FadeGammaXCMD::close, kXObj, 400 }, // D4
- { FileExists::fileNames, FileExists::open, FileExists::close, kXObj, 300 }, // D3
- { FileIO::fileNames, FileIO::open, FileIO::close, kXObj | kXtraObj, 200 }, // D2
- { FindFolder::fileNames, FindFolder::open, FindFolder::close, kXObj, 300 }, // D3
- { FindSys::fileNames, FindSys::open, FindSys::close, kXObj, 400 }, // D4
- { FindWin::fileNames, FindWin::open, FindWin::close, kXObj, 400 }, // D4
- { FinderEventsXCMD::fileNames, FinderEventsXCMD::open, FinderEventsXCMD::close, kXObj, 400 }, // D4
- { FlushXObj::fileNames, FlushXObj::open, FlushXObj::close, kXObj, 300 }, // D3
- { FPlayXObj::fileNames, FPlayXObj::open, FPlayXObj::close, kXObj, 200 }, // D2
- { GenUtilsXObj::fileNames, GenUtilsXObj::open, GenUtilsXObj::close, kXObj, 400 }, // D4
- { GetScreenRectsXFCN::fileNames, GetScreenRectsXFCN::open, GetScreenRectsXFCN::close, kXObj, 300 }, // D3
- { GetScreenSizeXFCN::fileNames, GetScreenSizeXFCN::open, GetScreenSizeXFCN::close, kXObj, 300 }, // D3
- { GpidXObj::fileNames, GpidXObj::open, GpidXObj::close, kXObj, 400 }, // D4
- { HitMap::fileNames, HitMap::open, HitMap::close, kXObj, 400 }, // D4
- { InstObjXObj::fileNames, InstObjXObj::open, InstObjXObj::close, kXObj, 400 }, // D4
- { IsCD::fileNames, IsCD::open, IsCD::close, kXObj, 300 }, // D3
- { IsPippin::fileNames, IsPippin::open, IsPippin::close, kXObj, 400 }, // D4
- { JITDraw3XObj::fileNames, JITDraw3XObj::open, JITDraw3XObj::close, kXObj, 400 }, // D4
- { JourneyWareXINIXObj::fileNames, JourneyWareXINIXObj::open, JourneyWareXINIXObj::close, kXObj, 400 }, // D4
- { LabelDrvXObj::fileNames, LabelDrvXObj::open, LabelDrvXObj::close, kXObj, 400 }, // D4
- { MMovieXObj::fileNames, MMovieXObj::open, MMovieXObj::close, kXObj, 400 }, // D4
- { ManiacBgXObj::fileNames, ManiacBgXObj::open, ManiacBgXObj::close, kXObj, 300 }, // D3
- { MapNavigatorXObj::fileNames, MapNavigatorXObj::open, MapNavigatorXObj::close, kXObj, 400 }, // D4
- { MemCheckXObj::fileNames, MemCheckXObj::open, MemCheckXObj::close, kXObj, 400 }, // D4
- { MemoryXObj::fileNames, MemoryXObj::open, MemoryXObj::close, kXObj, 300 }, // D3
- { Misc::fileNames, Misc::open, Misc::close, kXObj, 400 }, // D4
- { MiscX::fileNames, MiscX::open, MiscX::close, kXObj, 400 }, // D4
- { MMaskXObj::fileNames, MMaskXObj::open, MMaskXObj::close, kXObj, 400 }, // D4
- { MoovXObj::fileNames, MoovXObj::open, MoovXObj::close, kXObj, 300 }, // D3
- { MovUtilsXObj::fileNames, MovUtilsXObj::open, MovUtilsXObj::close, kXObj, 400 }, // D4
- { MoveMouseXObj::fileNames, MoveMouseXObj::open, MoveMouseXObj::close, kXObj, 400 }, // D4
- { MovieIdxXObj::fileNames, MovieIdxXObj::open, MovieIdxXObj::close, kXObj, 400 }, // D4
- { MovUtilsXObj::fileNames, MovUtilsXObj::open, MovUtilsXObj::close, kXObj, 400 }, // D4
- { OpenBleedWindowXCMD::fileNames, OpenBleedWindowXCMD::open, OpenBleedWindowXCMD::close, kXObj, 300 }, // D3
- { OrthoPlayXObj::fileNames, OrthoPlayXObj::open, OrthoPlayXObj::close, kXObj, 400 }, // D4
- { PACoXObj::fileNames, PACoXObj::open, PACoXObj::close, kXObj, 300 }, // D3
- { PalXObj::fileNames, PalXObj::open, PalXObj::close, kXObj, 400 }, // D4
- { PanelXObj::fileNames, PanelXObj::open, PanelXObj::close, kXObj, 200 }, // D2
- { PopUpMenuXObj::fileNames, PopUpMenuXObj::open, PopUpMenuXObj::close, kXObj, 200 }, // D2
- { Porta::fileNames, Porta::open, Porta::close, kXObj, 300 }, // D3
- { PortaXCMD::fileNames, PortaXCMD::open, PortaXCMD::close, kXObj, 300 }, // D3
- { PrefPath::fileNames, PrefPath::open, PrefPath::close, kXObj, 400 }, // D4
- { PrintOMaticXObj::fileNames, PrintOMaticXObj::open, PrintOMaticXObj::close, kXObj, 400 }, // D4
- { ProcessXObj::fileNames, ProcessXObj::open, ProcessXObj::close, kXObj, 400 }, // D4
- { QTCatMoviePlayerXObj::fileNames, QTCatMoviePlayerXObj::open, QTCatMoviePlayerXObj::close,kXObj, 400 }, // D4
- { QTMovie::fileNames, QTMovie::open, QTMovie::close, kXObj, 400 }, // D4
- { QTVR::fileNames, QTVR::open, QTVR::close, kXObj, 400 }, // D4
- { Quicktime::fileNames, Quicktime::open, Quicktime::close, kXObj, 300 }, // D3
- { RearWindowXObj::fileNames, RearWindowXObj::open, RearWindowXObj::close, kXObj, 400 }, // D4
- { RegisterComponent::fileNames, RegisterComponent::open, RegisterComponent::close, kXObj, 400 }, // D4
- { RemixXCMD::fileNames, RemixXCMD::open, RemixXCMD::close, kXObj, 300 }, // D3
- { ScrnUtilXtra::fileNames, ScrnUtilXtra::open, ScrnUtilXtra::close, kXtraObj, 500 }, // D5
- { SerialPortXObj::fileNames, SerialPortXObj::open, SerialPortXObj::close, kXObj, 200 }, // D2
- { SoundJam::fileNames, SoundJam::open, SoundJam::close, kXObj, 400 }, // D4
- { SpaceMgr::fileNames, SpaceMgr::open, SpaceMgr::close, kXObj, 400 }, // D4
- { StageTCXObj::fileNames, StageTCXObj::open, StageTCXObj::close, kXObj, 400 }, // D4
- { UnitTestXObj::fileNames, UnitTestXObj::open, UnitTestXObj::close, kXObj, 400 }, // D4
- { VMisOnXFCN::fileNames, VMisOnXFCN::open, VMisOnXFCN::close, kXObj, 400 }, // D4
- { ValkyrieXObj::fileNames, ValkyrieXObj::open, ValkyrieXObj::close, kXObj, 400 }, // D4
- { VideodiscXObj::fileNames, VideodiscXObj::open, VideodiscXObj::close, kXObj, 200 }, // D2
- { VolumeList::fileNames, VolumeList::open, VolumeList::close, kXObj, 300 }, // D3
- { WinInfoXObj::fileNames, WinInfoXObj::open, WinInfoXObj::close, kXObj, 400 }, // D4
- { WidgetXObj::fileNames, WidgetXObj::open, WidgetXObj::close, kXObj, 400 }, // D4
- { WindowXObj::fileNames, WindowXObj::open, WindowXObj::close, kXObj, 200 }, // D2
- { XCMDGlueXObj::fileNames, XCMDGlueXObj::open, XCMDGlueXObj::close, kXObj, 200 }, // D2
- { XSoundXFCN::fileNames, XSoundXFCN::open, XSoundXFCN::close, kXObj, 400 }, // D4
- { XWINXObj::fileNames, XWINXObj::open, XWINXObj::close, kXObj, 300 }, // D3
- { XioXObj::fileNames, XioXObj::open, XioXObj::close, kXObj, 400 }, // D3
- { XPlayAnim::fileNames, XPlayAnim::open, XPlayAnim::close, kXObj, 300 }, // D3
- { Yasix::fileNames, Yasix::open, Yasix::close, kXObj, 300 }, // D3
+ XLIBDEF(AiffXObj, kXObj, 400), // D4
+ XLIBDEF(AppleCDXObj, kXObj, 300), // D3
+ XLIBDEF(AskUser, kXObj, 400), // D4
+ XLIBDEF(BackdropXObj, kXObj, 400), // D4
+ XLIBDEF(BarakeObj, kXObj, 400), // D4
+ XLIBDEF(BatQT, kXObj, 400), // D4
+ XLIBDEF(BIMXObj, kXObj, 400), // D4
+ XLIBDEF(BlitPictXObj, kXObj, 400), // D4
+ XLIBDEF(CDROMXObj, kXObj, 200), // D2
+ XLIBDEF(CloseBleedWindowXCMD,kXObj, 300), // D3
+ XLIBDEF(ColorXObj, kXObj, 400), // D4
+ XLIBDEF(ColorCursorXObj, kXObj, 400), // D4
+ XLIBDEF(ConsumerXObj, kXObj, 400), // D4
+ XLIBDEF(CursorXObj, kXObj, 400), // D4
+ XLIBDEF(DLLGlueXObj, kXObj, 400), // D4
+ XLIBDEF(DPWAVIXObj, kXObj, 300), // D3
+ XLIBDEF(DPWQTWXObj, kXObj, 300), // D3
+ XLIBDEF(DarkenScreen, kXObj, 300), // D3
+ XLIBDEF(DeveloperStack, kXObj, 300), // D3
+ XLIBDEF(DialogsXObj, kXObj, 400), // D4
+ XLIBDEF(DirUtilXObj, kXObj, 400), // D4
+ XLIBDEF(DrawXObj, kXObj, 400), // D4
+ XLIBDEF(Ednox, kXObj, 300), // D3
+ XLIBDEF(EventQXObj, kXObj, 400), // D4
+ XLIBDEF(FEDraculXObj, kXObj, 400), // D4
+ XLIBDEF(FEIMasksXObj, kXObj, 400), // D4
+ XLIBDEF(FEIPrefsXObj, kXObj, 400), // D4
+ XLIBDEF(FadeGammaDownXCMD, kXObj, 400), // D4
+ XLIBDEF(FadeGammaUpXCMD, kXObj, 400), // D4
+ XLIBDEF(FadeGammaXCMD, kXObj, 400), // D4
+ XLIBDEF(FileExists, kXObj, 300), // D3
+ XLIBDEF(FileIO, kXObj | kXtraObj,200), // D2
+ XLIBDEF(FindFolder, kXObj, 300), // D3
+ XLIBDEF(FindSys, kXObj, 400), // D4
+ XLIBDEF(FindWin, kXObj, 400), // D4
+ XLIBDEF(FinderEventsXCMD, kXObj, 400), // D4
+ XLIBDEF(FlushXObj, kXObj, 300), // D3
+ XLIBDEF(FPlayXObj, kXObj, 200), // D2
+ XLIBDEF(GenUtilsXObj, kXObj, 400), // D4
+ XLIBDEF(GetScreenRectsXFCN, kXObj, 300), // D3
+ XLIBDEF(GetScreenSizeXFCN, kXObj, 300), // D3
+ XLIBDEF(GpidXObj, kXObj, 400), // D4
+ XLIBDEF(HitMap, kXObj, 400), // D4
+ XLIBDEF(InstObjXObj, kXObj, 400), // D4
+ XLIBDEF(IsCD, kXObj, 300), // D3
+ XLIBDEF(IsPippin, kXObj, 400), // D4
+ XLIBDEF(JITDraw3XObj, kXObj, 400), // D4
+ XLIBDEF(JourneyWareXINIXObj,kXObj, 400), // D4
+ XLIBDEF(LabelDrvXObj, kXObj, 400), // D4
+ XLIBDEF(MMovieXObj, kXObj, 400), // D4
+ XLIBDEF(ManiacBgXObj, kXObj, 300), // D3
+ XLIBDEF(MapNavigatorXObj, kXObj, 400), // D4
+ XLIBDEF(MemCheckXObj, kXObj, 400), // D4
+ XLIBDEF(MemoryXObj, kXObj, 300), // D3
+ XLIBDEF(Misc, kXObj, 400), // D4
+ XLIBDEF(MiscX, kXObj, 400), // D4
+ XLIBDEF(MMaskXObj, kXObj, 400), // D4
+ XLIBDEF(MoovXObj, kXObj, 300), // D3
+ XLIBDEF(MovUtilsXObj, kXObj, 400), // D4
+ XLIBDEF(MoveMouseXObj, kXObj, 400), // D4
+ XLIBDEF(MovieIdxXObj, kXObj, 400), // D4
+ XLIBDEF(MovUtilsXObj, kXObj, 400), // D4
+ XLIBDEF(OpenBleedWindowXCMD,kXObj, 300), // D3
+ XLIBDEF(OrthoPlayXObj, kXObj, 400), // D4
+ XLIBDEF(PACoXObj, kXObj, 300), // D3
+ XLIBDEF(PalXObj, kXObj, 400), // D4
+ XLIBDEF(PanelXObj, kXObj, 200), // D2
+ XLIBDEF(PopUpMenuXObj, kXObj, 200), // D2
+ XLIBDEF(Porta, kXObj, 300), // D3
+ XLIBDEF(PortaXCMD, kXObj, 300), // D3
+ XLIBDEF(PrefPath, kXObj, 400), // D4
+ XLIBDEF(PrintOMaticXObj, kXObj, 400), // D4
+ XLIBDEF(ProcessXObj, kXObj, 400), // D4
+ XLIBDEF(QTCatMoviePlayerXObj,kXObj, 400), // D4
+ XLIBDEF(QTMovie, kXObj, 400), // D4
+ XLIBDEF(QTVR, kXObj, 400), // D4
+ XLIBDEF(Quicktime, kXObj, 300), // D3
+ XLIBDEF(RearWindowXObj, kXObj, 400), // D4
+ XLIBDEF(RegisterComponent, kXObj, 400), // D4
+ XLIBDEF(RemixXCMD, kXObj, 300), // D3
+ XLIBDEF(ScrnUtilXtra, kXtraObj, 500), // D5
+ XLIBDEF(SerialPortXObj, kXObj, 200), // D2
+ XLIBDEF(SoundJam, kXObj, 400), // D4
+ XLIBDEF(SpaceMgr, kXObj, 400), // D4
+ XLIBDEF(StageTCXObj, kXObj, 400), // D4
+ XLIBDEF(UnitTestXObj, kXObj, 400), // D4
+ XLIBDEF(VMisOnXFCN, kXObj, 400), // D4
+ XLIBDEF(ValkyrieXObj, kXObj, 400), // D4
+ XLIBDEF(VideodiscXObj, kXObj, 200), // D2
+ XLIBDEF(VolumeList, kXObj, 300), // D3
+ XLIBDEF(WinInfoXObj, kXObj, 400), // D4
+ XLIBDEF(WidgetXObj, kXObj, 400), // D4
+ XLIBDEF(WindowXObj, kXObj, 200), // D2
+ XLIBDEF(XCMDGlueXObj, kXObj, 200), // D2
+ XLIBDEF(XSoundXFCN, kXObj, 400), // D4
+ XLIBDEF(XWINXObj, kXObj, 300), // D3
+ XLIBDEF(XioXObj, kXObj, 400), // D3
+ XLIBDEF(XPlayAnim, kXObj, 300), // D3
+ XLIBDEF(Yasix, kXObj, 300), // D3
{ nullptr, nullptr, nullptr, 0, 0 }
};
More information about the Scummvm-git-logs
mailing list