diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp index 1e5754a7788..b04f48f1fcb 100644 --- a/engines/wintermute/ad/ad_scene.cpp +++ b/engines/wintermute/ad/ad_scene.cpp @@ -1164,7 +1164,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) { } // sort by _posY - qsort(objects.getData(), objects.getSize(), sizeof(AdObject *), AdScene::compareObjs); + Common::sort(objects.begin(), objects.end(), AdScene::compareObjs); // display them for (int i = 0; i < objects.getSize(); i++) { @@ -2994,7 +2994,7 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray &objects, } // sort by _posY - qsort(objects.getData(), objects.getSize(), sizeof(AdObject *), AdScene::compareObjs); + Common::sort(objects.begin(), objects.end(), AdScene::compareObjs); return STATUS_OK; } diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp index a8297326963..0e0976b838d 100644 --- a/engines/wintermute/base/base_surface_storage.cpp +++ b/engines/wintermute/base/base_surface_storage.cpp @@ -169,7 +169,7 @@ bool BaseSurfaceStorage::persist(BasePersistenceManager *persistMgr) ////////////////////////////////////////////////////////////////////////// bool BaseSurfaceStorage::sortSurfaces() { - qsort(&_surfaces[0], _surfaces.size(), sizeof(BaseSurface *), surfaceSortCB); + Common::sort(_surfaces.begin(), _surfaces.end(), surfaceSortCB); return STATUS_OK; } diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index 1a6d4fe1e53..4fb0eb6637d 100644 --- a/engines/wintermute/base/particles/part_emitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -367,7 +367,7 @@ bool PartEmitter::start() { ////////////////////////////////////////////////////////////////////////// bool PartEmitter::sortParticlesByZ() { // sort particles by _posY - qsort(_particles.getData(), _particles.getSize(), sizeof(PartParticle *), PartEmitter::compareZ); + Common::sort(_particles.begin(), _particles.end(), PartEmitter::compareZ); return STATUS_OK; } diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h index 96daaf62eec..fea203d100e 100644 --- a/engines/wintermute/coll_templ.h +++ b/engines/wintermute/coll_templ.h @@ -83,9 +83,6 @@ public: void copy(const BaseArray &src) { Common::Array::insert_at(0, src); } - void *getData() { // Ugly, should perhaps add a sort-function instead. - return Common::Array::_storage; - } }; } // end of namespace Wintermute