PEGASUS: Add the bomb detonation game

scummvm · Dec 13, 2011 · bbabf27 · bbabf27
1 parent 5f276bf
commit bbabf27
Show file tree

Hide file tree

Showing 4 changed files with 1,592 additions and 6 deletions.
diff --git a/engines/pegasus/module.mk b/engines/pegasus/module.mk
@@ -55,6 +55,7 @@ MODULE_OBJS = \
 	neighborhood/zoom.o \
 	neighborhood/caldoria/caldoria.o \
 	neighborhood/caldoria/caldoria4dsystem.o \
+	neighborhood/caldoria/caldoriabomb.o \
 	neighborhood/caldoria/caldoriamessages.o \
 	neighborhood/caldoria/caldoriamirror.o \
 	neighborhood/mars/energybeam.o \

diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -35,6 +35,7 @@
 #include "pegasus/items/biochips/biochipitem.h"
 #include "pegasus/neighborhood/caldoria/caldoria.h"
 #include "pegasus/neighborhood/caldoria/caldoria4dsystem.h"
+#include "pegasus/neighborhood/caldoria/caldoriabomb.h"
 #include "pegasus/neighborhood/caldoria/caldoriamessages.h"
 #include "pegasus/neighborhood/caldoria/caldoriamirror.h"
 #include "pegasus/neighborhood/tsa/fulltsa.h"
@@ -1522,17 +1523,12 @@ GameInteraction *Caldoria::makeInteraction(const tInteractionID interactionID) {
 	switch (interactionID) {
 	case kCaldoria4DInteractionID:
 		return new Caldoria4DSystem(this);
-		break;
 	case kCaldoriaBombInteractionID:
-		// TODO
-		error("STUB: Bomb game");
-		break;
+		return new CaldoriaBomb(this, _vm);
 	case kCaldoriaMessagesInteractionID:
 		return new CaldoriaMessages(this, kCaldoriaMessagesNotificationID, _vm);
-		break;
 	case kCaldoriaMirrorInteractionID:
 		return new CaldoriaMirror(this);
-		break;
 	}
 
 	return 0;