diff options
Diffstat (limited to 'engines/pegasus/MMShell')
-rwxr-xr-x | engines/pegasus/MMShell/MMConstants.h | 63 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/MMTypes.h | 103 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/Notification/MMNotification.cpp | 2 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/Notification/MMNotification.h | 2 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/Notification/MMNotificationManager.cpp | 2 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/Utilities/MMIDObject.h | 2 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/Utilities/MMResourceFile.h | 2 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/Utilities/MMTimeValue.cpp | 2 | ||||
-rwxr-xr-x | engines/pegasus/MMShell/Utilities/MMTimeValue.h | 2 |
9 files changed, 7 insertions, 173 deletions
diff --git a/engines/pegasus/MMShell/MMConstants.h b/engines/pegasus/MMShell/MMConstants.h deleted file mode 100755 index 1b36c81cea..0000000000 --- a/engines/pegasus/MMShell/MMConstants.h +++ /dev/null @@ -1,63 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * Additional copyright for this file: - * Copyright (C) 1995-1997 Presto Studios, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef PEGASUS_MMSHELL_MMCONSTANTS_H -#define PEGASUS_MMSHELL_MMCONSTANTS_H - -#include "pegasus/MMShell/MMTypes.h" - -namespace Pegasus { - -const tDisplayElementID kNoDisplayElement = -1; -const tDisplayElementID kHighestReservedElementID = -2; - -const tDisplayElementID kCursorID = kHighestReservedElementID; -const tDisplayElementID kLoadScreenID = kCursorID - 1; - -const tDisplayOrder kMinAvailableOrder = 0; -const tDisplayOrder kMaxAvailableOrder = 999998; -const tDisplayOrder kLoadScreenOrder = 900000; -const tDisplayOrder kCursorOrder = 1000000; - -const tHotSpotID kNoHotSpotID = -1; -const tHotSpotFlags kNoHotSpotFlags = 0; -const tHotSpotFlags kAllHotSpotFlags = ~kNoHotSpotFlags; - -const tNotificationFlags kNoNotificationFlags = 0; - -const tDisplayElementID kCurrentDragSpriteID = 1000; - -// TODO -//const Fixed kFixed1 = 1 << 16; -//const Fixed kFixedMinus1 = -1 << 16; - -const TimeScale kDefaultTimeScale = 600; - -// TODO -//const RGBColor kWhiteRGB = {0xFFFF, 0xFFFF, 0xFFFF}; - -} // End of namespace Pegasus - -#endif diff --git a/engines/pegasus/MMShell/MMTypes.h b/engines/pegasus/MMShell/MMTypes.h deleted file mode 100755 index a4bc547e2a..0000000000 --- a/engines/pegasus/MMShell/MMTypes.h +++ /dev/null @@ -1,103 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * Additional copyright for this file: - * Copyright (C) 1995-1997 Presto Studios, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef PEGASUS_MMSHELL_MMTYPES_H -#define PEGASUS_MMSHELL_MMTYPES_H - -#include "common/scummsys.h" - -namespace Pegasus { - -// TODO: All of the "tMM"-prefixed defines should be replaced eventually -// TODO: Probably all of these don't really need to be typedef'd... -typedef int8 tMM8BitS; -typedef uint8 tMM8BitU; - -typedef int16 tMM16BitS; -typedef uint16 tMM16BitU; - -typedef int32 tMM32BitS; -typedef uint32 tMM32BitU; - -typedef tMM8BitS tMM8BitID; -typedef tMM16BitS tMM16BitID; -typedef tMM32BitS tMM32BitID; - -typedef tMM8BitU tMM8BitFlags; -typedef tMM16BitU tMM16BitFlags; -typedef tMM32BitU tMM32BitFlags; - -typedef tMM32BitID tDisplayElementID; -typedef tMM32BitS tDisplayOrder; - -typedef tMM16BitID tHotSpotID; -typedef tMM32BitFlags tHotSpotFlags; - -typedef tMM8BitFlags tButtonState; -typedef tMM32BitFlags tInputBits; - -typedef tMM8BitU tKeyMapType[16]; -typedef tMM8BitU tKeyType; -typedef tMM8BitU tKeyMapIndexType; -typedef tMM8BitU tKeyMapBitType; - -typedef tMM32BitID tNotificationID; -typedef tMM32BitFlags tNotificationFlags; - -// Mac types. -typedef tMM16BitS tResIDType; -typedef tMM16BitS tCoordType; -typedef tMM16BitS tQDCopyMode; -typedef tMM16BitS tResItemCountType; - -enum tCopyMode { - kNoMask, - kUseClipArea, - kUseTransparency -}; - -enum tSlideDirection { - kSlideLeftMask = 1, - kSlideRightMask = kSlideLeftMask << 1, - kSlideUpMask = kSlideRightMask << 1 << 1, - kSlideDownMask = kSlideUpMask << 1, - - kSlideHorizMask = kSlideLeftMask | kSlideRightMask, - kSlideVertMask = kSlideUpMask | kSlideDownMask, - - kSlideUpLeftMask = kSlideLeftMask | kSlideUpMask, - kSlideUpRightMask = kSlideRightMask | kSlideUpMask, - kSlideDownLeftMask = kSlideLeftMask | kSlideDownMask, - kSlideDownRightMask = kSlideRightMask | kSlideDownMask -}; - -// ScummVM QuickTime/QuickDraw replacement types -typedef uint TimeValue; -typedef uint TimeScale; -// TODO: Fixed and RGBColor - -} // End of namespace Pegasus - -#endif diff --git a/engines/pegasus/MMShell/Notification/MMNotification.cpp b/engines/pegasus/MMShell/Notification/MMNotification.cpp index 8b8d694358..e91417a292 100755 --- a/engines/pegasus/MMShell/Notification/MMNotification.cpp +++ b/engines/pegasus/MMShell/Notification/MMNotification.cpp @@ -23,7 +23,7 @@ * */ -#include "pegasus/MMShell/MMConstants.h" +#include "pegasus/constants.h" #include "pegasus/MMShell/Notification/MMNotification.h" #include "pegasus/MMShell/Notification/MMNotificationManager.h" #include "pegasus/MMShell/Notification/MMNotificationReceiver.h" diff --git a/engines/pegasus/MMShell/Notification/MMNotification.h b/engines/pegasus/MMShell/Notification/MMNotification.h index 8ad7f733fd..2c6ddddcd2 100755 --- a/engines/pegasus/MMShell/Notification/MMNotification.h +++ b/engines/pegasus/MMShell/Notification/MMNotification.h @@ -28,7 +28,7 @@ #include "common/list.h" -#include "pegasus/MMShell/MMTypes.h" +#include "pegasus/types.h" #include "pegasus/MMShell/Utilities/MMIDObject.h" namespace Pegasus { diff --git a/engines/pegasus/MMShell/Notification/MMNotificationManager.cpp b/engines/pegasus/MMShell/Notification/MMNotificationManager.cpp index 2a1f1bedd5..4bcaa794e8 100755 --- a/engines/pegasus/MMShell/Notification/MMNotificationManager.cpp +++ b/engines/pegasus/MMShell/Notification/MMNotificationManager.cpp @@ -23,7 +23,7 @@ * */ -#include "pegasus/MMShell/MMConstants.h" +#include "pegasus/constants.h" #include "pegasus/MMShell/Notification/MMNotificationManager.h" namespace Pegasus { diff --git a/engines/pegasus/MMShell/Utilities/MMIDObject.h b/engines/pegasus/MMShell/Utilities/MMIDObject.h index 4cca1c056e..b45c7544b3 100755 --- a/engines/pegasus/MMShell/Utilities/MMIDObject.h +++ b/engines/pegasus/MMShell/Utilities/MMIDObject.h @@ -26,7 +26,7 @@ #ifndef PEGASUS_MMSHELL_MMIDOBJECT_H #define PEGASUS_MMSHELL_MMIDOBJECT_H -#include "pegasus/MMShell/MMTypes.h" +#include "pegasus/types.h" namespace Pegasus { diff --git a/engines/pegasus/MMShell/Utilities/MMResourceFile.h b/engines/pegasus/MMShell/Utilities/MMResourceFile.h index 47c82fd909..9bd0cd9e41 100755 --- a/engines/pegasus/MMShell/Utilities/MMResourceFile.h +++ b/engines/pegasus/MMShell/Utilities/MMResourceFile.h @@ -28,7 +28,7 @@ #include "common/str.h" -#include "pegasus/MMShell/MMTypes.h" +#include "pegasus/types.h" namespace Common { class Error; diff --git a/engines/pegasus/MMShell/Utilities/MMTimeValue.cpp b/engines/pegasus/MMShell/Utilities/MMTimeValue.cpp index c3bf85b993..92971a6636 100755 --- a/engines/pegasus/MMShell/Utilities/MMTimeValue.cpp +++ b/engines/pegasus/MMShell/Utilities/MMTimeValue.cpp @@ -23,7 +23,7 @@ * */ -#include "pegasus/MMShell/MMConstants.h" +#include "pegasus/constants.h" #include "pegasus/MMShell/Utilities/MMTimeValue.h" namespace Pegasus { diff --git a/engines/pegasus/MMShell/Utilities/MMTimeValue.h b/engines/pegasus/MMShell/Utilities/MMTimeValue.h index 4060322f8e..a112f9c233 100755 --- a/engines/pegasus/MMShell/Utilities/MMTimeValue.h +++ b/engines/pegasus/MMShell/Utilities/MMTimeValue.h @@ -26,7 +26,7 @@ #ifndef PEGASUS_MMSHELL_MMTIMEVALUE_H #define PEGASUS_MMSHELL_MMTIMEVALUE_H -#include "pegasus/MMShell/MMTypes.h" +#include "pegasus/types.h" namespace Pegasus { |