TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Define operator<=> for dl_index

Browse source
This commit is contained in:
Kp 2022-10-09 23:15:21 +00:00
parent 515e0abe11
commit 6ca3a1ba99
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/main/segment.h
View file

@ -25,6 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once #pragma once
#include <compare>
#include <physfs.h> #include <physfs.h>
#include <type_traits> #include <type_traits>
#include "pstypes.h" #include "pstypes.h"
@ -410,14 +411,13 @@ struct dl_index {
sidenum_t sidenum; sidenum_t sidenum;
uint8_t count; uint8_t count;
uint16_t index; uint16_t index;
bool operator<(const dl_index &rhs) const constexpr std::strong_ordering operator<=>(const dl_index &rhs) const
{ {
if (segnum < rhs.segnum) if (const auto r = segnum <=> rhs.segnum; r != std::strong_ordering::equal)
return true; return r;
if (segnum > rhs.segnum) return sidenum <=> rhs.sidenum;
return false;
return sidenum < rhs.sidenum;
} }
constexpr bool operator==(const dl_index &) const = default;
}; };
struct d_level_shared_destructible_light_state struct d_level_shared_destructible_light_state