6 files changed, 20 insertions, 20 deletions

diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index dcc7e90145..cdcbf2ec16 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -40,7 +40,7 @@ bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId) {
 		sceneId = g_fullpipe->_currentScene->_sceneId;
 
 	CInteractionController *intC = getGameLoaderInteractionController();
-	for (CObList::iterator i = intC->_interactions.begin(); i != intC->_interactions.end(); ++i) {
+	for (ObList::iterator i = intC->_interactions.begin(); i != intC->_interactions.end(); ++i) {
 		CInteraction *intr = (CInteraction *)*i;
 
 		if (intr->_sceneId > 0 && intr->_sceneId != sceneId)
@@ -112,7 +112,7 @@ bool CInteractionController::handleInteraction(StaticANIObject *subj, GameObject
 	MessageQueue *mq;
 	ExCommand *ex;
 
-	for (CObList::iterator i = _interactions.begin(); i != _interactions.end(); ++i) {
+	for (ObList::iterator i = _interactions.begin(); i != _interactions.end(); ++i) {
 		CInteraction *cinter = (CInteraction *)*i;
 
 		if (!cinter->canInteract(subj, obj, invId))
diff --git a/engines/fullpipe/interaction.h b/engines/fullpipe/interaction.h
index 28a03fb496..176ec940b9 100644
--- a/engines/fullpipe/interaction.h
+++ b/engines/fullpipe/interaction.h
@@ -61,7 +61,7 @@ class CInteraction : public CObject {
 
 class CInteractionController : public CObject {
  public:
-	CObList _interactions;
+	ObList _interactions;
 	int16 _field_20;
 	bool _flag24;
 
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 332a494e1c..e692c01726 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -141,8 +141,8 @@ class MovGraphLink : public CObject {
  public:
 	MovGraphNode *_movGraphNode1;
 	MovGraphNode *_movGraphNode2;
-	CDWordArray _dwordArray1;
-	CDWordArray _dwordArray2;
+	DWordArray _dwordArray1;
+	DWordArray _dwordArray2;
 	int _flags;
 	int _field_38;
 	int _field_3C;
@@ -158,8 +158,8 @@ class MovGraphLink : public CObject {
 
 class MovGraph : public MotionController {
  public:
-	CObList _nodes;
-	CObList _links;
+	ObList _nodes;
+	ObList _links;
 	int _field_44;
 	int _items;
 	int _itemsCount;
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index a709d35f14..2195ee7585 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1334,7 +1334,7 @@ int MovGraph_messageHandler(ExCommand *cmd) {
 	double mindistance = 1.0e10;
 	Common::Point point;
 
-	for (CObList::iterator i = gr->_links.begin(); i != gr->_links.end(); ++i) {
+	for (ObList::iterator i = gr->_links.begin(); i != gr->_links.end(); ++i) {
 		point.x = ani->_ox;
 		point.y = ani->_oy;
 
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 920c3e29cf..f516fb49c5 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -44,14 +44,14 @@ bool CObject::loadFile(const char *fname) {
 	return load(archive);
 }
 
-bool CObList::load(MfcArchive &file) {
-	debug(5, "CObList::load()");
+bool ObList::load(MfcArchive &file) {
+	debug(5, "ObList::load()");
 	int count = file.readCount();
 
-	debug(9, "CObList::count: %d:", count);
+	debug(9, "ObList::count: %d:", count);
 
 	for (int i = 0; i < count; i++) {
-		debug(9, "CObList::[%d]", i);
+		debug(9, "ObList::[%d]", i);
 		CObject *t = file.readClass();
 
 		push_back(t);
@@ -60,8 +60,8 @@ bool CObList::load(MfcArchive &file) {
 	return true;
 }
 
-bool CObArray::load(MfcArchive &file) {
-	debug(5, "CObArray::load()");
+bool ObArray::load(MfcArchive &file) {
+	debug(5, "ObArray::load()");
 	int count = file.readCount();
 
 	resize(count);
@@ -75,11 +75,11 @@ bool CObArray::load(MfcArchive &file) {
 	return true;
 }
 
-bool CDWordArray::load(MfcArchive &file) {
-	debug(5, "CWordArray::load()");
+bool DWordArray::load(MfcArchive &file) {
+	debug(5, "DWordArray::load()");
 	int count = file.readCount();
 
-	debug(9, "CDWordArray::count: %d", count);
+	debug(9, "DWordArray::count: %d", count);
 
 	resize(count);
 
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h
index 2199706b9b..31bfe86041 100644
--- a/engines/fullpipe/utils.h
+++ b/engines/fullpipe/utils.h
@@ -83,7 +83,7 @@ class CObject {
 	bool loadFile(const char *fname);
 };
 
-class CObList : public Common::List<CObject *>, public CObject {
+class ObList : public Common::List<CObject *>, public CObject {
  public:
 	virtual bool load(MfcArchive &file);
 };
@@ -135,12 +135,12 @@ class MemoryObject2 : public MemoryObject {
 	void copyData(byte *src, int dataSize);
 };
 
-class CObArray : public Common::Array<CObject>, public CObject {
+class ObArray : public Common::Array<CObject>, public CObject {
  public:
 	virtual bool load(MfcArchive &file);
 };
 
-class CDWordArray : public Common::Array<int32>, public CObject {
+class DWordArray : public Common::Array<int32>, public CObject {
  public:
 	virtual bool load(MfcArchive &file);
 };