From f78d04dda8b579059d2a5aa98ae9991ed51cb43d Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:46:31 +0100 Subject: [PATCH] RTech: use Max() from our own headers --- r5dev/rtech/pak/pakalloc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r5dev/rtech/pak/pakalloc.cpp b/r5dev/rtech/pak/pakalloc.cpp index c5ca2dd7..f5db45bb 100644 --- a/r5dev/rtech/pak/pakalloc.cpp +++ b/r5dev/rtech/pak/pakalloc.cpp @@ -32,7 +32,7 @@ void Pak_AlignSegmentHeaders(PakFile_t* const pak, PakSegmentDescriptor_t* const desc->segmentSizeForType[SF_HEAD] = headersSize; - headerSegmentAlignment = static_cast(max(headerSegmentAlignment, binding.headerAlignment)); + headerSegmentAlignment = Max(headerSegmentAlignment, static_cast(binding.headerAlignment)); desc->segmentAlignmentForType[SF_HEAD] = headerSegmentAlignment; } } @@ -63,7 +63,7 @@ void Pak_AlignSegments(PakFile_t* const pak, PakSegmentDescriptor_t* const desc) // check if this segment's alignment is higher than the previous highest for this type // if so, increase the alignment to accommodate this segment - desc->segmentAlignmentForType[segmentType] = max(desc->segmentAlignmentForType[segmentType], segHeader->dataAlignment); + desc->segmentAlignmentForType[segmentType] = Max(desc->segmentAlignmentForType[segmentType], segHeader->dataAlignment); } } }