PEGASUS: Cleanup and hookup the notification code

scummvm · Sep 5, 2011 · dbb538d · dbb538d
1 parent fe99e95
commit dbb538d
Show file tree

Hide file tree

Showing 10 changed files with 212 additions and 342 deletions.
diff --git a/engines/pegasus/MMShell/Notification/MMNotification.cpp b/engines/pegasus/MMShell/Notification/MMNotification.cpp
diff --git a/engines/pegasus/MMShell/Notification/MMNotificationManager.cpp b/engines/pegasus/MMShell/Notification/MMNotificationManager.cpp
diff --git a/engines/pegasus/MMShell/Notification/MMNotificationManager.h b/engines/pegasus/MMShell/Notification/MMNotificationManager.h
diff --git a/engines/pegasus/MMShell/Notification/MMNotificationReceiver.cpp b/engines/pegasus/MMShell/Notification/MMNotificationReceiver.cpp
diff --git a/engines/pegasus/MMShell/Notification/MMNotificationReceiver.h b/engines/pegasus/MMShell/Notification/MMNotificationReceiver.h
diff --git a/engines/pegasus/module.mk b/engines/pegasus/module.mk
@@ -8,6 +8,7 @@ MODULE_OBJS = \
 	graphics.o \
 	hotspot.o \
 	menu.o \
+	notification.o \
 	overview.o \
 	pegasus.o \
 	sound.o \
@@ -18,9 +19,6 @@ MODULE_OBJS = \
 	items/biochips/biochipitem.o \
 	items/inventory/inventoryitem.o \
 	MMShell/Base_Classes/MMFunctionPtr.o \
-	MMShell/Notification/MMNotification.o \
-	MMShell/Notification/MMNotificationManager.o \
-	MMShell/Notification/MMNotificationReceiver.o \
 	MMShell/Utilities/MMResourceFile.o \
 	MMShell/Utilities/MMTimeValue.o \
 	MMShell/Utilities/MMUtilities.o \

diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp
@@ -108,6 +108,13 @@ void Neighborhood::start() {
 	arriveAt(GameState.getNextRoom(), GameState.getNextDirection());
 }
 
+void Neighborhood::receiveNotification(Notification *, const tNotificationFlags flags) {
+	if (flags & kMoveForwardCompletedFlag)
+		arriveAt(GameState.getNextRoom(), GameState.getNextDirection());
+
+	// TODO: Other types
+}
+
 void Neighborhood::arriveAt(tRoomID room, tDirectionConstant direction) {
 	// TODO
 }

diff --git a/engines/pegasus/neighborhood/neighborhood.h b/engines/pegasus/neighborhood/neighborhood.h
@@ -30,6 +30,7 @@
 #include "common/str.h"
 
 #include "pegasus/hotspot.h"
+#include "pegasus/notification.h"
 #include "pegasus/sound.h"
 #include "pegasus/MMShell/Utilities/MMIDObject.h"
 #include "pegasus/neighborhood/door.h"
@@ -43,7 +44,6 @@
 
 namespace Pegasus {
 
-class MMNotification;
 class PegasusEngine;
 
 // Pegasus Prime neighborhood id's
@@ -76,15 +76,15 @@ struct tQueueRequest {
 	tInputBits interruptionFilter;
 	bool playing;
 	tNotificationFlags flags;
-	MMNotification *notification;
+	Notification *notification;
 };
 
 bool operator==(const tQueueRequest &arg1, const tQueueRequest &arg2);
 bool operator!=(const tQueueRequest &arg1, const tQueueRequest &arg2);
 
 typedef Common::Queue<tQueueRequest> NeighborhoodActionQueue;
 
-class Neighborhood : public MMIDObject {
+class Neighborhood : public MMIDObject, public NotificationReceiver {
 public:
 	Neighborhood(PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id);
 	virtual ~Neighborhood();
@@ -114,6 +114,8 @@ class Neighborhood : public MMIDObject {
 	virtual bool actionQueueEmpty() { return _actionQueue.empty(); }
 
 protected:
+	virtual void receiveNotification(Notification *, const tNotificationFlags);
+
 	virtual void createNeighborhoodSpots();
 	virtual void loadSoundSpots();