PEGASUS: Restructure remaining MMShell code into the base code

MMTimeValue has been removed, as Common::Timestamp will just be used instead
scummvm · Sep 5, 2011 · 593aec6 · 593aec6
1 parent 74054cf
commit 593aec6
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 294 deletions.
diff --git a/engines/pegasus/MMShell/Base_Classes/MMFunctionPtr.cpp b/engines/pegasus/MMShell/Base_Classes/MMFunctionPtr.cpp
diff --git a/engines/pegasus/MMShell/Base_Classes/MMFunctionPtr.h b/engines/pegasus/MMShell/Base_Classes/MMFunctionPtr.h
diff --git a/engines/pegasus/MMShell/Utilities/MMTimeValue.cpp b/engines/pegasus/MMShell/Utilities/MMTimeValue.cpp
diff --git a/engines/pegasus/MMShell/Utilities/MMTimeValue.h b/engines/pegasus/MMShell/Utilities/MMTimeValue.h
diff --git a/engines/pegasus/MMShell/Utilities/MMUtilities.h b/engines/pegasus/MMShell/Utilities/MMUtilities.h
diff --git a/engines/pegasus/hotspot.cpp b/engines/pegasus/hotspot.cpp
@@ -29,7 +29,7 @@ namespace Pegasus {
 
 HotspotList g_allHotspots;
 
-Hotspot::Hotspot(const tHotSpotID id) : MMIDObject(id) {
+Hotspot::Hotspot(const tHotSpotID id) : IDObject(id) {
 	_spotFlags = kNoHotSpotFlags;
 	_spotActive = false;
 }

diff --git a/engines/pegasus/hotspot.h b/engines/pegasus/hotspot.h
@@ -31,7 +31,7 @@
 
 #include "pegasus/constants.h"
 #include "pegasus/types.h"
-#include "pegasus/MMShell/Utilities/MMIDObject.h"
+#include "pegasus/util.h"
 
 /*
 
@@ -46,7 +46,7 @@
 
 namespace Pegasus {
 
-class Hotspot : public MMIDObject {
+class Hotspot : public IDObject {
 public:
 	Hotspot(const tHotSpotID);
 	virtual ~Hotspot();

diff --git a/engines/pegasus/items/item.cpp b/engines/pegasus/items/item.cpp
@@ -33,7 +33,7 @@
 
 namespace Pegasus {
 
-Item::Item(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) : MMIDObject(id) {
+Item::Item(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) : IDObject(id) {
 	_itemNeighborhood = neighborhood;
 	_itemRoom = room;
 	_itemDirection = direction;

diff --git a/engines/pegasus/items/item.h b/engines/pegasus/items/item.h
@@ -28,8 +28,8 @@
 
 #include "common/endian.h"
 
-#include "pegasus/MMShell/Utilities/MMIDObject.h"
 #include "pegasus/types.h"
+#include "pegasus/util.h"
 
 namespace Common {
 	class Error;
@@ -285,7 +285,7 @@ enum tItemType {
 
 */
 
-class Item : public MMIDObject {
+class Item : public IDObject {
 public:
 	Item(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction);
 	virtual ~Item();

diff --git a/engines/pegasus/module.mk b/engines/pegasus/module.mk
@@ -12,15 +12,13 @@ MODULE_OBJS = \
 	overview.o \
 	pegasus.o \
 	sound.o \
+	util.o \
 	video.o \
 	items/inventory.o \
 	items/item.o \
 	items/itemlist.o \
 	items/biochips/biochipitem.o \
 	items/inventory/inventoryitem.o \
-	MMShell/Base_Classes/MMFunctionPtr.o \
-	MMShell/Utilities/MMTimeValue.o \
-	MMShell/Utilities/MMUtilities.o \
 	neighborhood/door.o \
 	neighborhood/exit.o \
 	neighborhood/extra.o \

diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp
@@ -32,7 +32,7 @@
 
 namespace Pegasus {
 
-Neighborhood::Neighborhood(PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id) : MMIDObject(id), _vm(vm), _resName(resName) {
+Neighborhood::Neighborhood(PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id) : IDObject(id), _vm(vm), _resName(resName) {
 	GameState.setOpenDoorLocation(kNoRoomID, kNoDirection);
 	_currentAlternate = 0;
 	_interruptionFilter = kFilterAllInput;

diff --git a/engines/pegasus/neighborhood/neighborhood.h b/engines/pegasus/neighborhood/neighborhood.h
@@ -32,7 +32,7 @@
 #include "pegasus/hotspot.h"
 #include "pegasus/notification.h"
 #include "pegasus/sound.h"
-#include "pegasus/MMShell/Utilities/MMIDObject.h"
+#include "pegasus/util.h"
 #include "pegasus/neighborhood/door.h"
 #include "pegasus/neighborhood/exit.h"
 #include "pegasus/neighborhood/extra.h"
@@ -84,7 +84,7 @@ bool operator!=(const tQueueRequest &arg1, const tQueueRequest &arg2);
 
 typedef Common::Queue<tQueueRequest> NeighborhoodActionQueue;
 
-class Neighborhood : public MMIDObject, public NotificationReceiver {
+class Neighborhood : public IDObject, public NotificationReceiver {
 public:
 	Neighborhood(PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id);
 	virtual ~Neighborhood();

diff --git a/engines/pegasus/notification.cpp b/engines/pegasus/notification.cpp
@@ -30,7 +30,7 @@ namespace Pegasus {
 
 typedef tReceiverList::iterator tReceiverIterator;
 
-Notification::Notification(const tNotificationID id, NotificationManager *owner) : MMIDObject(id) {
+Notification::Notification(const tNotificationID id, NotificationManager *owner) : IDObject(id) {
 	_owner = owner;
 	_currentFlags = kNoNotificationFlags;
 	if (_owner)

diff --git a/engines/pegasus/notification.h b/engines/pegasus/notification.h
@@ -29,7 +29,7 @@
 #include "common/list.h"
 
 #include "pegasus/types.h"
-#include "pegasus/MMShell/Utilities/MMIDObject.h"
+#include "pegasus/util.h"
 
 namespace Pegasus {
 
@@ -50,7 +50,7 @@ typedef Common::List<tReceiverEntry> tReceiverList;
 	A notification can have 32 flags associated with it, which can be user-defined.
 */
 
-class Notification : public MMIDObject {
+class Notification : public IDObject {
 friend class NotificationManager;
 
 public: