8 files changed, 22 insertions, 22 deletions

diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 2ab038b74d..2e89bd6003 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -171,7 +171,7 @@ bool PictureObject::load(MfcArchive &file, bool bigPicture) {
 
 	_picture->load(file);
 
-	_pictureObject2List = new CPtrList();
+	_pictureObject2List = new PtrList();
 
 	int count = file.readUint16LE();
 
@@ -325,7 +325,7 @@ void GameObject::setOXY(int x, int y) {
 	_oy = y;
 }
 
-void GameObject::renumPictures(CPtrList *lst) {
+void GameObject::renumPictures(PtrList *lst) {
 	int *buf = (int *)calloc(lst->size() + 2, sizeof(int));
 
 	for (uint i = 0; i < lst->size(); i++) {
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index 82e082d8cb..1f7284a6eb 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -137,7 +137,7 @@ class GameObject : public CObject {
 
 	virtual bool load(MfcArchive &file);
 	void setOXY(int x, int y);
-	void renumPictures(CPtrList *lst);
+	void renumPictures(PtrList *lst);
 	void setFlags(int16 flags) { _flags = flags; }
 	void clearFlags() { _flags = 0; }
 	const char *getName() { return _objectName; }
@@ -149,7 +149,7 @@ class GameObject : public CObject {
 class PictureObject : public GameObject {
   public:
 	Picture *_picture;
-	CPtrList *_pictureObject2List;
+	PtrList *_pictureObject2List;
 	int _ox2;
 	int _oy2;
 
@@ -169,7 +169,7 @@ class PictureObject : public GameObject {
 
 class Background : public CObject {
   public:
-	CPtrList _picObjList;
+	PtrList _picObjList;
 
 	char *_bgname;
 	int _x;
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 6ac062fb37..0f988b0a39 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -259,7 +259,7 @@ void Scene::init() {
 	if (_staticANIObjectList2.size() != _staticANIObjectList1.size()) {
 		_staticANIObjectList2.clear();
 
-		for (CPtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s)
+		for (PtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s)
 			_staticANIObjectList2.push_back(*s);
 	}
 }
@@ -273,7 +273,7 @@ StaticANIObject *Scene::getAniMan() {
 }
 
 StaticANIObject *Scene::getStaticANIObject1ById(int obj, int a3) {
-	for (CPtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s) {
+	for (PtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s) {
 		StaticANIObject *o = (StaticANIObject *)*s;
 		if (o->_id == obj && (a3 == -1 || o->_okeyCode == a3))
 			return o;
@@ -441,7 +441,7 @@ bool Scene::compareObjPriority(const void *p1, const void *p2) {
 	return false;
 }
 
-void Scene::objectList_sortByPriority(CPtrList &list) {
+void Scene::objectList_sortByPriority(PtrList &list) {
 	Common::sort(list.begin(), list.end(), Scene::compareObjPriority);
 }
 
@@ -453,12 +453,12 @@ void Scene::draw() {
 
 	objectList_sortByPriority(_staticANIObjectList2);
 
-	for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
+	for (PtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
 		((StaticANIObject *)*s)->draw2();
 	}
 
 	int priority = -1;
-	for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
+	for (PtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
 		drawContent(((StaticANIObject *)*s)->_priority, priority, false);
 		((StaticANIObject *)*s)->draw();
 
@@ -526,7 +526,7 @@ int Scene::getPictureObjectIdAtPos(int x, int y) {
 void Scene::update(int counterdiff) {
 	debug(0, "Scene::update(%d)", counterdiff);
 
-	for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s)
+	for (PtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s)
 		((StaticANIObject *)*s)->update(counterdiff);
 }
 
diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h
index c1c8d47ba8..c01df15828 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/fullpipe/scene.h
@@ -31,10 +31,10 @@ class MessageQueue;
 
 class Scene : public Background {
  public:
-	CPtrList _staticANIObjectList1;
-	CPtrList _staticANIObjectList2;
-	CPtrList _messageQueueList;
-	CPtrList _faObjectList;
+	PtrList _staticANIObjectList1;
+	PtrList _staticANIObjectList2;
+	PtrList _messageQueueList;
+	PtrList _faObjectList;
 	Shadows *_shadows;
 	SoundList *_soundList;
 	int16 _sceneId;
@@ -79,7 +79,7 @@ class Scene : public Background {
 
   private:
 	static bool compareObjPriority(const void *p1, const void *p2);
-	void objectList_sortByPriority(CPtrList &list);
+	void objectList_sortByPriority(PtrList &list);
 };
 
 class SceneTag : public CObject {
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 2195ee7585..670d752bd7 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -151,7 +151,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 
 	scene->setPictureObjectsFlag4();
 
-	for (CPtrList::iterator s = scene->_staticANIObjectList1.begin(); s != scene->_staticANIObjectList1.end(); ++s) {
+	for (PtrList::iterator s = scene->_staticANIObjectList1.begin(); s != scene->_staticANIObjectList1.end(); ++s) {
 		StaticANIObject *o = (StaticANIObject *)*s;
 		o->setFlags(o->_flags & 0xFE7F);
 	}
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 4c58d564dd..8681347703 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -54,7 +54,7 @@ bool FullpipeEngine::loadGam(const char *fname, int scene) {
 
 	_inventory->rebuildItemRects();
 
-	for (CPtrList::iterator p = _inventory->getScene()->_picObjList.begin(); p != _inventory->getScene()->_picObjList.end(); ++p) {
+	for (PtrList::iterator p = _inventory->getScene()->_picObjList.begin(); p != _inventory->getScene()->_picObjList.end(); ++p) {
 		((MemoryObject *)((PictureObject *)*p)->_picture)->load();
 	}
 
diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h
index 03d87c8e32..44ea8b3da1 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/fullpipe/statics.h
@@ -118,7 +118,7 @@ class Movement : public GameObject {
 	int _field_50;
 	int _counterMax;
 	int _counter;
-	CPtrList _dynamicPhases;
+	PtrList _dynamicPhases;
 	int _field_78;
 	Common::Point **_framePosOffsets;
 	Movement *_currMovement;
@@ -172,8 +172,8 @@ class StaticANIObject : public GameObject {
 	int _initialCounter;
 	int _callback1;
 	void (*_callback2)(int *);
-	CPtrList _movements;
-	CPtrList _staticsList;
+	PtrList _movements;
+	PtrList _staticsList;
 	CStepArray _stepArray;
 	int16 _field_96;
 	int _messageQueueId;
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h
index 31bfe86041..64631f4215 100644
--- a/engines/fullpipe/utils.h
+++ b/engines/fullpipe/utils.h
@@ -145,7 +145,7 @@ class DWordArray : public Common::Array<int32>, public CObject {
 	virtual bool load(MfcArchive &file);
 };
 
-typedef Common::Array<void *> CPtrList;
+typedef Common::Array<void *> PtrList;
 
 char *genFileName(int superId, int sceneId, const char *ext);
 byte *transCyrillic(byte *s);