2 files changed, 23 insertions, 28 deletions
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 26048ced13..85999bcadb 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -28,29 +28,6 @@
 
 namespace Fullpipe {
 
-bool BaseModalObject::handleMessage(ExCommand *message) {
-	warning("STUB: BaseModalObject::handleMessage()");
-
-	return true;
-}
-
-bool BaseModalObject::init(int counterdiff) {
-	warning("STUB: BaseModalObject::init(%d)", counterdiff);
-
-	return true;
-}
-
-bool BaseModalObject::update() {
-	warning("STUB: BaseModalObject::update()");
-
-	return true;
-}
-
-void BaseModalObject::saveload() {
-	warning("STUB: BaseModalObject::saveload()");
-}
-
-
 ModalIntro::ModalIntro() {
 	_field_8 = 0;
 	_countDown = 0;
@@ -91,6 +68,22 @@ bool ModalIntro::handleMessage(ExCommand *message) {
 	return true;
 }
 
+bool ModalIntro::init(int counterdiff) {
+	warning("STUB: ModalIntro::init(%d)", counterdiff);
+
+	return true;
+}
+
+bool ModalIntro::update() {
+	warning("STUB: ModalIntro::update()");
+
+	return true;
+}
+
+void ModalIntro::saveload() {
+	// No saveload
+}
+
 void FullpipeEngine::openMap() {
 	warning("STUB: FullpipeEngine::openMap()");
 }
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 7d98427e20..3562622bde 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -34,11 +34,10 @@ class BaseModalObject {
  	BaseModalObject() : _parentObj(0) {}
 	virtual ~BaseModalObject() {}
 
-	virtual bool handleMessage(ExCommand *message);
-	virtual bool init(int counterdiff);
-	virtual bool update();
-
-	void saveload();
+	virtual bool handleMessage(ExCommand *message) = 0;
+	virtual bool init(int counterdiff) = 0;
+	virtual bool update() = 0;
+	virtual void saveload() = 0;
 };
 
 class ModalIntro : public BaseModalObject {
@@ -52,6 +51,9 @@ class ModalIntro : public BaseModalObject {
 	ModalIntro();
 
 	virtual bool handleMessage(ExCommand *message);
+	virtual bool init(int counterdiff);
+	virtual bool update();
+	virtual void saveload();
 };
 
 } // End of namespace Fullpipe