libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-08 20:07:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TWINE: use Common::sort and remove the dirty cast

Browse Source
This commit is contained in:
Martin Gerhardy 2021-09-12 00:23:10 +02:00
parent e38cc4dc24
commit ce23193986
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/twine/holomap.cpp
View File

@ -21,6 +21,7 @@
*/
#include "twine/holomap.h"
#include "common/algorithm.h"
#include "common/debug.h"
#include "common/memstream.h"
#include "common/stream.h"
@ -149,10 +150,6 @@ void Holomap::loadHolomapGFX() {
_holomapPaletteIndex = 0;
}
static int sortHolomapSurfaceCoordsByDepth(const void *a1, const void *a2) {
return (int)*(const int16 *)a1 - (int)*(const int16 *)a2;
}
void Holomap::prepareHolomapSurface(Common::SeekableReadStream *holomapSurfaceStream) {
int holomapSurfaceArrayIdx = 0;
_engine->_renderer->setBaseRotation(0, 0, 0);
@ -225,7 +222,7 @@ void Holomap::prepareHolomapPolygons() {
assert(holomapSortArrayIdx == ARRAYSIZE(_holomapSort));
assert(holomapSurfaceArrayIdx == ARRAYSIZE(_holomapSurface));
assert(_projectedSurfaceIndex == ARRAYSIZE(_projectedSurfacePositions));
qsort(_holomapSort, ARRAYSIZE(_holomapSort), sizeof(HolomapSort), sortHolomapSurfaceCoordsByDepth);
Common::sort(_holomapSort, _holomapSort + ARRAYSIZE(_holomapSort), [](const HolomapSort &a, const HolomapSort &b) { return a.z < b.z; });
}
bool Holomap::isTriangleVisible(const Vertex *vertices) const {