diff options
author | Eugene Sandulenko | 2013-09-18 19:20:53 +0400 |
---|---|---|
committer | Eugene Sandulenko | 2013-09-18 19:39:53 +0400 |
commit | fb2d0c02dfbabf0f3b17938d3346bb4477bea384 (patch) | |
tree | 5d7848600660d513b664b70dd7229c64bb00f224 /engines/fullpipe/scene.cpp | |
parent | 1ce1712b7ba5042ab88d1ad6d825d249836c7d7b (diff) | |
download | scummvm-rg350-fb2d0c02dfbabf0f3b17938d3346bb4477bea384.tar.gz scummvm-rg350-fb2d0c02dfbabf0f3b17938d3346bb4477bea384.tar.bz2 scummvm-rg350-fb2d0c02dfbabf0f3b17938d3346bb4477bea384.zip |
FULLPIPE: CPtrList -> PtrList
Diffstat (limited to 'engines/fullpipe/scene.cpp')
-rw-r--r-- | engines/fullpipe/scene.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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); } |