5 files changed, 21 insertions, 21 deletions

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 99de4dc0d4..5b3f1788e0 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -236,7 +236,7 @@ void FullpipeEngine::updateEvents() {
 							_modalObject->update();
 						} else {
 							_modalObject->saveload();
-							CBaseModalObject *obj = _modalObject->_parentObj;
+							BaseModalObject *obj = _modalObject->_parentObj;
 							if (obj)
 								delete _modalObject;
 							_modalObject = obj;
@@ -360,7 +360,7 @@ void FullpipeEngine::updateScreen() {
 				_modalObject->update();
 			} else {
 				_modalObject->saveload();
-				CBaseModalObject *tmp = _modalObject->_parentObj;
+				BaseModalObject *tmp = _modalObject->_parentObj;
 
 				delete _modalObject;
 
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 24fa9db9aa..c950ed5a76 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -44,7 +44,7 @@ enum FullpipeGameFeatures {
 };
 
 class BehaviorManager;
-class CBaseModalObject;
+class BaseModalObject;
 class CGameLoader;
 class CGameVar;
 class InputController;
@@ -197,7 +197,7 @@ public:
 	int32 _lastInputTicks;
 	int32 _lastButtonUpTicks;
 
-	CBaseModalObject *_modalObject;
+	BaseModalObject *_modalObject;
 
 	int (*_updateScreenCallback)();
 	int (*_updateCursorCallback)();
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 6f1bc0cc1f..26048ced13 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -28,30 +28,30 @@
 
 namespace Fullpipe {
 
-bool CBaseModalObject::handleMessage(ExCommand *message) {
-	warning("STUB: CBaseModalObject::handleMessage()");
+bool BaseModalObject::handleMessage(ExCommand *message) {
+	warning("STUB: BaseModalObject::handleMessage()");
 
 	return true;
 }
 
-bool CBaseModalObject::init(int counterdiff) {
-	warning("STUB: CBaseModalObject::init(%d)", counterdiff);
+bool BaseModalObject::init(int counterdiff) {
+	warning("STUB: BaseModalObject::init(%d)", counterdiff);
 
 	return true;
 }
 
-bool CBaseModalObject::update() {
-	warning("STUB: CBaseModalObject::update()");
+bool BaseModalObject::update() {
+	warning("STUB: BaseModalObject::update()");
 
 	return true;
 }
 
-void CBaseModalObject::saveload() {
-	warning("STUB: CBaseModalObject::saveload()");
+void BaseModalObject::saveload() {
+	warning("STUB: BaseModalObject::saveload()");
 }
 
 
-CModalIntro::CModalIntro() {
+ModalIntro::ModalIntro() {
 	_field_8 = 0;
 	_countDown = 0;
 	_needRedraw = 0;
@@ -68,7 +68,7 @@ CModalIntro::CModalIntro() {
 	_sfxVolume = g_fullpipe->_sfxVolume;
 }
 
-bool CModalIntro::handleMessage(ExCommand *message) {
+bool ModalIntro::handleMessage(ExCommand *message) {
 	if (message->_messageKind != 17)
 		return false;
 
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 73236e8e5b..7d98427e20 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -25,14 +25,14 @@
 
 namespace Fullpipe {
 
-class CBaseModalObject {
+class BaseModalObject {
  public:
 
-	CBaseModalObject *_parentObj;
+	BaseModalObject *_parentObj;
 
  public:
- 	CBaseModalObject() : _parentObj(0) {}
-	virtual ~CBaseModalObject() {}
+ 	BaseModalObject() : _parentObj(0) {}
+	virtual ~BaseModalObject() {}
 
 	virtual bool handleMessage(ExCommand *message);
 	virtual bool init(int counterdiff);
@@ -41,7 +41,7 @@ class CBaseModalObject {
 	void saveload();
 };
 
-class CModalIntro : public CBaseModalObject {
+class ModalIntro : public BaseModalObject {
 	int _field_8;
 	int _introFlags;
 	int _countDown;
@@ -49,7 +49,7 @@ class CModalIntro : public CBaseModalObject {
 	int _sfxVolume;
 
  public:
-	CModalIntro();
+	ModalIntro();
 
 	virtual bool handleMessage(ExCommand *message);
 };
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 670d752bd7..1ac92c3c10 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1406,7 +1406,7 @@ void sceneIntro_initScene(Scene *sc) {
 	if (g_fullpipe->_recordEvents || g_fullpipe->_inputArFlag)
 		g_vars->sceneIntro_skipIntro = false;
 
-	g_fullpipe->_modalObject = new CModalIntro;
+	g_fullpipe->_modalObject = new ModalIntro;
 }
 
 int sceneHandlerIntro(ExCommand *cmd) {