Skip to content

Commit ff6e1e8

Browse files
FlenarnDevFlenarnTemp
andauthored
Compile fixes (#33)
* chore: Misc. fixes. * maintenance --------- Co-authored-by: FlenarnTemp <FlenarnTemp@users.noreply.github.com>
1 parent 0c0d537 commit ff6e1e8

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

include/RE/B/BSTArray.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ namespace RE
190190
const auto mem = _allocator->Allocate(a_bytes, alignof(void*));
191191
if (!mem) {
192192
REX::FAIL("failed to handle allocation request");
193-
} else {
194-
return mem;
195193
}
194+
195+
return mem;
196196
}
197197

198198
void deallocate(void* a_ptr)

include/RE/H/hknpWorldCinfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace RE
2323
class hknpWorldCinfo
2424
{
2525
public:
26-
enum class LeavingBroadPhaseBehavior;
26+
enum class LeavingBroadPhaseBehavior
2727
{
2828
kDoNothing = 0x0,
2929
kRemoveBody = 0x1,

include/RE/Q/QUEST_STAGE_DATA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace RE
1515

1616
// members
1717
std::uint16_t index; // 00
18-
REX::EnumSet<QUEST_STAGE_DAGA::Flags, std::uint8_t> flags; // 02
18+
REX::EnumSet<QUEST_STAGE_DATA::Flags, std::uint8_t> flags; // 02
1919
};
2020
static_assert(sizeof(QUEST_STAGE_DATA) == 0x4);
2121
}

include/Scaleform/M/Memory.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,10 @@ namespace Scaleform
159159
[[nodiscard]] void* operator new(std::size_t a_count) \
160160
{ \
161161
const auto mem = Scaleform::malloc(a_count); \
162-
if (mem) { \
163-
return mem; \
164-
} else { \
162+
if (!mem) { \
165163
REX::FAIL("out of memory"sv); \
166164
} \
165+
return mem; \
167166
} \
168167
\
169168
[[nodiscard]] void* operator new[](std::size_t a_count) \

0 commit comments

Comments
 (0)