libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: Replace qsort with Common::sort

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2012-08-31 16:55:17 +02:00
parent 71981aaecf
commit 3dc5d32e85
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/wintermute/ad/ad_scene.cpp
View File

@ -1164,7 +1164,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) {
} }
// sort by _posY // sort by _posY
qsort(objects.getData(), objects.getSize(), sizeof(AdObject *), AdScene::compareObjs); Common::sort(objects.begin(), objects.end(), AdScene::compareObjs);
// display them // display them
for (int i = 0; i < objects.getSize(); i++) { for (int i = 0; i < objects.getSize(); i++) {
@ -2994,7 +2994,7 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *> &objects,
} }
// sort by _posY // sort by _posY
qsort(objects.getData(), objects.getSize(), sizeof(AdObject *), AdScene::compareObjs); Common::sort(objects.begin(), objects.end(), AdScene::compareObjs);
return STATUS_OK; return STATUS_OK;
} }

2
engines/wintermute/base/base_surface_storage.cpp
View File

@ -169,7 +169,7 @@ bool BaseSurfaceStorage::persist(BasePersistenceManager *persistMgr)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
bool BaseSurfaceStorage::sortSurfaces() { bool BaseSurfaceStorage::sortSurfaces() {
qsort(&_surfaces[0], _surfaces.size(), sizeof(BaseSurface *), surfaceSortCB); Common::sort(_surfaces.begin(), _surfaces.end(), surfaceSortCB);
return STATUS_OK; return STATUS_OK;
} }

2
engines/wintermute/base/particles/part_emitter.cpp
View File

@ -367,7 +367,7 @@ bool PartEmitter::start() {
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
bool PartEmitter::sortParticlesByZ() { bool PartEmitter::sortParticlesByZ() {
// sort particles by _posY // sort particles by _posY
qsort(_particles.getData(), _particles.getSize(), sizeof(PartParticle *), PartEmitter::compareZ); Common::sort(_particles.begin(), _particles.end(), PartEmitter::compareZ);
return STATUS_OK; return STATUS_OK;
} }

3
engines/wintermute/coll_templ.h
View File

@ -83,9 +83,6 @@ public:
void copy(const BaseArray<T2> &src) { void copy(const BaseArray<T2> &src) {
Common::Array<TYPE>::insert_at(0, src); Common::Array<TYPE>::insert_at(0, src);
} }
void *getData() { // Ugly, should perhaps add a sort-function instead.
return Common::Array<TYPE>::_storage;
}
}; };
} // end of namespace Wintermute } // end of namespace Wintermute